diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000000..d77f064ed552 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,23 @@ +# CODEOWNERS file +# +# This file is used to describe who owns what in this repository. This file does not +# replace `meta.maintainers` but is instead used for other things than derivations +# and modules, like documentation, package sets, and other assets. +# +# For documentation on this file, see https://help.github.com/articles/about-codeowners/ +# Mentioned users will get code review requests. + +# Python-related code and docs +pkgs/top-level/python-packages.nix @FRidh +pkgs/development/interpreters/python/* @FRidh +pkgs/development/python-modules/* @FRidh +doc/languages-frameworks/python.md @FRidh + +# Boostraping and core infra +pkgs/stdenv/ @Ericson2314 +pkgs/build-support/cc-wrapper/ @Ericson2314 + +# Darwin-related +pkgs/stdenv/darwin/* @copumpkin @LnL7 +pkgs/os-specific/darwin/* @LnL7 +pkgs/os-specific/darwin/apple-source-releases/* @copumpkin diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 14f60b936f81..b77ca7eefb9f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -15,7 +15,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Format the commits in the following way: ``` - (pkg-name | service-name): (from -> to | init at version | refactor | etc) + (pkg-name | nixos/): (from -> to | init at version | refactor | etc) (Motivation for change. Additional information.) ``` @@ -24,10 +24,10 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * nginx: init at 2.0.1 * firefox: 3.0 -> 3.1.1 - * hydra service: add bazBaz option + * nixos/hydra: add bazBaz option Dual baz behavior is needed to do foo. - * nginx service: refactor config generation + * nixos/nginx: refactor config generation The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4b9345b087ee..7e7c24187120 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,6 +3,8 @@ ###### Things done + + - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) diff --git a/.mention-bot b/.mention-bot deleted file mode 100644 index 33c7e41c1dc7..000000000000 --- a/.mention-bot +++ /dev/null @@ -1,14 +0,0 @@ -{ - "userBlacklist": [ - "civodul", - "jhasse", - "shlevy", - "bbenoist" - ], - "alwaysNotifyForPaths": [ - { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, - { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] }, - { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } - ], - "fileBlacklist": ["pkgs/top-level/all-packages.nix"] -} diff --git a/.travis.yml b/.travis.yml index 8ecd12642a79..e746d390e760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,21 @@ matrix: script: - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual + env: + - BUILD_TYPE="Test Nixpkgs evaluation & NixOS manual build" - os: linux sudo: required dist: trusty before_script: - sudo mount -o remount,exec,size=2G,mode=755 /run/user script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr + env: + - BUILD_TYPE="Build affected packages (Linux)" - os: osx osx_image: xcode7.3 script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr + env: + - BUILD_TYPE="Build affected packages (macOS)" env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f diff --git a/README.md b/README.md index 1d5fbd218e22..1a0fb5014ded 100644 --- a/README.md +++ b/README.md @@ -38,5 +38,5 @@ For pull-requests, please rebase onto nixpkgs `master`. Communication: -* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/doc/configuration.xml b/doc/configuration.xml index ea3acf4e5753..ac03b42714c6 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -243,5 +243,218 @@ set of packages. +
+ Declarative Package Management + +
+ Build an environment + + + Using packageOverrides, it is possible to manage + packages declaratively. This means that we can list all of our desired + packages within a declarative Nix expression. For example, to have + aspell, bc, + ffmpeg, coreutils, + gdb, nixUnstable, + emscripten, jq, + nox, and silver-searcher, we could + use the following in ~/.config/nixpkgs/config.nix: + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + }; + }; +} + + + + To install it into our environment, you can just run nix-env -iA + nixpkgs.myPackages. If you want to load the packages to be built + from a working copy of nixpkgs you just run + nix-env -f. -iA myPackages. To explore what's been + installed, just look through ~/.nix-profile/. You can + see that a lot of stuff has been installed. Some of this stuff is useful + some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + pathsToLink = [ "/share" "/bin" ]; + }; + }; +} + + + + pathsToLink tells Nixpkgs to only link the paths listed + which gets rid of the extra stuff in the profile. + /bin and /share are good + defaults for a user environment, getting rid of the clutter. If you are + running on Nix on MacOS, you may want to add another path as well, + /Applications, that makes GUI apps available. + + +
+ +
+ Getting documentation + + + After building that new environment, look through + ~/.nix-profile to make sure everything is there that + we wanted. Discerning readers will note that some files are missing. Look + inside ~/.nix-profile/share/man/man1/ to verify this. + There are no man pages for any of the Nix tools! This is because some + packages like Nix have multiple outputs for things like documentation (see + section 4). Let's make Nix install those as well. + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + pathsToLink = [ "/share/man" "/share/doc" /bin" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} + + + + This provides us with some useful documentation for using our packages. + However, if we actually want those manpages to be detected by man, we need + to set up our environment. This can also be managed within Nix + expressions. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' +export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin +export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' +mkdir -p $out/etc/profile.d +cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} + + + + For this to work fully, you must also have this script sourced when you + are logged in. Try adding something like this to your + ~/.profile file: + + + +#!/bin/sh +if [ -d $HOME/.nix-profile/etc/profile.d ]; then + for i in $HOME/.nix-profile/etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi + done +fi + + + + Now just run source $HOME/.profile and you can starting + loading man pages from your environent. + + +
+ +
+ GNU info setup + + + Configuring GNU info is a little bit trickier than man pages. To work + correctly, info needs a database to be generated. This can be done with + some small modifications to our environment scripts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' +export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin +export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man +export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' +mkdir -p $out/etc/profile.d +cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + texinfoInteractive + ]; + pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" "info" ]; + postBuild = '' + if [ -x $out/bin/install-info -a -w $out/share/info ]; then + shopt -s nullglob + for i in $out/share/info/*.info $out/share/info/*.info.gz; do + $out/bin/install-info $i $out/share/info/dir + done + fi + ''; + }; + }; +} + + + + postBuild tells Nixpkgs to run a command after building + the environment. In this case, install-info adds the + installed info pages to dir which is GNU info's default + root node. Note that texinfoInteractive is added to the + environment to give the install-info command. + + +
+ +
diff --git a/doc/functions.xml b/doc/functions.xml index 4a9015602afc..52bdf13eba9b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -358,8 +358,8 @@ pkgs.dockerTools is a set of functions for creating and manipulating Docker images according to the - - Docker Image Specification v1.0.0 + + Docker Image Specification v1.2.0 . Docker itself is not used to perform any of the operations done by these functions. @@ -493,8 +493,8 @@ config is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the - - Docker Image Specification v1.0.0 + + Docker Image Specification v1.2.0 . diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 2ae3e39bb654..930bd2616156 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -698,33 +698,6 @@ rm /nix/var/nix/manifests/* rm /nix/var/nix/channel-cache/* ``` -### How to use the Haste Haskell-to-Javascript transpiler - -Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need -`node`, but it can be useful to test stuff): -```shell -nix-shell \ - -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" \ - -p nodejs -``` -You may not need the following step but if `haste-boot` fails to compile all the -packages it needs, this might do the trick -```shell -haste-cabal update -``` -`haste-boot` builds a set of core libraries so that they can be used from Javascript -transpiled programs: -```shell -haste-boot -``` -Transpile and run a "Hello world" program: -``` -$ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs -$ hastec --onexec hello-world.hs -$ node hello-world.js -Hello world -``` - ### Builds on Darwin fail with `math.h` not found Users of GHC on Darwin have occasionally reported that builds fail, because the @@ -854,7 +827,7 @@ the work to be licensed" under the terms of the LGPL (including for free). The LGPL licensing for GMP is a problem for the overall licensing of binary programs compiled with GHC because most distributions (and builds) of GHC use -static libraries. (Dynamic libraries are currently distributed only for OS X.) +static libraries. (Dynamic libraries are currently distributed only for macOS.) The LGPL licensing situation may be worse: even though [The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) is essentially a "free software" license (BSD3), according to @@ -912,14 +885,14 @@ nix-build -A haskell.packages.integer-simple.ghc802.scientific - The *Journey into the Haskell NG infrastructure* series of postings describe the new Haskell infrastructure in great detail: - - [Part 1](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html) + - [Part 1](https://nixos.org/nix-dev/2015-January/015591.html) explains the differences between the old and the new code and gives instructions how to migrate to the new setup. - - [Part 2](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html) + - [Part 2](https://nixos.org/nix-dev/2015-January/015608.html) looks in-depth at how to tweak and configure your setup by means of overrides. - - [Part 3](http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html) + - [Part 3](https://nixos.org/nix-dev/2015-April/016912.html) describes the infrastructure that keeps the Haskell package set in Nixpkgs up-to-date. diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3c9df2e6e821..c57fd4aec176 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -2,115 +2,204 @@ ## User Guide -Several versions of Python are available on Nix as well as a high amount of -packages. The default interpreter is CPython 2.7. - ### Using Python +#### Overview + +Several versions of the Python interpreter are available on Nix, as well as a +high amount of packages. The attribute `python` refers to the default +interpreter, which is currently CPython 2.7. It is also possible to refer to +specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to +the default PyPy interpreter. + +Python is used a lot, and in different ways. This affects also how it is +packaged. In the case of Python on Nix, an important distinction is made between +whether the package is considered primarily an application, or whether it should +be used as a library, i.e., of primary interest are the modules in +`site-packages` that should be importable. + +In the Nixpkgs tree Python applications can be found throughout, depending on +what they do, and are called from the main package set. Python libraries, +however, are in separate sets, with one set per interpreter version. + +The interpreters have several common attributes. One of these attributes is +`pkgs`, which is a package set of Python libraries for this specific +interpreter. E.g., the `toolz` package corresponding to the default interpreter +is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. +The main package set contains aliases to these package sets, e.g. +`pythonPackages` refers to `python.pkgs` and `python35Packages` to +`python35.pkgs`. + #### Installing Python and packages -It is important to make a distinction between Python packages that are -used as libraries, and applications that are written in Python. +The Nix and NixOS manuals explain how packages are generally installed. In the +case of Python and Nix, it is important to make a distinction between whether the +package is considered an application or a library. -Applications on Nix are installed typically into your user +Applications on Nix are typically installed into your user profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. Dependencies such as libraries are automatically installed and should not be installed explicitly. The same goes for Python applications and libraries. Python applications can be -installed in your profile, but Python libraries you would like to use to develop -cannot. If you do install libraries in your profile, then you will end up with -import errors. +installed in your profile. But Python libraries you would like to use for +development cannot be installed, at least not individually, because they won't +be able to find each other resulting in import errors. Instead, it is possible +to create an environment with `python.buildEnv` or `python.withPackages` where +the interpreter and other executables are able to find each other and all of the +modules. -#### Python environments using `nix-shell` +In the following examples we create an environment with Python 3.5, `numpy` and +`toolz`. As you may imagine, there is one limitation here, and that's that +you can install only one environment at a time. You will notice the complaints +about collisions when you try to install a second environment. -The recommended method for creating Python environments for development is with -`nix-shell`. Executing +##### Environment defined in separate `.nix` file -```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz +Create a file, e.g. `build.nix`, with the following expression +```nix +with import {}; + +python35.withPackages (ps: with ps; [ numpy toolz ]) +``` +and install it in your profile with +```shell +nix-env -if build.nix +``` +Now you can use the Python interpreter, as well as the extra packages (`numpy`, +`toolz`) that you added to the environment. + +##### Environment defined in `~/.config/nixpkgs/config.nix` + +If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g. +using `config.nix`, +```nix +{ # ... + + packageOverrides = pkgs: with pkgs; { + myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); + }; +} +``` +and install it in your profile with +```shell +nix-env -iA nixpkgs.myEnv +``` +The environment is is installed by referring to the attribute, and considering +the `nixpkgs` channel was used. + +##### Environment defined in `/etc/nixos/configuration.nix` + +For the sake of completeness, here's another example how to install the environment system-wide. + +```nix +{ # ... + + environment.systemPackages = with pkgs; [ + (python35.withPackages(ps: with ps; [ numpy toolz ])) + ]; +} ``` -opens a Nix shell which has available the requested packages and dependencies. -Now you can launch the Python interpreter (which is itself a dependency) +#### Temporary Python environment with `nix-shell` +The examples in the previous section showed how to install a Python environment +into a profile. For development you may need to use multiple environments. +`nix-shell` gives the possibility to temporarily load another environment, akin +to `virtualenv`. + +There are two methods for loading a shell with Python packages. The first and recommended method +is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g. +```sh +$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' +``` +opens a shell from which you can launch the interpreter ```sh [nix-shell:~] python3 ``` +The other method, which is not recommended, does not create an environment and requires you to list the packages directly, -If the packages were not available yet in the Nix store, Nix would download or -build them automatically. A convenient option with `nix-shell` is the `--run` -option, with which you can execute a command in the `nix-shell`. Let's say we -want the above environment and directly run the Python interpreter +```sh +$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz +``` +Again, it is possible to launch the interpreter from the shell. +The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter. +##### Load environment from `.nix` expression +As explained in the Nix manual, `nix-shell` can also load an +expression from a `.nix` file. Say we want to have Python 3.5, `numpy` +and `toolz`, like before, in an environment. Consider a `shell.nix` file +with +```nix +with import {}; + +python35.withPackages (ps: [ps.numpy ps.toolz]) +``` +Executing `nix-shell` gives you again a Nix shell from which you can run Python. + +What's happening here? + +1. We begin with importing the Nix Packages collections. `import ` imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. +2. Then we create a Python 3.5 environment with the `withPackages` function. +3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. + +##### Execute command with `--run` +A convenient option with `nix-shell` is the `--run` +option, with which you can execute a command in the `nix-shell`. We can +e.g. directly open a Python shell ```sh $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" ``` - -This way you can use the `--run` option also to directly run a script - +or run a script ```sh $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" ``` -In fact, for this specific use case there is a more convenient method. You can +##### `nix-shell` as shebang +In fact, for the second use case, there is a more convenient method. You can add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies Nix shell needs. With the following shebang, you -can use `nix-shell myscript.py` and it will make available all dependencies and +specifying which dependencies `nix-shell` needs. With the following shebang, you +can just execute `./myscript.py`, and it will make available all dependencies and run the script in the `python3` shell. ```py #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.numpy +#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])' import numpy print(numpy.__version__) ``` -Likely you do not want to type your dependencies each and every time. What you -can do is write a simple Nix expression which sets up an environment for you, -requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy` -and `toolz`, like before, in an environment. With a `shell.nix` file -containing -```nix -with import {}; - -(pkgs.python35.withPackages (ps: [ps.numpy ps.toolz])).env -``` -executing `nix-shell` gives you again a Nix shell from which you can run Python. - -What's happening here? - -1. We begin with importing the Nix Packages collections. `import ` import the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`. -2. Then we create a Python 3.5 environment with the `withPackages` function. -3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. -4. And finally, for in interactive use we return the environment by using the `env` attribute. - ### Developing with Python +Now that you know how to get a working Python environment with Nix, it is time +to go forward and start actually developing with Python. We will first have a +look at how Python packages are packaged on Nix. Then, we will look at how you +can use development mode with your code. -Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python. -We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code. +#### Packaging a library -#### Python packaging on Nix - -On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix). -Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using +With Nix all packages are built by functions. The main function in Nix for +building Python libraries is `buildPythonPackage`. Let's see how we can build the +`toolz` package. ```nix { # ... toolz = buildPythonPackage rec { - name = "toolz-${version}"; + pname = "toolz"; version = "0.7.4"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; + doCheck = false; + meta = { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; @@ -122,63 +211,37 @@ Let's see how we would build the `toolz` package. According to [`python-packages ``` What happens here? The function `buildPythonPackage` is called and as argument -it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)). -One of the arguments is the name of the package, which consists of a basename -(generally following the name on PyPi) and a version. Another argument, `src` -specifies the source, which in this case is fetched from an url. `fetchurl` not -only downloads the target file, but also validates its hash. Furthermore, we -specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta). - -The output of the function is a derivation, which is an attribute with the name -`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions, -so e.g. `python27Packages`, `python35Packages` and `pypyPackages`. +it accepts a set. In this case the set is a recursive set, `rec`. One of the +arguments is the name of the package, which consists of a basename (generally +following the name on PyPi) and a version. Another argument, `src` specifies the +source, which in this case is fetched from PyPI using the helper function +`fetchPypi`. The argument `doCheck` is used to set whether tests should be run +when building the package. Furthermore, we specify some (optional) meta +information. The output of the function is a derivation. +An expression for `toolz` can be found in the Nixpkgs repository. As explained +in the introduction of this Python section, a derivation of `toolz` is available +for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.5 interpreter. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, -you will want to test a Nix expression outside of the Nixpkgs tree. If you -create a `shell.nix` file with the following contents +you will want to test a Nix expression outside of the Nixpkgs tree. -```nix -with import {}; - -pkgs.python35Packages.buildPythonPackage rec { - name = "toolz-${version}"; - version = "0.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; - }; - - doCheck = false; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; -} -``` - -and then execute `nix-shell` will result in an environment in which you can use -Python 3.5 and the `toolz` package. As you can see we had to explicitly mention -for which Python version we want to build a package. - -The above example considered only a single package. Generally you will want to use multiple packages. -If we create a `shell.nix` file with the following contents +The following expression creates a derivation for the `toolz` package, +and adds it along with a `numpy` package to a Python environment. ```nix with import {}; ( let - toolz = pkgs.python35Packages.buildPythonPackage rec { - name = "toolz-${version}"; - version = "0.8.0"; + my_toolz = python35.pkgs.buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; + src = python35.pkgs.fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; doCheck = false; @@ -189,24 +252,24 @@ with import {}; }; }; - in pkgs.python35.withPackages (ps: [ps.numpy toolz]) + in python35.withPackages (ps: [ps.numpy my_toolz]) ).env ``` +Executing `nix-shell` will result in an environment in which you can use +Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +for which Python version we want to build a package. -and again execute `nix-shell`, then we get a Python 3.5 environment with our -locally defined package as well as `numpy` which is build according to the -definition in Nixpkgs. What did we do here? Well, we took the Nix expression -that we used earlier to build a Python environment, and said that we wanted to -include our own version of `toolz`. To introduce our own package in the scope of -`withPackages` we used a -[`let`](http://nixos.org/nix/manual/#sec-constructs) expression. -You can see that we used `ps.numpy` to select numpy from the nixpkgs package set (`ps`). -But we do not take `toolz` from the nixpkgs package set this time. -Instead, `toolz` will resolve to our local definition that we introduced with `let`. +So, what did we do here? Well, we took the Nix expression that we used earlier +to build a Python environment, and said that we wanted to include our own +version of `toolz`, named `my_toolz`. To introduce our own package in the scope +of `withPackages` we used a `let` expression. You can see that we used +`ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take +`toolz` from the Nixpkgs package set this time, but instead took our own version +that we introduced with the `let` expression. -### Handling dependencies +#### Handling dependencies -Our example, `toolz`, doesn't have any dependencies on other Python +Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be included as a @@ -340,7 +403,7 @@ other packages we like to have in the environment, all specified with `propagate Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`. ```nix -with import ; +with import {}; with pkgs.python35Packages; buildPythonPackage rec { @@ -423,7 +486,7 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as -respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter +respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in @@ -469,7 +532,6 @@ sets are * `pkgs.python26Packages` * `pkgs.python27Packages` -* `pkgs.python33Packages` * `pkgs.python34Packages` * `pkgs.python35Packages` * `pkgs.python36Packages` @@ -546,6 +608,35 @@ All parameters from `mkDerivation` function are still supported. * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. * `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +##### Overriding Python packages + +The `buildPythonPackage` function has a `overridePythonAttrs` method that +can be used to override the package. In the following example we create an +environment where we have the `blaze` package using an older version of `pandas`. +We override first the Python interpreter and pass +`packageOverrides` which contains the overrides for packages in the package set. + +```nix +with import {}; + +(let + python = let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs(old: rec { + version = "0.19.1"; + name = "pandas-${version}"; + src = super.fetchPypi { + pname = "pandas"; + inherit version; + sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295"; + }; + }); + }; + in pkgs.python3.override {inherit packageOverrides;}; + +in python.withPackages(ps: [ps.blaze])).env +``` + #### `buildPythonApplication` function The `buildPythonApplication` function is practically the same as `buildPythonPackage`. @@ -622,7 +713,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt ```nix with import {}; -(python33.withPackages (ps: [ps.numpy ps.requests])).env +(python36.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options @@ -685,63 +776,6 @@ Both are also exported in `nix-shell`. ## FAQ -### How can I install a working Python environment? - -As explained in the user's guide installing individual Python packages -imperatively with `nix-env -i` or declaratively in `environment.systemPackages` -is not supported. However, it is possible to install a Python environment with packages (`python.buildEnv`). - -In the following examples we create an environment with Python 3.5, `numpy` and `ipython`. -As you might imagine there is one limitation here, and that's you can install -only one environment at a time. You will notice the complaints about collisions -when you try to install a second environment. - -#### Environment defined in separate `.nix` file - -Create a file, e.g. `build.nix`, with the following expression -```nix -with import {}; - -pkgs.python35.withPackages (ps: with ps; [ numpy ipython ]) -``` -and install it in your profile with -```shell -nix-env -if build.nix -``` -Now you can use the Python interpreter, as well as the extra packages that you added to the environment. - -#### Environment defined in `~/.config/nixpkgs/config.nix` - -If you prefer to, you could also add the environment as a package override to the Nixpkgs set. -```nix -{ # ... - - packageOverrides = pkgs: with pkgs; { - myEnv = python35.withPackages (ps: with ps; [ numpy ipython ]); - }; -} -``` -and install it in your profile with -```shell -nix-env -iA nixpkgs.myEnv -``` - -We're installing using the attribute path and assume the channels is named `nixpkgs`. -Note that I'm using the attribute path here. - -#### Environment defined in `/etc/nixos/configuration.nix` - -For the sake of completeness, here's another example how to install the environment system-wide. - -```nix -{ # ... - - environment.systemPackages = with pkgs; [ - (python35.withPackages(ps: with ps; [ numpy ipython ])) - ]; -} -``` - ### How to solve circular dependencies? Consider the packages `A` and `B` that depend on each other. When packaging `B`, @@ -755,17 +789,17 @@ In the following example we rename the `pandas` package and build it. ```nix with import {}; -let +(let python = let packageOverrides = self: super: { - pandas = super.pandas.override {name="foo";}; + pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; in pkgs.python35.override {inherit packageOverrides;}; -in python.pkgs.pandas +in python.withPackages(ps: [ps.pandas])).env ``` -Using `nix-build` on this expression will build the package `pandas` -but with the new name `foo`. +Using `nix-build` on this expression will build an environment that contains the +package `pandas` but with the new name `foo`. All packages in the package set will use the renamed package. A typical use case is to switch to another version of a certain package. diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index b13da92dcc41..6bb809192f89 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -4,10 +4,14 @@ Ruby - There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert - this into a nix expression that contains all Gem dependencies automatically. +There currently is support to bundle applications that are packaged as +Ruby gems. The utility "bundix" allows you to write a +Gemfile, let bundler create a +Gemfile.lock, and then convert this into a nix +expression that contains all Gem dependencies automatically. + - For example, to package sensu, we did: +For example, to package sensu, we did: Gemfile source 'https://rubygems.org' gem 'sensu' -$ $(nix-build '' -A bundix)/bin/bundix --magic +$ $(nix-build '' -A bundix --no-out-link)/bin/bundix --magic $ cat > default.nix { lib, bundlerEnv, ruby }: @@ -38,15 +42,61 @@ bundlerEnv rec { }]]> -Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily. +Please check in the Gemfile, +Gemfile.lock and the +gemset.nix so future updates can be run easily. -Resulting derivations also have two helpful items, env and wrapper. The first one allows one to quickly drop into -nix-shell with the specified environment present. E.g. nix-shell -A sensu.env would give you an environment with Ruby preset -so it has all the libraries necessary for sensu in its paths. The second one can be used to make derivations from custom Ruby scripts which have -Gemfiles with their dependencies specified. It is a derivation with ruby wrapped so it can find all the needed dependencies. -For example, to make a derivation my-script for a my-script.rb (which should be placed in bin) you should -run bundix as specified above and then use bundlerEnv like this: +For tools written in Ruby - i.e. where the desire is to install +a package and then execute e.g. rake at the command +line, there is an alternative builder called bundlerApp. +Set up the gemset.nix the same way, and then, for +example: + + + + + + +The chief advantage of bundlerApp over +bundlerEnv is the executables introduced in the +environment are precisely those selected in the exes +list, as opposed to bundlerEnv which adds all the +executables made available by gems in the gemset, which can mean e.g. +rspec or rake in unpredictable +versions available from various packages. + + +Resulting derivations for both builders also have two helpful +attributes, env and wrappedRuby. +The first one allows one to quickly drop into +nix-shell with the specified environment present. +E.g. nix-shell -A sensu.env would give you an +environment with Ruby preset so it has all the libraries necessary +for sensu in its paths. The second one can be +used to make derivations from custom Ruby scripts which have +Gemfiles with their dependencies specified. It is +a derivation with ruby wrapped so it can find all +the needed dependencies. For example, to make a derivation +my-script for a my-script.rb +(which should be placed in bin) you should run +bundix as specified above and then use +bundlerEnv like this: + bundix as specified above and then use bundlerEn in stdenv.mkDerivation { name = "my-script"; - - buildInputs = [ env.wrapper ]; - + buildInputs = [ env.wrappedRuby ]; script = ./my-script.rb; - buildCommand = '' - mkdir -p $out/bin install -D -m755 $script $out/bin/my-script patchShebangs $out/bin/my-script ''; @@ -74,4 +120,3 @@ in stdenv.mkDerivation { - diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a81ad6ca9eb4..a2acc91e55a2 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -73,7 +73,7 @@ $outputMan - is for man pages (except for section 3). They go to man or doc or $outputBin by default. + is for man pages (except for section 3). They go to man or $outputBin by default. @@ -83,7 +83,7 @@ $outputInfo - is for info pages. They go to info or doc or $outputMan by default. + is for info pages. They go to info or $outputBin by default. diff --git a/doc/overlays.xml b/doc/overlays.xml index f8f554bb5569..cc0aef447d2d 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -8,59 +8,88 @@ overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to compose the set of all packages. +Nixpkgs can be configured with a list of overlays, which are +applied in order. This means that the order of the overlays can be significant +if multiple layers override the same package. +
-Installing Overlays +Installing overlays -The set of overlays is looked for in the following places. The -first one present is considered, and all the rest are ignored: +The list of overlays is determined as follows. + +If the overlays argument is not provided explicitly, we look for overlays in a path. The path +is determined as follows: + First, if an overlays argument to the nixpkgs function itself is given, + then that is used. - As an argument of the imported attribute set. When importing Nixpkgs, - the overlays attribute argument can be set to a list of - functions, which is described in . - + This can be passed explicitly when importing nipxkgs, for example + import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }. + Otherwise, if the Nix path entry <nixpkgs-overlays> exists, we look for overlays + at that path, as described below. - In the directory pointed to by the Nix search path entry - <nixpkgs-overlays>. + See the section on NIX_PATH in the Nix manual for more details on how to + set a value for <nixpkgs-overlays>. - - In the directory ~/.config/nixpkgs/overlays/. + If one of ~/.config/nixpkgs/overlays.nix and + ~/.config/nixpkgs/overlays/ exists, then we look for overlays at that path, as + described below. It is an error if both exist. -For the second and third options, the directory should contain Nix expressions defining the -overlays. Each overlay can be a file, a directory containing a -default.nix, or a symlink to one of those. The expressions should follow -the syntax described in . +If we are looking for overlays at a path, then there are two cases: + + + If the path is a file, then the file is imported as a Nix expression and used as the list of + overlays. + -The order of the overlay layers can influence the recipe of packages if multiple layers override -the same recipe. In the case where overlays are loaded from a directory, they are loaded in -alphabetical order. + + If the path is a directory, then we take the content of the directory, order it + lexicographically, and attempt to interpret each as an overlay by: + + + Importing the file, if it is a .nix file. + + + Importing a top-level default.nix file, if it is a directory. + + + + + + -To install an overlay using the last option, you can clone the overlay's repository and add -a symbolic link to it in ~/.config/nixpkgs/overlays/ directory. +On a NixOS system the value of the nixpkgs.overlays option, if present, +is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for +non-NixOS operations (e.g. nix-env), which are looked up independently. + +The overlays.nix option therefore provides a convenient way to use the same +overlays for a NixOS system configuration and user configuration: the same file can be used +as overlays.nix and imported as the value of nixpkgs.overlays.
-
-Overlays Layout +
+Defining overlays -Overlays are expressed as Nix functions which accept 2 arguments and return a set of -packages. +Overlays are Nix functions which accept two arguments, +conventionally called self and super, +and return a set of packages. For example, the following is a valid overlay. self: super: @@ -75,25 +104,31 @@ self: super: } -The first argument, usually named self, corresponds to the final package +The first argument (self) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of rr in the example above come from self, as well as the overridden dependencies used in the boost override. -The second argument, usually named super, +The second argument (super) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current -overlay nor any of the following overlays. This set should be used either +overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of boost in the above example, comes from super, as well as the callPackage function. The value returned by this function should be a set similar to -pkgs/top-level/all-packages.nix, which contains +pkgs/top-level/all-packages.nix, containing overridden and/or new packages. +Overlays are similar to other methods for customizing Nixpkgs, in particular +the packageOverrides attribute described in . +Indeed, packageOverrides acts as an overlay with only the +super argument. It is therefore appropriate for basic use, +but overlays are more powerful and easier to distribute. +
diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 33a61f31938c..230f0ec7b93f 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -366,15 +366,33 @@ it. Place the resulting package.nix file into
-
+
-Autojump +Interactive shell helpers - autojump needs the shell integration to be useful but unlike other systems, - nix doesn't have a standard share directory location. This is why a - autojump-share script is shipped that prints the location - of the shared folder. This can then be used in the .bashrc like this: + Some packages provide the shell integration to be more useful. But + unlike other systems, nix doesn't have a standard share directory + location. This is why a bunch PACKAGE-share + scripts are shipped that print the location of the corresponding + shared folder. + + Current list of such packages is as following: + + + + + autojump: autojump-share + + + + + fzf: fzf-share + + + + + E.g. autojump can then used in the .bashrc like this: source "$(autojump-share)/autojump.bash" diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 5ed959abacec..ca86e6c9519b 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -212,7 +212,7 @@ $ nix-env -f . -iA libfoo Optionally commit the new package and open a pull request, or send a patch to - nix-dev@cs.uu.nl. + https://groups.google.com/forum/#!forum/nix-devel. diff --git a/doc/stdenv.xml b/doc/stdenv.xml index e637962fbb7d..dac53bc2b800 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,3 +1,4 @@ + @@ -1153,7 +1154,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello - + substitute @@ -1312,7 +1313,7 @@ someVar=$(stripHash $name) - + wrapProgram @@ -1342,12 +1343,34 @@ someVar=$(stripHash $name) - GCC wrapper - Adds the include subdirectory - of each build input to the NIX_CFLAGS_COMPILE - environment variable, and the lib and - lib64 subdirectories to - NIX_LDFLAGS. + CC 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. + + + Dependency finding is undoubtedly the main task of CC wrapper. + 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. + + + 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. + 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. + + + A problem with this final task is that CC 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. + 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". + + diff --git a/lib/deprecated.nix b/lib/deprecated.nix index d4e78c39250c..8cdfab381baf 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -309,48 +309,6 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; - # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults - # - # This function is best explained by an example: - # - # {version ? "2.x"}: - # - # mkDerivation (mergeAttrsByVersion "package-name" version - # { # version specific settings - # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; - # "2.x" = { src = ..; }; - # } - # { // shared settings - # buildInputs = [ common build inputs ]; - # meta = { .. } - # } - # ) - # - # Please note that e.g. Eelco Dolstra usually prefers having one file for - # each version. On the other hand there are valuable additional design goals - # - readability - # - do it once only - # - try to avoid duplication - # - # Marc Weber and Michael Raskin sometimes prefer keeping older - # versions around for testing and regression tests - as long as its cheap to - # do so. - # - # Very often it just happens that the "shared" code is the bigger part. - # Then using this function might be appropriate. - # - # Be aware that its easy to cause recompilations in all versions when using - # this function - also if derivations get too complex splitting into multiple - # files is the way to go. - # - # See misc.nix -> versionedDerivation - # discussion: nixpkgs: pull/310 - mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } - base - (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) - ]; - # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } listToAttrs (map (n: nameValuePair n lib.concat) diff --git a/lib/licenses.nix b/lib/licenses.nix index 8dd1c210b7fa..552874325d41 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -546,12 +546,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "zlib License"; }; - zpt20 = spdx { # FIXME: why zpt* instead of zpl* + zpl20 = spdx { spdxId = "ZPL-2.0"; fullName = "Zope Public License 2.0"; }; - zpt21 = spdx { + zpl21 = spdx { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e80fb20929a7..7fd33f3b396d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -33,6 +33,7 @@ algorith = "Dries Van Daele "; alibabzo = "Alistair Bill "; all = "Nix Committers "; + alunduil = "Alex Brandt "; ambrop72 = "Ambroz Bizjak "; amiddelk = "Arie Middelkoop "; amiloradovsky = "Andrew Miloradovsky "; @@ -75,6 +76,7 @@ berdario = "Dario Bertini "; bergey = "Daniel Bergey "; bhipple = "Benjamin Hipple "; + binarin = "Alexey Lebedeff "; bjg = "Brian Gough "; bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; @@ -88,11 +90,13 @@ bstrik = "Berno Strik "; bzizou = "Bruno Bzeznik "; c0dehero = "CodeHero "; + calbrecht = "Christian Albrecht "; calrama = "Moritz Maxeiner "; calvertvl = "Victor Calvert "; campadrenalin = "Philip Horger "; canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; + casey = "Casey Rodarmor "; cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; changlinli = "Changlin Li "; @@ -135,12 +139,14 @@ dbrock = "Daniel Brockman "; deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin "; + derchris = "Christian Gerbrandt "; DerGuteMoritz = "Moritz Heidkamp "; dermetfan = "Robin Stumm "; DerTim1 = "Tim Digel "; desiderius = "Didier J. Devroye "; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen "; + dfordivam = "Divam "; dfoxfranke = "Daniel Fox Franke "; dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; @@ -172,6 +178,7 @@ ekleog = "Leo Gaspard "; elasticdog = "Aaron Bull Schaefer "; eleanor = "Dejan Lukan "; + elijahcaine = "Elijah Caine "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; eperuffo = "Emanuele Peruffo "; @@ -208,10 +215,12 @@ garrison = "Jim Garrison "; gavin = "Gavin Rogers "; gebner = "Gabriel Ebner "; + geistesk = "Alvar Penning "; georgewhewell = "George Whewell "; gilligan = "Tobias Pflug "; giogadi = "Luis G. Torres "; gleber = "Gleb Peregud "; + glenns = "Glenn Searby "; globin = "Robin Gloster "; gnidorah = "Alex Ivanov "; goibhniu = "Cillian de Róiste "; @@ -219,6 +228,7 @@ goodrone = "Andrew Trachenko "; gpyh = "Yacine Hmito "; grahamc = "Graham Christensen "; + grburst = "Julius Elias "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; guillaumekoenig = "Guillaume Koenig "; @@ -230,6 +240,7 @@ hectorj = "Hector Jusforgues "; heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; + hhm = "hhm "; hinton = "Tom Hinton "; hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; @@ -238,14 +249,14 @@ ianwookim = "Ian-Woo Kim "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; - infinisil = "Silvan Mosberger || [major.minor]" >&2 @@ -18,10 +18,10 @@ if [ "$#" -lt 2 ]; then usage fi -GNOME_TOP="$1" +GNOME_TOP=$1 shift -action="$1" +action=$1 # curl -l ftp://... doesn't work from my office in HSE, and I don't want to have # any conversations with sysadmin. Somehow lftp works. @@ -36,18 +36,18 @@ else fi find_project() { - exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d $@ + exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@" } show_project() { - local project="$1" - local majorVersion="$2" - local version="" + local project=$1 + local majorVersion=$2 + local version= if [ -z "$majorVersion" ]; then echo "Looking for available versions..." >&2 - local available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) - if [ "$?" -ne "0" ]; then + local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n) + if [ "$?" -ne 0 ]; then echo "Project $project not found" >&2 return 1 fi @@ -59,11 +59,11 @@ show_project() { if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then # not a major version - version="$majorVersion" + version=$majorVersion majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) fi - local FTPDIR="${GNOME_FTP}/${project}/${majorVersion}" + local FTPDIR=${GNOME_FTP}/${project}/${majorVersion} #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` # gnome's LATEST-IS is broken. Do not trust it. @@ -92,7 +92,7 @@ show_project() { esac done echo "Found versions ${!versions[@]}" >&2 - version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` + version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1) if [ -z "$version" ]; then echo "No version available for major $majorVersion" >&2 return 1 @@ -103,7 +103,7 @@ show_project() { local name=${project}-${version} echo "Fetching .sha256 file" >&2 - local sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum) + local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum) if [ "$?" -ne "0" ]; then echo "Version not found" >&2 @@ -136,8 +136,8 @@ fetchurl: { } update_project() { - local project="$1" - local majorVersion="$2" + local project=$1 + local majorVersion=$2 # find project in nixpkgs tree projectPath=$(find_project -name "$project" -print) @@ -150,14 +150,14 @@ update_project() { if [ "$?" -eq "0" ]; then echo "Updating $projectPath/src.nix" >&2 - echo -e "$src" > "$projectPath/src.nix" + echo -e "$src" > "$projectPath"/src.nix fi return 0 } -if [ "$action" == "update-all" ]; then - majorVersion="$2" +if [ "$action" = "update-all" ]; then + majorVersion=$2 if [ -z "$majorVersion" ]; then echo "No major version specified" >&2 usage @@ -170,23 +170,23 @@ if [ "$action" == "update-all" ]; then echo "Skipping $project" else echo "= Updating $project to $majorVersion" >&2 - update_project $project $majorVersion + update_project "$project" "$majorVersion" echo >&2 fi done else - project="$2" - majorVersion="$3" + project=$2 + majorVersion=$3 if [ -z "$project" ]; then echo "No project specified, exiting" >&2 usage fi - if [ "$action" == "show" ]; then - show_project $project $majorVersion - elif [ "$action" == "update" ]; then - update_project $project $majorVersion + if [ "$action" = show ]; then + show_project "$project" "$majorVersion" + elif [ "$action" = update ]; then + update_project "$project" "$majorVersion" else echo "Unknown action $action" >&2 usage diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 649798ec76b0..4da4f7dacfae 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -53,8 +53,8 @@ while test -n "$1"; do nox) echo "=== Fetching Nox from binary cache" - # build nox silently so it's not in the log - nix-build "" -A nox -A stdenv + # build nox (+ a basic nix-shell env) silently so it's not in the log + nix-shell -p nox stdenv --command true ;; pr) diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index d06dee150994..7c73510c353a 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -91,6 +91,7 @@ def _get_latest_version_pypi(package, extension): if release['filename'].endswith(extension): # TODO: In case of wheel we need to do further checks! sha256 = release['digests']['sha256'] + break else: sha256 = None return version, sha256 diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 4a74e406b14c..b97f989d902c 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,7 +11,7 @@ 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 OS X you can run diskutil list +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. diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index 6be8bc780f13..d2b2d5b7965c 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -17,11 +17,16 @@ nixos-option - option.name + + + path + + + + option.name - Description This command evaluates the configuration specified in @@ -33,6 +38,45 @@ attributes contained in the attribute set. +Options + +This command accepts the following options: + + + + + path + + + This option is passed to the underlying + nix-instantiate invocation. + + + + + + + + + This option enables verbose mode, which currently is just + the Bash set debug mode. + + + + + + + + + This option causes the output to be rendered as XML. + + + + + + + + Environment diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 2c28dd448016..9aa332f026da 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -18,7 +18,7 @@ If you encounter problems, please report them on the nix-dev@lists.science.uu.nl + xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel mailing list or on the #nixos channel on Freenode. Bugs should diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 967fbcf869db..6c1c46844ccb 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -28,7 +28,7 @@ has the following highlights: since version 0.0 as well as the most recent Stackage Nightly snapshot. The announcement "Full + xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">"Full Stackage Support in Nixpkgs" gives additional details. diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index ade7d5581ced..3abafac97378 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -78,13 +78,13 @@ following incompatible changes: our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. The + xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change has been discussed at length on the nix-dev mailing list and in Github issue #14897. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in another + xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article. diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 34cfe1702e9c..fc7fd49907ea 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -85,6 +85,10 @@ rmdir /var/lib/ipfs/.ipfs + + The following changes apply if the stateVersion is changed to 17.09 or higher. + For stateVersion = "17.03 or lower the old behavior is preserved. + The postgres default version was changed from 9.5 to 9.6. @@ -94,6 +98,9 @@ rmdir /var/lib/ipfs/.ipfs The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. + + The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. + @@ -113,9 +120,50 @@ rmdir /var/lib/ipfs/.ipfs also serve as a SSH agent if enableSSHSupport is set. + + + The services.tinc.networks.<name>.listenAddress + option had a misleading name that did not correspond to its behavior. It + now correctly defines the ip to listen for incoming connections on. To + keep the previous behaviour, use + services.tinc.networks.<name>.bindToAddress + instead. Refer to the description of the options for more details. + + + + + tlsdate package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + + + + + wvdial package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + + + + + cc-wrapper's setup-hook now exports a number of + environment variables corresponding to binutils binaries, + (e.g. LD, STRIP, RANLIB, + etc). This is done to prevent packages' build systems guessing, which is + harder to predict, especially when cross-compiling. However, some packages + have broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. + + + + + services.firefox.syncserver now runs by default as a + non-root user. To accomodate this change, the default sqlite database + location has also been changed. Migration should work automatically. + Refer to the description of the options for more details. + + - Other notable improvements: @@ -141,6 +189,32 @@ rmdir /var/lib/ipfs/.ipfs module where user Fontconfig settings are available. + + + ZFS/SPL have been updated to 0.7.0, zfsUnstable, splUnstable + have therefore been removed. + + + + + The option now allows the value + null in addition to timezone strings. This value + allows changing the timezone of a system imperatively using + timedatectl set-timezone. The default timezone + is still UTC. + + + + + Nixpkgs overlays may now be specified with a file as well as a directory. The + value of <nixpkgs-overlays> may be a file, and + ~/.config/nixpkgs/overlays.nix can be used instead of the + ~/.config/nixpkgs/overalys directory. + + + See the overlays chapter of the Nixpkgs manual for more details. + + diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 56766ec9047f..9c91bf392251 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -39,6 +39,12 @@ with lib; let + extensions = { + qcow2 = "qcow2"; + vpc = "vhd"; + raw = "img"; + }; + # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix # TODO: factor out more cleanly @@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM ( mv $diskImage $out/nixos.img diskImage=$out/nixos.img '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2 - diskImage=$out/nixos.qcow2 + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}} + diskImage=$out/nixos.${extensions.${format}} ''} ${postVM} ''; diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 23839ea487db..f06649e1991a 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -33,7 +33,7 @@ pkgs.stdenv.mkDerivation { echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" truncate -s $bytes $out - faketime "1970-01-01 00:00:00" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out + faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs. # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep: @@ -76,7 +76,7 @@ pkgs.stdenv.mkDerivation { echo sif $file gid 30000 # chgrp to nixbld done - ) | faketime "1970-01-01 00:00:00" debugfs -w $out -f /dev/stdin > errorlog 2>&1 + ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1 # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually. if egrep -q 'Could not allocate|File not found' errorlog; then diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cdfac71634d4..d76fb644d029 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -22,15 +22,26 @@ in { generated image. Glob patterns work. ''; }; + + sizeMB = mkOption { + type = types.int; + default = if config.ec2.hvm then 2048 else 8192; + description = "The size in MB of the image"; + }; + + format = mkOption { + type = types.enum [ "raw" "qcow2" "vpc" ]; + default = "qcow2"; + description = "The image format to output"; + }; }; config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { inherit lib config; - inherit (cfg) contents; + inherit (cfg) contents format; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; - diskSize = if config.ec2.hvm then 2048 else 8192; - format = "qcow2"; + diskSize = cfg.sizeMB; configFile = pkgs.writeText "configuration.nix" '' { @@ -41,5 +52,4 @@ in { } ''; }; - } diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index da875d6e4821..710dfdd01af5 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -19,7 +19,6 @@ let bind_policy ${config.users.ldap.bind.policy} ${optionalString config.users.ldap.useTLS '' ssl start_tls - tls_checkpeer no ''} ${optionalString (config.users.ldap.bind.distinguishedName != "") '' binddn ${config.users.ldap.bind.distinguishedName} diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index d503f5a8b20e..619f36cd5150 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -20,12 +20,26 @@ in options = { + networking.hosts = lib.mkOption { + type = types.attrsOf ( types.listOf types.str ); + default = {}; + example = literalExample '' + { + "127.0.0.1" = [ "foo.bar.baz" ]; + "192.168.0.2" = [ "fileserver.local" "nameserver.local" ]; + }; + ''; + description = '' + Locally defined maps of hostnames to IP addresses. + ''; + }; + networking.extraHosts = lib.mkOption { type = types.lines; default = ""; example = "192.168.0.1 lanlocalhost"; description = '' - Additional entries to be appended to /etc/hosts. + Additional verbatim entries to be appended to /etc/hosts. ''; }; @@ -188,11 +202,22 @@ in # /etc/hosts: Hostname-to-IP mappings. "hosts".text = + let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set ); + allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set ); + userLocalHosts = optionalString + ( builtins.hasAttr "127.0.0.1" cfg.hosts ) + ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" )); + userLocalHosts6 = optionalString + ( builtins.hasAttr "::1" cfg.hosts ) + ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" )); + otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]); + in '' - 127.0.0.1 localhost + 127.0.0.1 ${userLocalHosts} localhost ${optionalString cfg.enableIPv6 '' - ::1 localhost + ::1 ${userLocalHosts6} localhost ''} + ${otherHosts} ${cfg.extraHosts} ''; @@ -223,7 +248,9 @@ in ''; } // optionalAttrs config.services.resolved.enable { - "resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + # symlink the static version of resolv.conf as recommended by upstream: + # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf + "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf"; } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) { "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; }; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 13477337bda5..4b7787302521 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -26,7 +26,15 @@ with lib; fonts.fontconfig.enable = false; - nixpkgs.config.packageOverrides = pkgs: - { dbus = pkgs.dbus.override { x11Support = false; }; }; + nixpkgs.config.packageOverrides = pkgs: { + dbus = pkgs.dbus.override { x11Support = false; }; + networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; }; + networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; }; + networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; }; + networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; }; + networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; + networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; + pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; + }; }; } diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 16c43a99ad56..97278238dcd5 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -28,7 +28,8 @@ let passwdArray = [ "files" ] ++ optional sssd "sss" ++ optionals ldap [ "ldap" ] - ++ optionals mymachines [ "mymachines" ]; + ++ optionals mymachines [ "mymachines" ] + ++ [ "systemd" ]; shadowArray = [ "files" ] ++ optional sssd "sss" diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index bd80c8113483..8b9c3570476a 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -6,6 +6,7 @@ with lib; let cfg = config.hardware.pulseaudio; + alsaCfg = config.sound; systemWide = cfg.enable && cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide; @@ -76,6 +77,7 @@ let ctl.!default { type pulse } + ${alsaCfg.extraConfig} ''); in { @@ -222,7 +224,7 @@ in { # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; - systemd.packages = [ cfg.package ]; + systemd.packages = [ overriddenPackage ]; }) (mkIf hasZeroconf { diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index e57ed2565a10..fed3fa3bc7c8 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -5,6 +5,52 @@ with lib; let + randomEncryptionCoerce = enable: { inherit enable; }; + + randomEncryptionOpts = { ... }: { + + options = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Encrypt swap device with a random key. This way you won't have a persistent swap device. + + WARNING: Don't try to hibernate when you have at least one swap partition with + this option enabled! We have no way to set the partition into which hibernation image + is saved, so if your image ends up on an encrypted one you would lose it! + + WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device + when using randomEncryption as the UUIDs and labels will get erased on every boot when + the partition is encrypted. Best to use /dev/disk/by-partuuid/… + ''; + }; + + cipher = mkOption { + default = "aes-xts-plain64"; + example = "serpent-xts-plain64"; + type = types.str; + description = '' + Use specified cipher for randomEncryption. + + Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine. + ''; + }; + + source = mkOption { + default = "/dev/urandom"; + example = "/dev/random"; + type = types.str; + description = '' + Define the source of randomness to obtain a random key for encryption. + ''; + }; + + }; + + }; + swapCfg = {config, options, ...}: { options = { @@ -47,10 +93,17 @@ let randomEncryption = mkOption { default = false; - type = types.bool; + example = { + enable = true; + cipher = "serpent-xts-plain64"; + source = "/dev/random"; + }; + type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts); description = '' Encrypt swap device with a random key. This way you won't have a persistent swap device. + HINT: run "cryptsetup benchmark" to test cipher performance on your machine. + WARNING: Don't try to hibernate when you have at least one swap partition with this option enabled! We have no way to set the partition into which hibernation image is saved, so if your image ends up on an encrypted one you would lose it! @@ -77,7 +130,7 @@ let device = mkIf options.label.isDefined "/dev/disk/by-label/${config.label}"; deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device); - realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device; + realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device; }; }; @@ -125,14 +178,14 @@ in createSwapDevice = sw: assert sw.device != ""; - assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid" sw.device); - assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device); + assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid" sw.device); + assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device); let realDevice' = escapeSystemdPath sw.realDevice; in nameValuePair "mkswap-${sw.deviceName}" { description = "Initialisation of swap device ${sw.device}"; wantedBy = [ "${realDevice'}.swap" ]; before = [ "${realDevice'}.swap" ]; - path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup; + path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup; script = '' @@ -145,13 +198,11 @@ in truncate --size "${toString sw.size}M" "${sw.device}" fi chmod 0600 ${sw.device} - ${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"} + ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} fi ''} - ${optionalString sw.randomEncryption '' - echo "secretkey" | cryptsetup luksFormat --batch-mode ${sw.device} - echo "secretkey" | cryptsetup luksOpen ${sw.device} ${sw.deviceName} - cryptsetup luksErase --batch-mode ${sw.device} + ${optionalString sw.randomEncryption.enable '' + cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName} mkswap ${sw.realDevice} ''} ''; @@ -159,12 +210,12 @@ in unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ]; unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = sw.randomEncryption; - serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}"; + serviceConfig.RemainAfterExit = sw.randomEncryption.enable; + serviceConfig.ExecStop = optionalString sw.randomEncryption.enable "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}"; restartIfChanged = false; }; - in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices)); + in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption.enable) config.swapDevices)); }; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index cf3cc2f22628..5d339eaea485 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -118,6 +118,9 @@ in "/share/themes" "/share/vim-plugins" "/share/vulkan" + "/share/kservices5" + "/share/kservicetypes5" + "/share/kxmlgui5" ]; system.path = pkgs.buildEnv { diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 39a45042c6cc..aa030a816d04 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -14,13 +14,16 @@ in time = { timeZone = mkOption { - default = "UTC"; - type = types.str; + default = null; + type = types.nullOr types.str; example = "America/New_York"; description = '' The time zone used when displaying times and dates. See for a comprehensive list of possible values for this setting. + + If null, the timezone will default to UTC and can be set imperatively + using timedatectl. ''; }; @@ -40,13 +43,14 @@ in # This way services are restarted when tzdata changes. systemd.globalEnvironment.TZDIR = tzdir; - environment.etc.localtime = - { source = "/etc/zoneinfo/${config.time.timeZone}"; - mode = "direct-symlink"; + systemd.services.systemd-timedated.environment = lib.optionalAttrs (config.time.timeZone != null) { NIXOS_STATIC_TIMEZONE = "1"; }; + + environment.etc = { + zoneinfo.source = tzdir; + } // lib.optionalAttrs (config.time.timeZone != null) { + localtime.source = "/etc/zoneinfo/${config.time.timeZone}"; + localtime.mode = "direct-symlink"; }; - - environment.etc.zoneinfo.source = tzdir; - }; } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 0e7ffbd3c2e1..a4715175cc95 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -527,7 +527,7 @@ in { input.gid = ids.gids.input; }; - system.activationScripts.users = stringAfter [ "etc" ] + system.activationScripts.users = stringAfter [ "stdio" ] '' ${pkgs.perl}/bin/perl -w \ -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ diff --git a/nixos/modules/hardware/mcelog.nix b/nixos/modules/hardware/mcelog.nix index e4ac7d39053f..13ad238870c2 100644 --- a/nixos/modules/hardware/mcelog.nix +++ b/nixos/modules/hardware/mcelog.nix @@ -3,7 +3,7 @@ with lib; { - meta.maintainers = [ maintainers.grahamc ]; + meta.maintainers = with maintainers; [ grahamc ]; options = { hardware.mcelog = { @@ -19,19 +19,17 @@ with lib; }; config = mkIf config.hardware.mcelog.enable { - systemd.services.mcelog = { - description = "Machine Check Exception Logging Daemon"; - wantedBy = [ "multi-user.target" ]; + systemd = { + packages = [ pkgs.mcelog ]; - serviceConfig = { - ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground"; - SuccessExitStatus = [ 0 15 ]; - - ProtectHome = true; - PrivateNetwork = true; - PrivateTmp = true; + services.mcelog = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ProtectHome = true; + PrivateNetwork = true; + PrivateTmp = true; + }; }; }; }; - } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 80241cd3ebec..4568a20e7789 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/crqd5wmrqipl4n1fcm5kkc1zg4sj80js-nix-1.11.11"; - i686-linux = "/nix/store/wsjn14xp5ja509d4dxb1c78zhirw0b5x-nix-1.11.11"; - x86_64-darwin = "/nix/store/zqkqnhk85g2shxlpb04y72h1i3db3gpl-nix-1.11.11"; + x86_64-linux = "/nix/store/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13"; + i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13"; + x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13"; } diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index e2ae2ee9fdf8..087fbcd4512f 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -140,7 +140,7 @@ channel_closure="$tmpdir/channel.closure" nix-store --export $channel_root > $channel_closure # Populate the target root directory with the basics -@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure +@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure" # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5ac5764cd7cb..859838182ed4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -139,6 +139,7 @@ btsync = 113; minecraft = 114; #monetdb = 115; # unused (not packaged), removed 2016-09-19 + vault = 115; rippled = 116; murmur = 117; foundationdb = 118; @@ -213,7 +214,7 @@ plex = 193; grafana = 196; skydns = 197; - ripple-rest = 198; + # ripple-rest = 198; # unused, removed 2017-08-12 nix-serve = 199; tvheadend = 200; uwsgi = 201; @@ -334,7 +335,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - #ddclient = 30; # unused + ddclient = 30; davfs2 = 31; disnix = 33; osgi = 34; @@ -415,6 +416,7 @@ btsync = 113; #minecraft = 114; # unused #monetdb = 115; # unused (not packaged), removed 2016-09-19 + vault = 115; #ripped = 116; # unused #murmur = 117; # unused foundationdb = 118; @@ -487,7 +489,7 @@ sabnzbd = 194; #grafana = 196; #unused #skydns = 197; #unused - #ripple-rest = 198; #unused + # ripple-rest = 198; # unused, removed 2017-08-12 #nix-serve = 199; #unused #tvheadend = 200; #unused uwsgi = 201; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3aeb1225ae5a..285c59572d55 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -105,7 +105,6 @@ ./programs/venus.nix ./programs/vim.nix ./programs/wireshark.nix - ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/zsh/oh-my-zsh.nix @@ -166,6 +165,7 @@ ./services/continuous-integration/buildbot/master.nix ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agent.nix + ./services/continuous-integration/hail.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix @@ -186,6 +186,7 @@ ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/opentsdb.nix + ./services/databases/postage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix @@ -243,6 +244,7 @@ ./services/logging/graylog.nix ./services/logging/heartbeat.nix ./services/logging/journalbeat.nix + ./services/logging/journalwatch.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix @@ -267,6 +269,7 @@ ./services/mail/rspamd.nix ./services/mail/rmilter.nix ./services/mail/nullmailer.nix + ./services/misc/airsonic.nix ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix @@ -286,6 +289,7 @@ ./services/misc/emby.nix ./services/misc/errbot.nix ./services/misc/etcd.nix + ./services/misc/exhibitor.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/fstrim.nix @@ -322,10 +326,10 @@ ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix - ./services/misc/ripple-rest.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix + ./services/misc/snapper.nix ./services/misc/sonarr.nix ./services/misc/spice-vdagentd.nix ./services/misc/ssm-agent.nix @@ -353,6 +357,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/osquery.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/blackbox-exporter.nix @@ -513,7 +518,6 @@ ./services/networking/teamspeak3.nix ./services/networking/tinc.nix ./services/networking/tftpd.nix - ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/toxvpn.nix ./services/networking/tvheadend.nix @@ -554,16 +558,20 @@ ./services/security/oauth2_proxy.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix + ./services/security/sks.nix ./services/security/sshguard.nix ./services/security/tor.nix ./services/security/torify.nix ./services/security/torsocks.nix + ./services/security/usbguard.nix + ./services/security/vault.nix ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix ./services/system/kerberos.nix ./services/system/nscd.nix + ./services/system/saslauthd.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix @@ -579,6 +587,7 @@ ./services/web-apps/frab.nix ./services/web-apps/mattermost.nix ./services/web-apps/nixbot.nix + ./services/web-apps/pgpkeyserver-lite.nix ./services/web-apps/piwik.nix ./services/web-apps/pump.io.nix ./services/web-apps/tt-rss.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 530b2fbffd1c..6e6ae98e19fc 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -41,6 +41,9 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" + + # VMware support. + "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" # Hyper-V support. "hv_storvsc" diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 0a0838431da7..0ab210cc4c39 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -59,4 +59,10 @@ with lib; # the feature at runtime. Attempting to create a user namespace # with unshare will then fail with "no space left on device". boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0; + + # Raise ASLR entropy for 64bit & 32bit, respectively. + # + # Note: mmap_rnd_compat_bits may not exist on 64bit. + boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32; + boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16; } diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 68adee94f79e..addc9dcca87e 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -55,79 +55,24 @@ in }; config = mkIf cfg.agent.enable { - systemd.user.services.gpg-agent = { - serviceConfig = { - ExecStart = [ - "" - ("${pkgs.gnupg}/bin/gpg-agent --supervised " - + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support") - ]; - ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent"; - }; - }; - systemd.user.sockets.gpg-agent = { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent" ]; - socketConfig = { - FileDescriptorName = "std"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.ssh" ]; - socketConfig = { - FileDescriptorName = "ssh"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.extra" ]; - socketConfig = { - FileDescriptorName = "extra"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.browser" ]; - socketConfig = { - FileDescriptorName = "browser"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; - systemd.user.services.dirmngr = { - requires = [ "dirmngr.socket" ]; - after = [ "dirmngr.socket" ]; - unitConfig = { - RefuseManualStart = "true"; - }; - serviceConfig = { - ExecStart = "${pkgs.gnupg}/bin/dirmngr --supervised"; - ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload dirmngr"; - }; - }; - - systemd.user.sockets.dirmngr = { + systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.dirmngr" ]; - socketConfig = { - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.packages = [ pkgs.gnupg ]; @@ -147,7 +92,7 @@ in ''); assertions = [ - { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent; + { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!"; } ]; diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix index 79a8ddb7ce37..720c29b1eaee 100644 --- a/nixos/modules/programs/oblogout.nix +++ b/nixos/modules/programs/oblogout.nix @@ -27,6 +27,7 @@ in type = types.int; default = 70; description = '' + Opacity percentage of Cairo rendered backgrounds. ''; }; @@ -34,6 +35,7 @@ in type = types.str; default = "black"; description = '' + Colour name or hex code (#ffffff) of the background color. ''; }; @@ -41,6 +43,9 @@ in type = types.str; default = "simplistic"; description = '' + Icon theme for the buttons, must be in the themes folder of + the package, or in + ~/.themes/<name>/oblogout/. ''; }; @@ -48,6 +53,7 @@ in type = types.str; default = "cancel, logout, restart, shutdown, suspend, hibernate"; description = '' + List and order of buttons to show. ''; }; @@ -55,6 +61,7 @@ in type = types.str; default = "Escape"; description = '' + Cancel logout/shutdown shortcut. ''; }; @@ -62,6 +69,7 @@ in type = types.str; default = "S"; description = '' + Shutdown shortcut. ''; }; @@ -69,6 +77,7 @@ in type = types.str; default = "R"; description = '' + Restart shortcut. ''; }; @@ -76,6 +85,7 @@ in type = types.str; default = "U"; description = '' + Suspend shortcut. ''; }; @@ -83,6 +93,7 @@ in type = types.str; default = "L"; description = '' + Logout shortcut. ''; }; @@ -90,6 +101,7 @@ in type = types.str; default = "K"; description = '' + Lock session shortcut. ''; }; @@ -97,6 +109,7 @@ in type = types.str; default = "H"; description = '' + Hibernate shortcut. ''; }; @@ -104,6 +117,7 @@ in type = types.str; default = "openbox --exit"; description = '' + Command to logout. ''; }; @@ -111,6 +125,7 @@ in type = types.str; default = ""; description = '' + Command to lock screen. ''; }; @@ -118,6 +133,7 @@ in type = types.str; default = ""; description = '' + Command to switch user. ''; }; }; diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix index 550634e65be9..aeb7fc508495 100644 --- a/nixos/modules/programs/qt5ct.nix +++ b/nixos/modules/programs/qt5ct.nix @@ -26,6 +26,6 @@ with lib; ###### implementation config = mkIf config.programs.qt5ct.enable { environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = [ pkgs.qt5ct ]; + environment.systemPackages = with pkgs; [ qt5ct libsForQt5.qtstyleplugins ]; }; } diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix index 433a0ca95fef..eb913477cf05 100644 --- a/nixos/modules/programs/thefuck.nix +++ b/nixos/modules/programs/thefuck.nix @@ -3,7 +3,12 @@ with lib; let - cfg = config.programs.thefuck; + prg = config.programs; + cfg = prg.thefuck; + + initScript = '' + eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias}) + ''; in { options = { @@ -24,8 +29,11 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ thefuck ]; - environment.shellInit = '' - eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias}) + environment.shellInit = initScript; + + programs.zsh.shellInit = mkIf prg.zsh.enable initScript; + programs.fish.shellInit = mkIf prg.fish.enable '' + ${pkgs.thefuck}/bin/thefuck --alias | source ''; }; } diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix deleted file mode 100644 index 1ed929ed4afa..000000000000 --- a/nixos/modules/programs/wvdial.nix +++ /dev/null @@ -1,71 +0,0 @@ -# Global configuration for wvdial. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - configFile = '' - [Dialer Defaults] - PPPD PATH = ${pkgs.ppp}/sbin/pppd - ${config.environment.wvdial.dialerDefaults} - ''; - - cfg = config.environment.wvdial; - -in -{ - ###### interface - - options = { - - environment.wvdial = { - - dialerDefaults = mkOption { - default = ""; - type = types.str; - example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"''; - description = '' - Contents of the "Dialer Defaults" section of - /etc/wvdial.conf. - ''; - }; - - pppDefaults = mkOption { - default = '' - noipdefault - usepeerdns - defaultroute - persist - noauth - ''; - type = types.str; - description = "Default ppp settings for wvdial."; - }; - - }; - - }; - - ###### implementation - - config = mkIf (cfg.dialerDefaults != "") { - - environment = { - - etc = - [ - { source = pkgs.writeText "wvdial.conf" configFile; - target = "wvdial.conf"; - } - { source = pkgs.writeText "wvdial" cfg.pppDefaults; - target = "ppp/peers/wvdial"; - } - ]; - - }; - - }; - -} diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index aa5844cdc4d4..9077643c4440 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -15,6 +15,16 @@ in ''; }; + package = mkOption { + default = pkgs.oh-my-zsh; + defaultText = "pkgs.oh-my-zsh"; + description = '' + Package to install for `oh-my-zsh` usage. + ''; + + type = types.package; + }; + plugins = mkOption { default = []; type = types.listOf(types.str); @@ -46,11 +56,11 @@ in # Prevent zsh from overwriting oh-my-zsh's prompt programs.zsh.promptInit = mkDefault ""; - environment.systemPackages = with pkgs; [ oh-my-zsh ]; + environment.systemPackages = [ cfg.package ]; - programs.zsh.interactiveShellInit = with pkgs; with builtins; '' + programs.zsh.interactiveShellInit = with builtins; '' # oh-my-zsh configuration generated by NixOS - export ZSH=${oh-my-zsh}/share/oh-my-zsh + export ZSH=${cfg.package}/share/oh-my-zsh ${optionalString (length(cfg.plugins) > 0) "plugins=(${concatStringsSep " " cfg.plugins})" diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index a055291282c9..ee61e2d2382c 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -158,6 +158,11 @@ in HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" + # Tell zsh how to find installed completions + for p in ''${(z)NIX_PROFILES}; do + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + done + ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} ${optionalString (cfg.enableAutosuggestions) @@ -172,11 +177,6 @@ in ${cfg.promptInit} - # Tell zsh how to find installed completions - for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) - done - # Read system-wide modifications. if test -f /etc/zshrc.local; then . /etc/zshrc.local diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index c3fb5758edeb..800e12956f24 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,14 +17,16 @@ with lib; (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) - (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ]) (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ]) (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) @@ -195,6 +197,8 @@ with lib; (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "") (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") + (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.") + (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") @@ -204,6 +208,7 @@ with lib; "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index 319dce9a6c55..6abac244dac2 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -13,6 +13,7 @@ with lib; unitConfig = { ConditionVirtualization = "!container"; ConditionSecurity = [ "audit" ]; + DefaultDependencies = false; }; path = [ pkgs.audit ]; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 5632500df2e0..ede4ace5ed03 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -281,7 +281,7 @@ let "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")} + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -350,7 +350,7 @@ let "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")} + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ''); }; diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 53786dbc6270..acf48d3c3d03 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -7,6 +7,8 @@ let inherit (pkgs) alsaUtils; + pulseaudioEnabled = config.hardware.pulseaudio.enable; + in { @@ -80,7 +82,7 @@ in environment.systemPackages = [ alsaUtils ]; - environment.etc = mkIf (config.sound.extraConfig != "") + environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") [ { source = pkgs.writeText "asound.conf" config.sound.extraConfig; target = "asound.conf"; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index bd6c316243c8..5f379b392ea8 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -10,11 +10,9 @@ let gid = config.ids.gids.mpd; cfg = config.services.mpd; - playlistDir = "${cfg.dataDir}/playlists"; - mpdConf = pkgs.writeText "mpd.conf" '' music_directory "${cfg.musicDirectory}" - playlist_directory "${playlistDir}" + playlist_directory "${cfg.playlistDirectory}" db_file "${cfg.dbFile}" state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" @@ -57,11 +55,21 @@ in { musicDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/music"; + defaultText = ''''${dataDir}/music''; description = '' The directory where mpd reads music from. ''; }; + playlistDirectory = mkOption { + type = types.path; + default = "${cfg.dataDir}/playlists"; + defaultText = ''''${dataDir}/playlists''; + description = '' + The directory where mpd stores playlists. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -120,6 +128,7 @@ in { dbFile = mkOption { type = types.str; default = "${cfg.dataDir}/tag_cache"; + defaultText = ''''${dataDir}/tag_cache''; description = '' The path to MPD's database. ''; @@ -153,7 +162,7 @@ in { preStart = '' mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" - mkdir -p "${playlistDir}" && chown -R ${cfg.user}:${cfg.group} "${playlistDir}" + mkdir -p "${cfg.playlistDirectory}" && chown -R ${cfg.user}:${cfg.group} "${cfg.playlistDirectory}" ''; serviceConfig = { User = "${cfg.user}"; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ee38a42199ee..fb91a29a4000 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -36,9 +36,9 @@ in package = mkOption { type = types.package; - default = pkgs.slurm-llnl; - defaultText = "pkgs.slurm-llnl"; - example = literalExample "pkgs.slurm-llnl-full"; + default = pkgs.slurm; + defaultText = "pkgs.slurm"; + example = literalExample "pkgs.slurm-full"; description = '' The package to use for slurm binaries. ''; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index b11bc031b3ff..ce0583dad54d 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -4,15 +4,65 @@ with lib; let cfg = config.services.gitlab-runner; - configFile = pkgs.writeText "config.toml" cfg.configText; + configFile = + if (cfg.configFile == null) then + (pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ + > $out + '') + else + cfg.configFile; hasDocker = config.virtualisation.docker.enable; in { options.services.gitlab-runner = { enable = mkEnableOption "Gitlab Runner"; - configText = mkOption { - description = "Verbatim config.toml to use"; + configFile = mkOption { + default = null; + description = '' + Configuration file for gitlab-runner. + Use this option in favor of configOptions to avoid placing CI tokens in the nix store. + + takes precedence over . + + Warning: Not using will potentially result in secrets + leaking into the WORLD-READABLE nix store. + ''; + type = types.nullOr types.path; + }; + + configOptions = mkOption { + description = '' + Configuration for gitlab-runner + will take precedence over this option. + + Warning: all Configuration, especially CI token, will be stored in a + WORLD-READABLE file in the Nix Store. + + If you want to protect your CI token use instead. + ''; + type = types.attrs; + example = { + concurrent = 2; + runners = [{ + name = "docker-nix-1.11"; + url = "https://CI/"; + token = "TOKEN"; + executor = "docker"; + builds_dir = ""; + docker = { + host = ""; + image = "nixos/nix:1.11"; + privileged = true; + disable_cache = true; + cache_dir = ""; + }; + }]; + }; }; gracefulTermination = mkOption { diff --git a/nixos/modules/services/continuous-integration/hail.nix b/nixos/modules/services/continuous-integration/hail.nix new file mode 100644 index 000000000000..5d0c3f7b4ab3 --- /dev/null +++ b/nixos/modules/services/continuous-integration/hail.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.hail; +in { + + + ###### interface + + options.services.hail = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables the Hail Auto Update Service. Hail can automatically deploy artifacts + built by a Hydra Continous Integration server. A common use case is to provide + continous deployment for single services or a full NixOS configuration.''; + }; + profile = mkOption { + type = types.str; + default = "hail-profile"; + description = "The name of the Nix profile used by Hail."; + }; + hydraJobUri = mkOption { + type = types.str; + description = "The URI of the Hydra Job."; + }; + netrc = mkOption { + type = types.nullOr types.path; + description = "The netrc file to use when fetching data from Hydra."; + default = null; + }; + package = mkOption { + type = types.package; + default = pkgs.haskellPackages.hail; + defaultText = "pkgs.haskellPackages.hail"; + description = "Hail package to use."; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.hail = { + description = "Hail Auto Update Service"; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ nix ]; + environment = { + HOME = "/var/lib/empty"; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/hail --profile ${cfg.profile} --job-uri ${cfg.hydraJobUri}" + + lib.optionalString (cfg.netrc != null) " --netrc-file ${cfg.netrc}"; + }; + }; + }; +} diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index dd88624f406c..9ffe9fdea2ce 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -68,9 +68,9 @@ let collectd = [{ enabled = false; - typesdb = "${pkgs.collectd}/share/collectd/types.db"; + typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; database = "collectd_db"; - port = 25826; + bind-address = ":25826"; }]; opentsdb = [{ @@ -149,7 +149,6 @@ in type = types.attrs; }; }; - }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index c56564f57f36..78dbf0d784cf 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -108,7 +108,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; + ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; User = cfg.user; PIDFile = cfg.pidFile; Type = "forking"; diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/postage.nix new file mode 100644 index 000000000000..d49c9a83a46f --- /dev/null +++ b/nixos/modules/services/databases/postage.nix @@ -0,0 +1,205 @@ +{ lib, pkgs, config, ... } : + +with lib; + +let + cfg = config.services.postage; + + confFile = pkgs.writeTextFile { + name = "postage.conf"; + text = '' + connection_file = ${postageConnectionsFile} + + allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections} + + postage_port = ${toString cfg.port} + + super_only = ${builtins.toJSON cfg.superOnly} + + ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"} + + login_timeout = ${toString cfg.loginTimeout} + + web_root = ${cfg.package}/etc/postage/web_root + + data_root = ${cfg.dataRoot} + + ${optionalString (!isNull cfg.tls) '' + tls_cert = ${cfg.tls.cert} + tls_key = ${cfg.tls.key} + ''} + + log_level = ${cfg.logLevel} + ''; + }; + + postageConnectionsFile = pkgs.writeTextFile { + name = "postage-connections.conf"; + text = concatStringsSep "\n" + (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections); + }; + + postage = "postage"; +in { + + options.services.postage = { + enable = mkEnableOption "PostgreSQL Administration for the web"; + + package = mkOption { + type = types.package; + default = pkgs.postage; + defaultText = "pkgs.postage"; + description = '' + The postage package to use. + ''; + }; + + connections = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; + "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; + }; + description = '' + Postage requires at least one PostgreSQL server be defined. + + Detailed information about PostgreSQL connection strings is available at: + + + Note that you should not specify your user name or password. That + information will be entered on the login screen. If you specify a + username or password, it will be removed by Postage before attempting to + connect to a database. + ''; + }; + + allowCustomConnections = mkOption { + type = types.bool; + default = false; + description = '' + This tells Postage whether or not to allow anyone to use a custom + connection from the login screen. + ''; + }; + + port = mkOption { + type = types.int; + default = 8080; + description = '' + This tells Postage what port to listen on for browser requests. + ''; + }; + + localOnly = mkOption { + type = types.bool; + default = true; + description = '' + This tells Postage whether or not to set the listening socket to local + addresses only. + ''; + }; + + superOnly = mkOption { + type = types.bool; + default = true; + description = '' + This tells Postage whether or not to only allow super users to + login. The recommended value is true and will restrict users who are not + super users from logging in to any PostgreSQL instance through + Postage. Note that a connection will be made to PostgreSQL in order to + test if the user is a superuser. + ''; + }; + + loginGroup = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + This tells Postage to only allow users in a certain PostgreSQL group to + login to Postage. Note that a connection will be made to PostgreSQL in + order to test if the user is a member of the login group. + ''; + }; + + loginTimeout = mkOption { + type = types.int; + default = 3600; + description = '' + Number of seconds of inactivity before user is automatically logged + out. + ''; + }; + + dataRoot = mkOption { + type = types.str; + default = "/var/lib/postage"; + description = '' + This tells Postage where to put the SQL file history. All tabs are saved + to this location so that if you get disconnected from Postage you + don't lose your work. + ''; + }; + + tls = mkOption { + type = types.nullOr (types.submodule { + options = { + cert = mkOption { + type = types.str; + description = "TLS certificate"; + }; + key = mkOption { + type = types.str; + description = "TLS key"; + }; + }; + }); + default = null; + description = '' + These options tell Postage where the TLS Certificate and Key files + reside. If you use these options then you'll only be able to access + Postage through a secure TLS connection. These options are only + necessary if you wish to connect directly to Postage using a secure TLS + connection. As an alternative, you can set up Postage in a reverse proxy + configuration. This allows your web server to terminate the secure + connection and pass on the request to Postage. You can find help to set + up this configuration in: + + ''; + }; + + logLevel = mkOption { + type = types.enum ["error" "warn" "notice" "info"]; + default = "error"; + description = '' + Verbosity of logs + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.postage = { + description = "postage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = postage; + Group = postage; + ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; + }; + }; + users = { + users."${postage}" = { + name = postage; + group = postage; + home = cfg.dataRoot; + createHome = true; + }; + groups."${postage}" = { + name = postage; + }; + }; + }; +} diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 9d6395ebd74c..dd66bac442c6 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -24,7 +24,7 @@ Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under - OS X, a "Mac port" edition is + macOS, a "Mac port" edition is available, which uses Apple's native GUI frameworks. @@ -84,7 +84,7 @@ Emacs 25 with the "Mac port" patches, providing a more - native look and feel under OS X. + native look and feel under macOS. diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index e7f070d08773..1dc8ce93a0e5 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -39,7 +39,7 @@ let admins = []; }; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); - modDir = pkgs.factorio-mkModDirDrv cfg.mods; + modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; in { options = { diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 3b108c87edd2..68425822a884 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -57,6 +57,8 @@ in powerManagement.scsiLinkPolicy = null; powerManagement.cpuFreqGovernor = null; + systemd.sockets."systemd-rfkill".enable = false; + systemd.services = { "systemd-rfkill@".enable = false; "systemd-rfkill".enable = false; diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix index 9fbec2457371..95825705d9d7 100644 --- a/nixos/modules/services/logging/fluentd.nix +++ b/nixos/modules/services/logging/fluentd.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.fluentd; + + pluginArgs = concatStringsSep " " (map (x: "-p ${x}") cfg.plugins); in { ###### interface @@ -28,6 +30,15 @@ in { defaultText = "pkgs.fluentd"; description = "The fluentd package to use."; }; + + plugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of plugin paths to pass into fluentd. It will make plugins defined in ruby files + there available in your config. + ''; + }; }; }; @@ -39,7 +50,7 @@ in { description = "Fluentd Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; + ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config} ${pluginArgs}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 9f0fb11f0252..a0dc0d6d089d 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -11,9 +11,7 @@ let password_secret = ${cfg.passwordSecret} root_username = ${cfg.rootUsername} root_password_sha2 = ${cfg.rootPasswordSha2} - elasticsearch_cluster_name = ${cfg.elasticsearchClusterName} - elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled} - elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts} + elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts} message_journal_dir = ${cfg.messageJournalDir} mongodb_uri = ${cfg.mongodbUri} plugin_dir = /var/lib/graylog/plugins @@ -91,22 +89,10 @@ in ''; }; - elasticsearchClusterName = mkOption { - type = types.str; - example = "graylog"; - description = "This must be the same as for your Elasticsearch cluster"; - }; - - elasticsearchDiscoveryZenPingMulticastEnabled = mkOption { - type = types.bool; - default = false; - description = "Whether to use elasticsearch multicast discovery"; - }; - - elasticsearchDiscoveryZenPingUnicastHosts = mkOption { - type = types.str; - default = "127.0.0.1:9300"; - description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details"; + elasticsearchHosts = mkOption { + type = types.listOf types.str; + example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; + description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; }; messageJournalDir = mkOption { diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix new file mode 100644 index 000000000000..d49795fe2b77 --- /dev/null +++ b/nixos/modules/services/logging/journalwatch.nix @@ -0,0 +1,246 @@ +{ config, lib, pkgs, services, ... }: +with lib; + +let + cfg = config.services.journalwatch; + user = "journalwatch"; + dataDir = "/var/lib/${user}"; + + journalwatchConfig = pkgs.writeText "config" ('' + # (File Generated by NixOS journalwatch module.) + [DEFAULT] + mail_binary = ${cfg.mailBinary} + priority = ${toString cfg.priority} + mail_from = ${cfg.mailFrom} + '' + + optionalString (cfg.mailTo != null) '' + mail_to = ${cfg.mailTo} + '' + + cfg.extraConfig); + + journalwatchPatterns = pkgs.writeText "patterns" '' + # (File Generated by NixOS journalwatch module.) + + ${mkPatterns cfg.filterBlocks} + ''; + + # empty line at the end needed to to separate the blocks + mkPatterns = filterBlocks: concatStringsSep "\n" (map (block: '' + ${block.match} + ${block.filters} + + '') filterBlocks); + + +in { + options = { + services.journalwatch = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, periodically check the journal with journalwatch and report the results by mail. + ''; + }; + + priority = mkOption { + type = types.int; + default = 6; + description = '' + Lowest priority of message to be considered. + A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info"). + If you don't care about anything with "info" priority, you can reduce + this to e.g. 5 ("notice") to considerably reduce the amount of + messages without needing many . + ''; + }; + + # HACK: this is a workaround for journalwatch's usage of socket.getfqdn() which always returns localhost if + # there's an alias for the localhost on a separate line in /etc/hosts, or take for ages if it's not present and + # then return something right-ish in the direction of /etc/hostname. Just bypass it completely. + mailFrom = mkOption { + type = types.str; + default = "journalwatch@${config.networking.hostName}"; + description = '' + Mail address to send journalwatch reports from. + ''; + }; + + mailTo = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Mail address to send journalwatch reports to. + ''; + }; + + mailBinary = mkOption { + type = types.path; + default = "/run/wrappers/bin/sendmail"; + description = '' + Sendmail-compatible binary to be used to send the messages. + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra lines to be added verbatim to the journalwatch/config configuration file. + You can add any commandline argument to the config, without the '--'. + See journalwatch --help for all arguments and their description. + ''; + }; + + filterBlocks = mkOption { + type = types.listOf (types.submodule { + options = { + match = mkOption { + type = types.str; + example = "SYSLOG_IDENTIFIER = systemd"; + description = '' + Syntax: field = value + Specifies the log entry field this block should apply to. + If the field of a message matches this value, + this patternBlock's are applied. + If value starts and ends with a slash, it is interpreted as + an extended python regular expression, if not, it's an exact match. + The journal fields are explained in systemd.journal-fields(7). + ''; + }; + + filters = mkOption { + type = types.str; + example = '' + (Stopped|Stopping|Starting|Started) .* + (Reached target|Stopped target) .* + ''; + description = '' + The filters to apply on all messages which satisfy . + Any of those messages that match any specified filter will be removed from journalwatch's output. + Each filter is an extended Python regular expression. + You can specify multiple filters and separate them by newlines. + Lines starting with '#' are comments. Inline-comments are not permitted. + ''; + }; + }; + }); + + example = [ + # examples taken from upstream + { + match = "_SYSTEMD_UNIT = systemd-logind.service"; + filters = '' + New session [a-z]?\d+ of user \w+\. + Removed session [a-z]?\d+\. + ''; + } + + { + match = "SYSLOG_IDENTIFIER = /(CROND|crond)/"; + filters = '' + pam_unix\(crond:session\): session (opened|closed) for user \w+ + \(\w+\) CMD .* + ''; + } + ]; + + # another example from upstream. + # very useful on priority = 6, and required as journalwatch throws an error when no pattern is defined at all. + default = [ + { + match = "SYSLOG_IDENTIFIER = systemd"; + filters = '' + (Stopped|Stopping|Starting|Started) .* + (Created slice|Removed slice) user-\d*\.slice\. + Received SIGRTMIN\+24 from PID .* + (Reached target|Stopped target) .* + Startup finished in \d*ms\. + ''; + } + ]; + + + description = '' + filterBlocks can be defined to blacklist journal messages which are not errors. + Each block matches on a log entry field, and the filters in that block then are matched + against all messages with a matching log entry field. + + All messages whose PRIORITY is at least 6 (INFO) are processed by journalwatch. + If you don't specify any filterBlocks, PRIORITY is reduced to 5 (NOTICE) by default. + + All regular expressions are extended Python regular expressions, for details + see: http://doc.pyschools.com/html/regex.html + ''; + }; + + interval = mkOption { + type = types.str; + default = "hourly"; + description = '' + How often to run journalwatch. + + The format is described in systemd.time(7). + ''; + }; + accuracy = mkOption { + type = types.str; + default = "10min"; + description = '' + The time window around the interval in which the journalwatch run will be scheduled. + + The format is described in systemd.time(7). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers.${user} = { + isSystemUser = true; + createHome = true; + home = dataDir; + # for journal access + group = "systemd-journal"; + }; + + systemd.services.journalwatch = { + environment = { + XDG_DATA_HOME = "${dataDir}/share"; + XDG_CONFIG_HOME = "${dataDir}/config"; + }; + serviceConfig = { + User = user; + Type = "oneshot"; + PermissionsStartOnly = true; + ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail"; + # lowest CPU and IO priority, but both still in best-effort class to prevent starvation + Nice=19; + IOSchedulingPriority=7; + }; + preStart = '' + chown -R ${user}:systemd-journal ${dataDir} + chmod -R u+rwX,go-w ${dataDir} + mkdir -p ${dataDir}/config/journalwatch + ln -sf ${journalwatchConfig} ${dataDir}/config/journalwatch/config + ln -sf ${journalwatchPatterns} ${dataDir}/config/journalwatch/patterns + ''; + }; + + systemd.timers.journalwatch = { + description = "Periodic journalwatch run"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.interval; + AccuracySec = cfg.accuracy; + Persistent = true; + }; + }; + + }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + }; +} diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index caaa87b94d61..01ae49d49090 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -9,7 +9,8 @@ let group = cfg.group; setgidGroup = cfg.setgidGroup; - haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; + haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" + || cfg.extraAliases != ""; haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; @@ -25,149 +26,275 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); - mainCf = - '' - compatibility_level = 9999 + mainCf = let + escape = replaceStrings ["$"] ["$$"]; + mkList = items: "\n " + concatMapStringsSep "\n " escape items; + mkVal = value: + if isList value then mkList value + else " " + (if value == true then "yes" + else if value == false then "no" + else toString value); + mkEntry = name: value: "${escape name} =${mkVal value}"; + in + concatStringsSep "\n" (mapAttrsToList mkEntry (recursiveUpdate defaultConf cfg.config)) + + "\n" + cfg.extraConfig; - mail_owner = ${user} - default_privs = nobody + defaultConf = { + compatibility_level = "9999"; + mail_owner = user; + default_privs = "nobody"; - # NixOS specific locations - data_directory = /var/lib/postfix/data - queue_directory = /var/lib/postfix/queue + # NixOS specific locations + data_directory = "/var/lib/postfix/data"; + queue_directory = "/var/lib/postfix/queue"; - # Default location of everything in package - meta_directory = ${pkgs.postfix}/etc/postfix - command_directory = ${pkgs.postfix}/bin - sample_directory = /etc/postfix - newaliases_path = ${pkgs.postfix}/bin/newaliases - mailq_path = ${pkgs.postfix}/bin/mailq - readme_directory = no - sendmail_path = ${pkgs.postfix}/bin/sendmail - daemon_directory = ${pkgs.postfix}/libexec/postfix - manpage_directory = ${pkgs.postfix}/share/man - html_directory = ${pkgs.postfix}/share/postfix/doc/html - shlib_directory = no + # Default location of everything in package + meta_directory = "${pkgs.postfix}/etc/postfix"; + command_directory = "${pkgs.postfix}/bin"; + sample_directory = "/etc/postfix"; + newaliases_path = "${pkgs.postfix}/bin/newaliases"; + mailq_path = "${pkgs.postfix}/bin/mailq"; + readme_directory = false; + sendmail_path = "${pkgs.postfix}/bin/sendmail"; + daemon_directory = "${pkgs.postfix}/libexec/postfix"; + manpage_directory = "${pkgs.postfix}/share/man"; + html_directory = "${pkgs.postfix}/share/postfix/doc/html"; + shlib_directory = false; + relayhost = if cfg.lookupMX || cfg.relayHost == "" + then cfg.relayHost + else "[${cfg.relayHost}]"; + mail_spool_directory = "/var/spool/mail/"; + setgid_group = setgidGroup; + } + // optionalAttrs config.networking.enableIPv6 { inet_protocols = "all"; } + // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; } + // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; } + // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; } + // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; } + // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; } + // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; } + // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } + // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } + // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; } + // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; } + // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } + // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } + // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } + // optionalAttrs (cfg.sslCert != "") { + smtp_tls_CAfile = cfg.sslCACert; + smtp_tls_cert_file = cfg.sslCert; + smtp_tls_key_file = cfg.sslKey; - '' - + optionalString config.networking.enableIPv6 '' - inet_protocols = all - '' - + (if cfg.networks != null then - '' - mynetworks = ${concatStringsSep ", " cfg.networks} - '' - else if cfg.networksStyle != "" then - '' - mynetworks_style = ${cfg.networksStyle} - '' - else - "") - + optionalString (cfg.hostname != "") '' - myhostname = ${cfg.hostname} - '' - + optionalString (cfg.domain != "") '' - mydomain = ${cfg.domain} - '' - + optionalString (cfg.origin != "") '' - myorigin = ${cfg.origin} - '' - + optionalString (cfg.destination != null) '' - mydestination = ${concatStringsSep ", " cfg.destination} - '' - + optionalString (cfg.relayDomains != null) '' - relay_domains = ${concatStringsSep ", " cfg.relayDomains} - '' - + '' - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then - cfg.relayHost - else - "[" + cfg.relayHost + "]"} + smtp_use_tls = true; - mail_spool_directory = /var/spool/mail/ + smtpd_tls_CAfile = cfg.sslCACert; + smtpd_tls_cert_file = cfg.sslCert; + smtpd_tls_key_file = cfg.sslKey; - setgid_group = ${setgidGroup} - '' - + optionalString (cfg.sslCert != "") '' + smtpd_use_tls = true; + }; - smtp_tls_CAfile = ${cfg.sslCACert} - smtp_tls_cert_file = ${cfg.sslCert} - smtp_tls_key_file = ${cfg.sslKey} + masterCfOptions = { options, config, name, ... }: { + options = { + name = mkOption { + type = types.str; + default = name; + example = "smtp"; + description = '' + The name of the service to run. Defaults to the attribute set key. + ''; + }; - smtp_use_tls = yes + type = mkOption { + type = types.enum [ "inet" "unix" "fifo" "pass" ]; + default = "unix"; + example = "inet"; + description = "The type of the service"; + }; - smtpd_tls_CAfile = ${cfg.sslCACert} - smtpd_tls_cert_file = ${cfg.sslCert} - smtpd_tls_key_file = ${cfg.sslKey} + private = mkOption { + type = types.bool; + example = false; + description = '' + Whether the service's sockets and storage directory is restricted to + be only available via the mail system. If null is + given it uses the postfix default true. + ''; + }; - smtpd_use_tls = yes - '' - + optionalString (cfg.recipientDelimiter != "") '' - recipient_delimiter = ${cfg.recipientDelimiter} - '' - + optionalString haveAliases '' - alias_maps = hash:/etc/postfix/aliases - '' - + optionalString haveTransport '' - transport_maps = hash:/etc/postfix/transport - '' - + optionalString haveVirtual '' - virtual_alias_maps = hash:/etc/postfix/virtual - '' - + optionalString (cfg.dnsBlacklists != []) '' - smtpd_client_restrictions = ${clientRestrictions} - '' - + cfg.extraConfig; + privileged = mkOption { + type = types.bool; + example = true; + description = ""; + }; - masterCf = '' - # ========================================================================== - # service type private unpriv chroot wakeup maxproc command + args - # (yes) (yes) (no) (never) (100) - # ========================================================================== - smtp inet n - n - - smtpd - '' + optionalString cfg.enableSubmission '' - submission inet n - n - - smtpd - ${concatStringsSep "\n " (mapAttrsToList (x: y: "-o " + x + "=" + y) cfg.submissionOptions)} - '' - + '' - pickup unix n - n 60 1 pickup - cleanup unix n - n - 0 cleanup - qmgr unix n - n 300 1 qmgr - tlsmgr unix - - n 1000? 1 tlsmgr - rewrite unix - - n - - trivial-rewrite - bounce unix - - n - 0 bounce - defer unix - - n - 0 bounce - trace unix - - n - 0 bounce - verify unix - - n - 1 verify - flush unix n - n 1000? 0 flush - proxymap unix - - n - - proxymap - proxywrite unix - - n - 1 proxymap - '' - + optionalString cfg.enableSmtp '' - smtp unix - - n - - smtp - relay unix - - n - - smtp - -o smtp_fallback_relay= - # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 - '' - + '' - showq unix n - n - - showq - error unix - - n - - error - retry unix - - n - - error - discard unix - - n - - discard - local unix - n n - - local - virtual unix - n n - - virtual - lmtp unix - - n - - lmtp - anvil unix - - n - 1 anvil - scache unix - - n - 1 scache - ${cfg.extraMasterConf} - ''; + chroot = mkOption { + type = types.bool; + example = true; + description = '' + Whether the service is chrooted to have only access to the + and the closure of + store paths specified by the option. + ''; + }; - aliases = + wakeup = mkOption { + type = types.int; + example = 60; + description = '' + Automatically wake up the service after the specified number of + seconds. If 0 is given, never wake the service + up. + ''; + }; + + wakeupUnusedComponent = mkOption { + type = types.bool; + example = false; + description = '' + If set to false the component will only be woken + up if it is used. This is equivalent to postfix' notion of adding a + question mark behind the wakeup time in + master.cf + ''; + }; + + maxproc = mkOption { + type = types.int; + example = 1; + description = '' + The maximum number of processes to spawn for this service. If the + value is 0 it doesn't have any limit. If + null is given it uses the postfix default of + 100. + ''; + }; + + command = mkOption { + type = types.str; + default = name; + example = "smtpd"; + description = '' + A program name specifying a Postfix service/daemon process. + By default it's the attribute . + ''; + }; + + args = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-o" "smtp_helo_timeout=5" ]; + description = '' + Arguments to pass to the . There is no shell + processing involved and shell syntax is passed verbatim to the + process. + ''; + }; + + rawEntry = mkOption { + type = types.listOf types.str; + default = []; + internal = true; + description = '' + The raw configuration line for the master.cf. + ''; + }; + }; + + config.rawEntry = let + mkBool = bool: if bool then "y" else "n"; + mkArg = arg: "${optionalString (hasPrefix "-" arg) "\n "}${arg}"; + + maybeOption = fun: option: + if options.${option}.isDefined then fun config.${option} else "-"; + + # This is special, because we have two options for this value. + wakeup = let + wakeupDefined = options.wakeup.isDefined; + wakeupUCDefined = options.wakeupUnusedComponent.isDefined; + finalValue = toString config.wakeup + + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?"; + in if wakeupDefined then finalValue else "-"; + + in [ + config.name + config.type + (maybeOption mkBool "private") + (maybeOption (b: mkBool (!b)) "privileged") + (maybeOption mkBool "chroot") + wakeup + (maybeOption toString "maxproc") + (config.command + " " + concatMapStringsSep " " mkArg config.args) + ]; + }; + + masterCfContent = let + + labels = [ + "# service" "type" "private" "unpriv" "chroot" "wakeup" "maxproc" + "command + args" + ]; + + labelDefaults = [ + "# " "" "(yes)" "(yes)" "(no)" "(never)" "(100)" "" "" + ]; + + masterCf = mapAttrsToList (const (getAttr "rawEntry")) cfg.masterConfig; + + # A list of the maximum width of the columns across all lines and labels + maxWidths = let + foldLine = line: acc: let + columnLengths = map stringLength line; + in zipListsWith max acc columnLengths; + # We need to handle the last column specially here, because it's + # open-ended (command + args). + lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf); + in fold foldLine (genList (const 0) (length labels)) lines; + + # Pad a string with spaces from the right (opposite of fixedWidthString). + pad = width: str: let + padWidth = width - stringLength str; + padding = concatStrings (genList (const " ") padWidth); + in str + optionalString (padWidth > 0) padding; + + # It's + 2 here, because that's the amount of spacing between columns. + fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths; + + formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line); + + formattedLabels = let + sep = "# " + concatStrings (genList (const "=") (fullWidth + 5)); + lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ]; + in concatStringsSep "\n" lines; + + in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf; + + headerCheckOptions = { ... }: + { + options = { + pattern = mkOption { + type = types.str; + default = "/^.*/"; + example = "/^X-Mailer:/"; + description = "A regexp pattern matching the header"; + }; + action = mkOption { + type = types.str; + default = "DUNNO"; + example = "BCC mail@example.com"; + description = "The action to be executed when the pattern is matched"; + }; + }; + }; + + headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks; + + aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in optionalString (cfg.postmasterAlias != "") '' - postmaster: ${cfg.postmasterAlias} + postmaster${seperator} ${cfg.postmasterAlias} '' + optionalString (cfg.rootAlias != "") '' - root: ${cfg.rootAlias} + root${seperator} ${cfg.rootAlias} '' + cfg.extraAliases ; @@ -176,8 +303,9 @@ let virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; - masterCfFile = pkgs.writeText "postfix-master.cf" masterCf; + masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent; transportFile = pkgs.writeText "postfix-transport" cfg.transport; + headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks; in @@ -199,27 +327,29 @@ in default = true; description = "Whether to enable smtp in master.cf."; }; - + enableSubmission = mkOption { type = types.bool; default = false; - description = "Whether to enable smtp submission"; + description = "Whether to enable smtp submission."; }; submissionOptions = mkOption { type = types.attrs; - default = { "smtpd_tls_security_level" = "encrypt"; - "smtpd_sasl_auth_enable" = "yes"; - "smtpd_client_restrictions" = "permit_sasl_authenticated,reject"; - "milter_macro_daemon_name" = "ORIGINATING"; - }; + default = { + smtpd_tls_security_level = "encrypt"; + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + example = { + smtpd_tls_security_level = "encrypt"; + smtpd_sasl_auth_enable = "yes"; + smtpd_sasl_type = "dovecot"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; description = "Options for the submission config in master.cf"; - example = { "smtpd_tls_security_level" = "encrypt"; - "smtpd_sasl_auth_enable" = "yes"; - "smtpd_sasl_type" = "dovecot"; - "smtpd_client_restrictions" = "permit_sasl_authenticated,reject"; - "milter_macro_daemon_name" = "ORIGINATING"; - }; }; setSendmail = mkOption { @@ -352,6 +482,25 @@ in "; }; + aliasMapType = mkOption { + type = with types; enum [ "hash" "regexp" "pcre" ]; + default = "hash"; + example = "regexp"; + description = "The format the alias map should have. Use regexp if you want to use regular expressions."; + }; + + config = mkOption { + type = with types; attrsOf (either bool (either str (listOf str))); + default = defaultConf; + description = '' + The main.cf configuration file as key value set. + ''; + example = { + mail_owner = "postfix"; + smtp_use_tls = true; + }; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -395,6 +544,14 @@ in "; }; + virtualMapType = mkOption { + type = types.enum ["hash" "regexp" "pcre"]; + default = "hash"; + description = '' + What type of virtual alias map file to use. Use "regexp" for regular expressions. + ''; + }; + transport = mkOption { default = ""; description = " @@ -413,6 +570,22 @@ in description = "contents of check_client_access for overriding dnsBlacklists"; }; + masterConfig = mkOption { + type = types.attrsOf (types.submodule masterCfOptions); + default = {}; + example = + { submission = { + type = "inet"; + args = [ "-o" "smtpd_tls_security_level=encrypt" ]; + }; + }; + description = '' + An attribute set of service options, which correspond to the service + definitions usually done within the Postfix + master.cf file. + ''; + }; + extraMasterConf = mkOption { type = types.lines; default = ""; @@ -420,6 +593,27 @@ in description = "Extra lines to append to the generated master.cf file."; }; + enableHeaderChecks = mkOption { + type = types.bool; + default = false; + example = true; + description = "Whether to enable postfix header checks"; + }; + + headerChecks = mkOption { + type = types.listOf (types.submodule headerCheckOptions); + default = []; + example = [ { pattern = "/^X-Spam-Flag:/"; action = "REDIRECT spam@example.com"; } ]; + description = "Postfix header checks."; + }; + + extraHeaderChecks = mkOption { + type = types.lines; + default = ""; + example = "/^X-Spam-Flag:/ REDIRECT spam@example.com"; + description = "Extra lines to /etc/postfix/header_checks file."; + }; + aliasFiles = mkOption { type = types.attrsOf types.path; default = {}; @@ -530,6 +724,101 @@ in ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf ''; }; + + services.postfix.masterConfig = { + smtp_inet = { + name = "smtp"; + type = "inet"; + private = false; + command = "smtpd"; + }; + pickup = { + private = false; + wakeup = 60; + maxproc = 1; + }; + cleanup = { + private = false; + maxproc = 0; + }; + qmgr = { + private = false; + wakeup = 300; + maxproc = 1; + }; + tlsmgr = { + wakeup = 1000; + wakeupUnusedComponent = false; + maxproc = 1; + }; + rewrite = { + command = "trivial-rewrite"; + }; + bounce = { + maxproc = 0; + }; + defer = { + maxproc = 0; + command = "bounce"; + }; + trace = { + maxproc = 0; + command = "bounce"; + }; + verify = { + maxproc = 1; + }; + flush = { + private = false; + wakeup = 1000; + wakeupUnusedComponent = false; + maxproc = 0; + }; + proxymap = { + command = "proxymap"; + }; + proxywrite = { + maxproc = 1; + command = "proxymap"; + }; + showq = { + private = false; + }; + error = {}; + retry = { + command = "error"; + }; + discard = {}; + local = { + privileged = true; + }; + virtual = { + privileged = true; + }; + lmtp = { + }; + anvil = { + maxproc = 1; + }; + scache = { + maxproc = 1; + }; + } // optionalAttrs cfg.enableSubmission { + submission = { + type = "inet"; + private = false; + command = "smtpd"; + args = let + mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ]; + in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions); + }; + } // optionalAttrs cfg.enableSmtp { + smtp = {}; + relay = { + command = "smtp"; + args = [ "-o" "smtp_fallback_relay=" ]; + }; + }; } (mkIf haveAliases { @@ -541,9 +830,17 @@ in (mkIf haveVirtual { services.postfix.mapFiles."virtual" = virtualFile; }) + (mkIf cfg.enableHeaderChecks { + services.postfix.mapFiles."header_checks" = headerChecksFile; + }) (mkIf (cfg.dnsBlacklists != []) { services.postfix.mapFiles."client_access" = checkClientAccessFile; }) + (mkIf (cfg.extraConfig != "") { + warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; + }) + (mkIf (cfg.extraMasterConf != "") { + warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ]; + }) ]); - } diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix new file mode 100644 index 000000000000..b92104787a56 --- /dev/null +++ b/nixos/modules/services/misc/airsonic.nix @@ -0,0 +1,117 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.airsonic; +in { + options = { + + services.airsonic = { + enable = mkEnableOption "Airsonic, the Free and Open Source media streaming server (fork of Subsonic and Libresonic)"; + + user = mkOption { + type = types.str; + default = "airsonic"; + description = "User account under which airsonic runs."; + }; + + home = mkOption { + type = types.path; + default = "/var/lib/airsonic"; + description = '' + The directory where Airsonic will create files. + Make sure it is writable. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "127.0.0.1"; + description = '' + The host name or IP address on which to bind Airsonic. + Only relevant if you have multiple network interfaces and want + to make Airsonic available on only one of them. The default value + will bind Airsonic to all available network interfaces. + ''; + }; + + port = mkOption { + type = types.int; + default = 4040; + description = '' + The port on which Airsonic will listen for + incoming HTTP traffic. Set to 0 to disable. + ''; + }; + + contextPath = mkOption { + type = types.path; + default = "/"; + description = '' + The context path, i.e., the last part of the Airsonic + URL. Typically '/' or '/airsonic'. Default '/' + ''; + }; + + maxMemory = mkOption { + type = types.int; + default = 100; + description = '' + The memory limit (max Java heap size) in megabytes. + Default: 100 + ''; + }; + + transcoders = mkOption { + type = types.listOf types.path; + default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; + defaultText= [ "\${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; + description = '' + List of paths to transcoder executables that should be accessible + from Airsonic. Symlinks will be created to each executable inside + ${cfg.home}/transcoders. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.airsonic = { + description = "Airsonic Media Server"; + after = [ "local-fs.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + # Install transcoders. + rm -rf ${cfg.home}/transcode + mkdir -p ${cfg.home}/transcode + for exe in ${toString cfg.transcoders}; do + ln -sf "$exe" ${cfg.home}/transcode + done + ''; + serviceConfig = { + ExecStart = '' + ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \ + -Dairsonic.home=${cfg.home} \ + -Dserver.address=${cfg.listenAddress} \ + -Dserver.port=${toString cfg.port} \ + -Dairsonic.contextPath=${cfg.contextPath} \ + -Djava.awt.headless=true \ + -verbose:gc \ + -jar ${pkgs.airsonic}/webapps/airsonic.war + ''; + Restart = "always"; + User = "airsonic"; + UMask = "0022"; + }; + }; + + users.extraUsers.airsonic = { + description = "Airsonic service user"; + name = cfg.user; + home = cfg.home; + createHome = true; + }; + }; +} diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 40b48f70f7ed..f1742177326a 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -20,10 +20,10 @@ in enable = mkOption { default = false; - description = " + description = '' Mount filesystems on demand. Unmount them automatically. You may also be interested in afuse. - "; + ''; }; autoMaster = mkOption { @@ -45,10 +45,9 @@ in /auto file:''${mapConf} ''' ''; - description = " - file contents of /etc/auto.master. See man auto.master - See man 5 auto.master and man 5 autofs. - "; + description = '' + Contents of /etc/auto.master file. See auto.master(5) and autofs(5). + ''; }; timeout = mkOption { @@ -58,9 +57,9 @@ in debug = mkOption { default = false; - description = " - pass -d and -7 to automount and write log to /var/log/autofs - "; + description = '' + Pass -d and -7 to automount and write log to the system journal. + ''; }; }; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 792a4c8375d9..3020130ad1f6 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -30,4 +30,5 @@ in { }; + meta.maintainers = with maintainers; [ gnidorah ]; } diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix new file mode 100644 index 000000000000..600bd780e7b0 --- /dev/null +++ b/nixos/modules/services/misc/exhibitor.nix @@ -0,0 +1,418 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.exhibitor; + exhibitor = cfg.package; + exhibitorConfig = '' + zookeeper-install-directory=${cfg.baseDir}/zookeeper + zookeeper-data-directory=${cfg.zkDataDir} + zookeeper-log-directory=${cfg.zkLogDir} + zoo-cfg-extra=${cfg.zkExtraCfg} + client-port=${toString cfg.zkClientPort} + connect-port=${toString cfg.zkConnectPort} + election-port=${toString cfg.zkElectionPort} + cleanup-period-ms=${toString cfg.zkCleanupPeriod} + servers-spec=${concatStringsSep "," cfg.zkServersSpec} + auto-manage-instances=${toString cfg.autoManageInstances} + ${cfg.extraConf} + ''; + # NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended. + # Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false) + # will operate in the same fashion as a 0. + configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig; + cliOptionsCommon = { + configtype = cfg.configType; + defaultconfig = "${configDir}/exhibitor.properties"; + port = toString cfg.port; + hostname = cfg.hostname; + headingtext = if (cfg.headingText != null) then (lib.escapeShellArg cfg.headingText) else null; + nodemodification = lib.boolToString cfg.nodeModification; + configcheckms = toString cfg.configCheckMs; + jquerystyle = cfg.jqueryStyle; + loglines = toString cfg.logLines; + servo = lib.boolToString cfg.servo; + timeout = toString cfg.timeout; + }; + s3CommonOptions = { s3region = cfg.s3Region; s3credentials = cfg.s3Credentials; }; + cliOptionsPerConfig = { + s3 = { + s3config = "${cfg.s3Config.bucketName}:${cfg.s3Config.objectKey}"; + s3configprefix = cfg.s3Config.configPrefix; + }; + zookeeper = { + zkconfigconnect = concatStringsSep "," cfg.zkConfigConnect; + zkconfigexhibitorpath = cfg.zkConfigExhibitorPath; + zkconfigpollms = toString cfg.zkConfigPollMs; + zkconfigretry = "${toString cfg.zkConfigRetry.sleepMs}:${toString cfg.zkConfigRetry.retryQuantity}"; + zkconfigzpath = cfg.zkConfigZPath; + zkconfigexhibitorport = toString cfg.zkConfigExhibitorPort; # NB: This might be null + }; + file = { + fsconfigdir = cfg.fsConfigDir; + fsconfiglockprefix = cfg.fsConfigLockPrefix; + fsConfigName = fsConfigName; + }; + none = { + noneconfigdir = configDir; + }; + }; + cliOptions = concatStringsSep " " (mapAttrsToList (k: v: "--${k} ${v}") (filterAttrs (k: v: v != null && v != "") (cliOptionsCommon // + cliOptionsPerConfig."${cfg.configType}" // + s3CommonOptions // + optionalAttrs cfg.s3Backup { s3backup = "true"; } // + optionalAttrs cfg.fileSystemBackup { filesystembackup = "true"; } + ))); +in +{ + options = { + services.exhibitor = { + enable = mkOption { + type = types.bool; + default = false; + description = " + Whether to enable the exhibitor server. + "; + }; + # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean + # General options for any type of config + port = mkOption { + type = types.int; + default = 8080; + description = '' + The port for exhibitor to listen on and communicate with other exhibitors. + ''; + }; + baseDir = mkOption { + type = types.str; + default = "/var/exhibitor"; + description = '' + Baseline directory for exhibitor runtime config. + ''; + }; + configType = mkOption { + type = types.enum [ "file" "s3" "zookeeper" "none" ]; + description = '' + Which configuration type you want to use. Additional config will be + required depending on which type you are using. + ''; + }; + hostname = mkOption { + type = types.nullOr types.str; + description = '' + Hostname to use and advertise + ''; + default = null; + }; + nodeModification = mkOption { + type = types.bool; + description = '' + Whether the Explorer UI will allow nodes to be modified (use with caution). + ''; + default = true; + }; + configCheckMs = mkOption { + type = types.int; + description = '' + Period (ms) to check for shared config updates. + ''; + default = 30000; + }; + headingText = mkOption { + type = types.nullOr types.str; + description = '' + Extra text to display in UI header + ''; + default = null; + }; + jqueryStyle = mkOption { + type = types.enum [ "red" "black" "custom" ]; + description = '' + Styling used for the JQuery-based UI. + ''; + default = "red"; + }; + logLines = mkOption { + type = types.int; + description = '' + Max lines of logging to keep in memory for display. + ''; + default = 1000; + }; + servo = mkOption { + type = types.bool; + description = '' + ZooKeeper will be queried once a minute for its state via the 'mntr' four + letter word (this requires ZooKeeper 3.4.x+). Servo will be used to publish + this data via JMX. + ''; + default = false; + }; + timeout = mkOption { + type = types.int; + description = '' + Connection timeout (ms) for ZK connections. + ''; + default = 30000; + }; + autoManageInstances = mkOption { + type = types.bool; + description = '' + Automatically manage ZooKeeper instances in the ensemble + ''; + default = false; + }; + zkDataDir = mkOption { + type = types.str; + default = "${cfg.baseDir}/zkData"; + description = '' + The Zookeeper data directory + ''; + }; + zkLogDir = mkOption { + type = types.path; + default = "${cfg.baseDir}/zkLogs"; + description = '' + The Zookeeper logs directory + ''; + }; + extraConf = mkOption { + type = types.str; + default = ""; + description = '' + Extra Exhibitor configuration to put in the ZooKeeper config file. + ''; + }; + zkExtraCfg = mkOption { + type = types.str; + default = ''initLimit=5&syncLimit=2&tickTime=2000''; + description = '' + Extra options to pass into Zookeeper + ''; + }; + zkClientPort = mkOption { + type = types.int; + default = 2181; + description = '' + Zookeeper client port + ''; + }; + zkConnectPort = mkOption { + type = types.int; + default = 2888; + description = '' + The port to use for followers to talk to each other. + ''; + }; + zkElectionPort = mkOption { + type = types.int; + default = 3888; + description = '' + The port for Zookeepers to use for leader election. + ''; + }; + zkCleanupPeriod = mkOption { + type = types.int; + default = 0; + description = '' + How often (in milliseconds) to run the Zookeeper log cleanup task. + ''; + }; + zkServersSpec = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Zookeeper server spec for all servers in the ensemble. + ''; + example = [ "S:1:zk1.example.com" "S:2:zk2.example.com" "S:3:zk3.example.com" "O:4:zk-observer.example.com" ]; + }; + + # Backup options + s3Backup = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable backups to S3 + ''; + }; + fileSystemBackup = mkOption { + type = types.bool; + default = false; + description = '' + Enables file system backup of ZooKeeper log files + ''; + }; + + # Options for using zookeeper configType + zkConfigConnect = mkOption { + type = types.listOf types.str; + description = '' + The initial connection string for ZooKeeper shared config storage + ''; + example = ["host1:2181" "host2:2181"]; + }; + zkConfigExhibitorPath = mkOption { + type = types.string; + description = '' + If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call + ''; + default = "/"; + }; + zkConfigExhibitorPort = mkOption { + type = types.nullOr types.int; + description = '' + If the ZooKeeper shared config is also running Exhibitor, the port that + Exhibitor is listening on. IMPORTANT: if this value is not set it implies + that Exhibitor is not being used on the ZooKeeper shared config. + ''; + }; + zkConfigPollMs = mkOption { + type = types.int; + description = '' + The period in ms to check for changes in the config ensemble + ''; + default = 10000; + }; + zkConfigRetry = { + sleepMs = mkOption { + type = types.int; + default = 1000; + description = '' + Retry sleep time connecting to the ZooKeeper config + ''; + }; + retryQuantity = mkOption { + type = types.int; + default = 3; + description = '' + Retries connecting to the ZooKeeper config + ''; + }; + }; + zkConfigZPath = mkOption { + type = types.str; + description = '' + The base ZPath that Exhibitor should use + ''; + example = "/exhibitor/config"; + }; + + # Config options for s3 configType + s3Config = { + bucketName = mkOption { + type = types.str; + description = '' + Bucket name to store config + ''; + }; + objectKey = mkOption { + type = types.str; + description = '' + S3 key name to store the config + ''; + }; + configPrefix = mkOption { + type = types.str; + description = '' + When using AWS S3 shared config files, the prefix to use for values such as locks + ''; + default = "exhibitor-"; + }; + }; + + # The next two are used for either s3backup or s3 configType + s3Credentials = mkOption { + type = types.nullOr types.path; + description = '' + Optional credentials to use for s3backup or s3config. Argument is the path + to an AWS credential properties file with two properties: + com.netflix.exhibitor.s3.access-key-id and com.netflix.exhibitor.s3.access-secret-key + ''; + default = null; + }; + s3Region = mkOption { + type = types.nullOr types.str; + description = '' + Optional region for S3 calls + ''; + default = null; + }; + + # Config options for file config type + fsConfigDir = mkOption { + type = types.path; + description = '' + Directory to store Exhibitor properties (cannot be used with s3config). + Exhibitor uses file system locks so you can specify a shared location + so as to enable complete ensemble management. + ''; + }; + fsConfigLockPrefix = mkOption { + type = types.str; + description = '' + A prefix for a locking mechanism used in conjunction with fsconfigdir + ''; + default = "exhibitor-lock-"; + }; + fsConfigName = mkOption { + type = types.str; + description = '' + The name of the file to store config in + ''; + default = "exhibitor.properties"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.exhibitor = { + description = "Exhibitor Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + ZOO_LOG_DIR = cfg.baseDir; + }; + serviceConfig = { + /*** + Exhibitor is a bit un-nixy. It wants to present to you a user interface in order to + mutate the configuration of both itself and ZooKeeper, and to coordinate changes + among the members of the Zookeeper ensemble. I'm going for a different approach here, + which is to manage all the configuration via nix and have it write out the configuration + files that exhibitor will use, and to reduce the amount of inter-exhibitor orchestration. + ***/ + ExecStart = '' + ${pkgs.exhibitor}/bin/startExhibitor.sh ${cliOptions} + ''; + User = "zookeeper"; + PermissionsStartOnly = true; + }; + # This is a bit wonky, but the reason for this is that Exhibitor tries to write to + # ${cfg.baseDir}/zookeeper/bin/../conf/zoo.cfg + # I want everything but the conf directory to be in the immutable nix store, and I want defaults + # from the nix store + # If I symlink the bin directory in, then bin/../ will resolve to the parent of the symlink in the + # immutable nix store. Bind mounting a writable conf over the existing conf might work, but it gets very + # messy with trying to copy the existing out into a mutable store. + # Another option is to try to patch upstream exhibitor, but the current package just pulls down the + # prebuild JARs off of Maven, rather than building them ourselves, as Maven support in Nix isn't + # very mature. So, it seems like a reasonable compromise is to just copy out of the immutable store + # just before starting the service, so we're running binaries from the immutable store, but we work around + # Exhibitor's desire to mutate its current installation. + preStart = '' + mkdir -m 0700 -p ${cfg.baseDir}/zookeeper + # Not doing a chown -R to keep the base ZK files owned by root + chown zookeeper ${cfg.baseDir} ${cfg.baseDir}/zookeeper + cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper + chown -R zookeeper ${cfg.baseDir}/zookeeper/conf + chmod -R u+w ${cfg.baseDir}/zookeeper/conf + ''; + }; + users.extraUsers = singleton { + name = "zookeeper"; + uid = config.ids.uids.zookeeper; + description = "Zookeeper daemon user"; + home = cfg.baseDir; + }; + }; +} diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix index e89366cbafed..15f283f093c0 100644 --- a/nixos/modules/services/misc/fstrim.nix +++ b/nixos/modules/services/misc/fstrim.nix @@ -42,4 +42,5 @@ in { }; + meta.maintainers = with maintainers; [ gnidorah ]; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0ed5a539e7dd..ccc1854d2548 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -439,6 +439,8 @@ in { environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; path = with pkgs; [ gitAndTools.git + gnutar + gzip openssh gitlab-workhorse ]; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 622607f3b32d..515864ec2e2d 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -62,8 +62,7 @@ let name = "nixos-manual"; desktopName = "NixOS Manual"; genericName = "View NixOS documentation in a web browser"; - # TODO: find a better icon (Nix logo + help overlay?) - icon = "system-help"; + icon = "nix-snowflake"; exec = "${helpScript}/bin/nixos-help"; categories = "System"; }; @@ -115,7 +114,7 @@ in environment.systemPackages = [ manual.manual helpScript ] - ++ optional config.services.xserver.enable desktopItem + ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons] ++ optional config.programs.man.enable manual.manpages; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix deleted file mode 100644 index 49520f68a50a..000000000000 --- a/nixos/modules/services/misc/ripple-rest.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.rippleRest; - - configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON { - config_version = "2.0.3"; - debug = cfg.debug; - port = cfg.port; - host = cfg.host; - ssl_enabled = cfg.ssl.enable; - ssl = { - key_path = cfg.ssl.keyPath; - cert_path = cfg.ssl.certPath; - reject_unathorized = cfg.ssl.rejectUnathorized; - }; - db_path = cfg.dbPath; - max_transaction_fee = cfg.maxTransactionFee; - rippled_servers = cfg.rippleds; - }); - -in { - options.services.rippleRest = { - enable = mkEnableOption "ripple rest"; - - debug = mkEnableOption "debug for ripple-rest"; - - host = mkOption { - description = "Ripple rest host."; - default = "localhost"; - type = types.str; - }; - - port = mkOption { - description = "Ripple rest port."; - default = 5990; - type = types.int; - }; - - ssl = { - enable = mkEnableOption "ssl"; - - keyPath = mkOption { - description = "Path to the ripple rest key file."; - default = null; - type = types.nullOr types.path; - }; - - - certPath = mkOption { - description = "Path to the ripple rest cert file."; - default = null; - type = types.nullOr types.path; - }; - - rejectUnathorized = mkOption { - description = "Whether to reject unatohroized."; - default = true; - type = types.bool; - }; - }; - - dbPath = mkOption { - description = "Ripple rest database path."; - default = "${cfg.dataDir}/ripple-rest.db"; - type = types.path; - }; - - maxTransactionFee = mkOption { - description = "Ripple rest max transaction fee."; - default = 1000000; - type = types.int; - }; - - rippleds = mkOption { - description = "List of rippled servers."; - default = [ - "wss://s1.ripple.com:443" - ]; - type = types.listOf types.str; - }; - - dataDir = mkOption { - description = "Ripple rest data directory."; - default = "/var/lib/ripple-rest"; - type = types.path; - }; - }; - - config = mkIf (cfg.enable) { - systemd.services.ripple-rest = { - wantedBy = [ "multi-user.target"]; - after = ["network.target" ]; - environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules"; - serviceConfig = { - ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}"; - User = "ripple-rest"; - }; - }; - - users.extraUsers.postgres = { - name = "ripple-rest"; - uid = config.ids.uids.ripple-rest; - createHome = true; - home = cfg.dataDir; - }; - }; -} diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix new file mode 100644 index 000000000000..62b344d11b06 --- /dev/null +++ b/nixos/modules/services/misc/snapper.nix @@ -0,0 +1,152 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.snapper; +in + +{ + options.services.snapper = { + + snapshotInterval = mkOption { + type = types.str; + default = "hourly"; + description = '' + Snapshot interval. + + The format is described in + systemd.time + 7. + ''; + }; + + cleanupInterval = mkOption { + type = types.str; + default = "1d"; + description = '' + Cleanup interval. + + The format is described in + systemd.time + 7. + ''; + }; + + filters = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Global display difference filter. See man:snapper(8) for more details. + ''; + }; + + configs = mkOption { + default = { }; + example = literalExample { + "home" = { + subvolume = "/home"; + extraConfig = '' + ALLOW_USERS="alice" + ''; + }; + }; + + description = '' + Subvolume configuration + ''; + + type = types.attrsOf (types.submodule { + options = { + subvolume = mkOption { + type = types.path; + description = '' + Path of the subvolume or mount point. + This path is a subvolume and has to contain a subvolume named + .snapshots. + See also man:snapper(8) section PERMISSIONS. + ''; + }; + + fstype = mkOption { + type = types.enum [ "btrfs" ]; + default = "btrfs"; + description = '' + Filesystem type. Only btrfs is stable and tested. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional configuration next to SUBVOLUME and FSTYPE. + See man:snapper-configs(5). + ''; + }; + }; + }); + }; + }; + + config = mkIf (cfg.configs != {}) (let + documentation = [ "man:snapper(8)" "man:snapper-configs(5)" ]; + in { + + environment = { + + systemPackages = [ pkgs.snapper ]; + + # Note: snapper/config-templates/default is only needed for create-config + # which is not the NixOS way to configure. + etc = { + + "sysconfig/snapper".text = '' + SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}" + ''; + + } + // (mapAttrs' (name: subvolume: nameValuePair "snapper/configs/${name}" ({ + text = '' + ${subvolume.extraConfig} + FSTYPE="${subvolume.fstype}" + SUBVOLUME="${subvolume.subvolume}" + ''; + })) cfg.configs) + // (lib.optionalAttrs (cfg.filters != null) { + "snapper/filters/default.txt".text = cfg.filters; + }); + + }; + + services.dbus.packages = [ pkgs.snapper ]; + + systemd.services.snapper-timeline = { + description = "Timeline of Snapper Snapshots"; + inherit documentation; + serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline"; + }; + + systemd.timers.snapper-timeline = { + description = "Timeline of Snapper Snapshots"; + inherit documentation; + wantedBy = [ "basic.target" ]; + timerConfig.OnCalendar = cfg.snapshotInterval; + }; + + systemd.services.snapper-cleanup = { + description = "Cleanup of Snapper Snapshots"; + inherit documentation; + serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --cleanup"; + }; + + systemd.timers.snapper-cleanup = { + description = "Cleanup of Snapper Snapshots"; + inherit documentation; + wantedBy = [ "basic.target" ]; + timerConfig.OnBootSec = "10m"; + timerConfig.OnUnitActiveSec = cfg.cleanupInterval; + }; + }); +} + diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix index f8133394ffd3..f322ba4cbd58 100644 --- a/nixos/modules/services/misc/spice-vdagentd.nix +++ b/nixos/modules/services/misc/spice-vdagentd.nix @@ -23,7 +23,7 @@ in ''; serviceConfig = { Type = "forking"; - ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'"; + ExecStart = "${pkgs.spice-vdagent}/bin/spice-vdagentd"; }; }; }; diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index b97bc1df74f7..22a3d8d5311b 100644 --- a/nixos/modules/services/misc/taskserver/helper-tool.py +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -448,6 +448,8 @@ def cli(ctx): """ Manage Taskserver users and certificates """ + if not IS_AUTO_CONFIG: + return for path in (CA_KEY, CA_CERT, CRL_FILE): if not os.path.exists(path): msg = "CA setup not done or incomplete, missing file {}." diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index b7bca8b56b28..d85b5e4ec507 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.zookeeper; - + zookeeperConfig = '' dataDir=${cfg.dataDir} clientPort=${toString cfg.port} @@ -49,7 +49,7 @@ in { default = 1; type = types.int; }; - + extraConf = mkOption { description = "Extra configuration for Zookeeper."; type = types.lines; @@ -119,7 +119,7 @@ in { ExecStart = '' ${pkgs.jre}/bin/java \ -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ - ${toString cfg.extraCmdLineOptions} \ + ${escapeShellArgs cfg.extraCmdLineOptions} \ -Dzookeeper.datadir.autocreate=false \ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ org.apache.zookeeper.server.quorum.QuorumPeerMain \ diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index b26bcba64059..723b04dc0fe9 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -26,7 +26,9 @@ let for file in $out/*; do case "$file" in - plugin.sh) continue;; + */plugin.sh|*/plugins.history) + chmod +x "$file" + continue;; esac # read magic makers from the file diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix new file mode 100644 index 000000000000..ba0dc4c21768 --- /dev/null +++ b/nixos/modules/services/monitoring/osquery.nix @@ -0,0 +1,91 @@ +{ config, lib, pkgs, ... }: + +with builtins; +with lib; + +let + cfg = config.services.osquery; + +in + +{ + + options = { + + services.osquery = { + + enable = mkEnableOption "osquery"; + + loggerPath = mkOption { + type = types.path; + description = "Base directory used for logging."; + default = "/var/log/osquery"; + }; + + pidfile = mkOption { + type = types.path; + description = "Path used for pid file."; + default = "/var/osquery/osqueryd.pidfile"; + }; + + utc = mkOption { + type = types.bool; + description = "Attempt to convert all UNIX calendar times to UTC."; + default = true; + }; + + databasePath = mkOption { + type = types.path; + description = "Path used for database file."; + default = "/var/osquery/osquery.db"; + }; + + extraConfig = mkOption { + type = types.attrs // { + merge = loc: foldl' (res: def: recursiveUpdate res def.value) {}; + }; + description = "Extra config to be recursively merged into the JSON config file."; + default = { }; + }; + }; + + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.osquery ]; + + environment.etc."osquery/osquery.conf".text = toJSON ( + recursiveUpdate { + options = { + config_plugin = "filesystem"; + logger_plugin = "filesystem"; + logger_path = cfg.loggerPath; + database_path = cfg.databasePath; + utc = cfg.utc; + }; + } cfg.extraConfig + ); + + systemd.services.osqueryd = { + description = "The osquery Daemon"; + after = [ "network.target" "syslog.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.osquery ]; + preStart = '' + mkdir -p ${escapeShellArg cfg.loggerPath} + mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})" + mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})" + ''; + serviceConfig = { + TimeoutStartSec = 0; + ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}"; + KillMode = "process"; + KillSignal = "SIGTERM"; + Restart = "on-failure"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix index 388e4d4ac01d..ce2e1cf2d74b 100644 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -57,8 +57,8 @@ in { AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ - -web.listen-address :${toString cfg.port} \ - -config.file ${cfg.configFile} \ + --web.listen-address :${toString cfg.port} \ + --config.file ${cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix index e3059e485098..0a56d6ae95a5 100644 --- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix @@ -83,6 +83,7 @@ in { description = "Prometheus exporter for UniFi Controller metrics"; unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter"; wantedBy = [ "multi-user.target" ]; + after = optional config.services.unifi.enable "unifi.service"; serviceConfig = { User = "nobody"; Restart = "always"; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 10c1d751ac5d..60822b5b547f 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -49,6 +49,12 @@ in description = "The data dir for IPFS"; }; + defaultMode = mkOption { + description = "systemd service that is enabled by default"; + type = types.enum [ "online" "offline" "norouting" ]; + default = "online"; + }; + autoMigrate = mkOption { type = types.bool; default = false; @@ -147,10 +153,11 @@ in systemd.services.ipfs = { description = "IPFS Daemon"; - wantedBy = [ "multi-user.target" ]; + wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" "ipfs-init.service" ]; - conflicts = [ "ipfs-offline.service" ]; + conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"]; wants = [ "ipfs-init.service" ]; environment.IPFS_PATH = cfg.dataDir; @@ -169,9 +176,11 @@ in systemd.services.ipfs-offline = { description = "IPFS Daemon (offline mode)"; + wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ]; + after = [ "local-fs.target" "ipfs-init.service" ]; - conflicts = [ "ipfs.service" ]; + conflicts = [ "ipfs.service" "ipfs-norouting.service"]; wants = [ "ipfs-init.service" ]; environment.IPFS_PATH = cfg.dataDir; @@ -186,5 +195,29 @@ in RestartSec = 1; }; }; + + systemd.services.ipfs-norouting = { + description = "IPFS Daemon (no routing mode)"; + + wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ]; + + after = [ "local-fs.target" "ipfs-init.service" ]; + + conflicts = [ "ipfs.service" "ipfs-offline.service"]; + wants = [ "ipfs-init.service" ]; + + environment.IPFS_PATH = cfg.dataDir; + + path = [ pkgs.ipfs ]; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none"; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + RestartSec = 1; + }; + }; + }; } diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 2018bfa14a57..054057d52ab1 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -8,22 +8,21 @@ let motdFile = builtins.toFile "rsyncd-motd" cfg.motd; - moduleConfig = name: - let module = getAttr name cfg.modules; in - "[${name}]\n " + (toString ( - map - (key: "${key} = ${toString (getAttr key module)}\n") - (attrNames module) - )); + foreach = attrs: f: + concatStringsSep "\n" (mapAttrsToList f attrs); - cfgFile = builtins.toFile "rsyncd.conf" - '' + cfgFile = '' ${optionalString (cfg.motd != "") "motd file = ${motdFile}"} ${optionalString (cfg.address != "") "address = ${cfg.address}"} ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"} ${cfg.extraConfig} - ${toString (map moduleConfig (attrNames cfg.modules))} - ''; + ${foreach cfg.modules (name: module: '' + [${name}] + ${foreach module (k: v: + "${k} = ${v}" + )} + '')} + ''; in { @@ -84,6 +83,24 @@ in }; }; + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to run the daemon as. + By default the daemon runs as root. + ''; + }; + + group = mkOption { + type = types.str; + default = "root"; + description = '' + The group to run the daemon as. + By default the daemon runs as root. + ''; + }; + }; }; @@ -91,16 +108,17 @@ in config = mkIf cfg.enable { - environment.etc = singleton { - source = cfgFile; - target = "rsyncd.conf"; - }; + environment.etc."rsyncd.conf".text = cfgFile; systemd.services.rsyncd = { description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + restartTriggers = [ config.environment.etc."rsyncd.conf".source ]; + serviceConfig = { + ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + User = cfg.user; + Group = cfg.group; + }; }; - }; } diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 87c4f7a8ebcb..b3b4d0c915ac 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -243,7 +243,7 @@ in }; }; - security.pam.services.sambda = {}; + security.pam.services.samba = {}; }) ]; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 9815a5434ee3..80b34c48f1d2 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -237,13 +237,13 @@ in # arguments to $(tahoe start). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' - if [ \! -d ${nodedir} ]; then + if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-introducer ${nodedir} + tahoe create-introducer ${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -252,7 +252,7 @@ in # we must do this on every prestart. Fixes welcome. # rm ${nodedir}/tahoe.cfg # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg - cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); users.extraUsers = flip mapAttrs' cfg.introducers (node: _: @@ -337,13 +337,13 @@ in # arguments to $(tahoe start). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' - if [ \! -d ${nodedir} ]; then + if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-node --hostname=localhost ${nodedir} + tahoe create-node --hostname=localhost ${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -351,8 +351,8 @@ in # XXX I thought that a symlink would work here, but it doesn't, so # we must do this on every prestart. Fixes welcome. # rm ${nodedir}/tahoe.cfg - # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg - cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg + # ln -s /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); users.extraUsers = flip mapAttrs' cfg.nodes (node: _: diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index f4d0fc822dea..9ccdacb20e91 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -22,6 +22,7 @@ let ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} allow-point-to-point=${yesNo allowPointToPoint} + ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} [wide-area] enable-wide-area=${yesNo wideArea} @@ -166,6 +167,15 @@ in ''; }; + cacheEntriesMax = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + Number of resource records to be cached per interface. Use 0 to + disable caching. Avahi daemon defaults to 4096 if not set. + ''; + }; + }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index e72ea20cccee..bd26804788f3 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -7,6 +7,10 @@ let cfg = config.services.bitlbee; bitlbeeUid = config.ids.uids.bitlbee; + bitlbeePkg = if cfg.libpurple_plugins == [] + then pkgs.bitlbee + else pkgs.bitlbee.override { enableLibPurple = true; }; + bitlbeeConfig = pkgs.writeText "bitlbee.conf" '' [settings] @@ -25,6 +29,12 @@ let ${cfg.extraDefaults} ''; + purple_plugin_path = + lib.concatMapStringsSep ":" + (plugin: "${plugin}/lib/pidgin/") + cfg.libpurple_plugins + ; + in { @@ -90,6 +100,15 @@ in ''; }; + libpurple_plugins = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.purple-matrix ]"; + description = '' + The list of libpurple plugins to install. + ''; + }; + configDir = mkOption { default = "/var/lib/bitlbee"; type = types.path; @@ -144,14 +163,16 @@ in }; systemd.services.bitlbee = - { description = "BitlBee IRC to other chat networks gateway"; + { + environment.PURPLE_PLUGIN_PATH = purple_plugin_path; + description = "BitlBee IRC to other chat networks gateway"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.User = "bitlbee"; - serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; + serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; }; - environment.systemPackages = [ pkgs.bitlbee ]; + environment.systemPackages = [ bitlbeePkg ]; }; diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 14e6932d868b..65273a4bf939 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -320,6 +320,14 @@ in { RuntimeDirectory = "turnserver"; User = "turnserver"; Group = "turnserver"; + AmbientCapabilities = + mkIf ( + cfg.listening-port < 1024 || + cfg.alt-listening-port < 1024 || + cfg.tls-listening-port < 1024 || + cfg.alt-tls-listening-port < 1024 || + cfg.min-port < 1024 + ) "cap_net_bind_service"; Restart = "on-abort"; }; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 28c96a9baefc..9e56545f746c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,17 +1,33 @@ { config, pkgs, lib, ... }: let + cfg = config.services.ddclient; + boolToStr = bool: if bool then "yes" else "no"; - inherit (lib) mkOption mkIf singleton; - inherit (pkgs) ddclient; - - stateDir = "/var/spool/ddclient"; - ddclientUser = "ddclient"; - ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}"; - ddclientPIDFile = "${stateDir}/ddclient.pid"; + configText = '' + # This file can be used as a template for configFile or is automatically generated by Nix options. + daemon=${toString cfg.interval} + cache=${cfg.homeDir}/ddclient.cache + pid=/run/ddclient/ddclient.pid + foreground=NO + use=${cfg.use} + login=${cfg.username} + password=${cfg.password} + protocol=${cfg.protocol} + ${let server = cfg.server; in + lib.optionalString (server != "") "server=${server}"} + ssl=${boolToStr cfg.ssl} + wildcard=YES + quiet=${boolToStr cfg.quiet} + verbose=${boolToStr cfg.verbose} + ${cfg.domain} + ${cfg.extraConfig} + ''; in +with lib; + { ###### interface @@ -28,6 +44,12 @@ in ''; }; + homeDir = mkOption { + default = "/var/lib/ddclient"; + type = str; + description = "Home directory for the daemon user."; + }; + domain = mkOption { default = ""; type = str; @@ -52,6 +74,12 @@ in ''; }; + interval = mkOption { + default = 600; + type = int; + description = "The interval at which to run the check and update."; + }; + configFile = mkOption { default = "/etc/ddclient.conf"; type = path; @@ -126,37 +154,24 @@ in config = mkIf config.services.ddclient.enable { - environment.systemPackages = [ ddclient ]; + users = { + extraGroups.ddclient.gid = config.ids.gids.ddclient; - users.extraUsers = singleton { - name = ddclientUser; - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - home = stateDir; + extraUsers.ddclient = { + uid = config.ids.uids.ddclient; + description = "ddclient daemon user"; + group = "ddclient"; + home = cfg.homeDir; + createHome = true; + }; }; environment.etc."ddclient.conf" = { - enable = config.services.ddclient.configFile == "/etc/ddclient.conf"; + enable = cfg.configFile == "/etc/ddclient.conf"; uid = config.ids.uids.ddclient; + gid = config.ids.gids.ddclient; mode = "0600"; - text = '' - # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=600 - cache=${stateDir}/ddclient.cache - pid=${ddclientPIDFile} - use=${config.services.ddclient.use} - login=${config.services.ddclient.username} - password=${config.services.ddclient.password} - protocol=${config.services.ddclient.protocol} - ${let server = config.services.ddclient.server; in - lib.optionalString (server != "") "server=${server}"} - ssl=${if config.services.ddclient.ssl then "yes" else "no"} - wildcard=YES - quiet=${if config.services.ddclient.quiet then "yes" else "no"} - verbose=${if config.services.ddclient.verbose then "yes" else "no"} - ${config.services.ddclient.domain} - ${config.services.ddclient.extraConfig} - ''; + text = configText; }; systemd.services.ddclient = { @@ -166,17 +181,14 @@ in restartTriggers = [ config.environment.etc."ddclient.conf".source ]; serviceConfig = { - # Uncomment this if too many problems occur: - # Type = "forking"; - User = ddclientUser; - Group = "nogroup"; #TODO get this to work - PermissionsStartOnly = "true"; - PIDFile = ddclientPIDFile; - ExecStartPre = '' - ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}" - ''; - ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}"; - #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this? + RuntimeDirectory = "ddclient"; + # we cannot run in forking mode as it swallows all the program output + Type = "simple"; + User = "ddclient"; + Group = "ddclient"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; + ProtectSystem = "full"; + PrivateTmp = true; }; }; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 077aeca457ea..ed658258c7f9 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -82,14 +82,13 @@ in }; resolverName = mkOption { - default = "dnscrypt.eu-nl"; + default = "random"; + example = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' The name of the DNSCrypt resolver to use, taken from - ${resolverList}. The default - resolver is located in Holland, supports DNS security - extensions, and claims to not - keep logs. + ${resolverList}. The default is to + pick a random non-logging resolver that supports DNSSEC. ''; }; diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 3a95b9c4ec94..a9f3fd65d76b 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -4,6 +4,10 @@ with lib; let cfg = config.services.firefox.syncserver; + + defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db"; + defaultSqlUri = "sqlite:///${defaultDbLocation}"; + syncServerIni = pkgs.writeText "syncserver.ini" '' [DEFAULT] overrides = ${cfg.privateConfig} @@ -25,6 +29,7 @@ let backend = tokenserver.verifiers.LocalVerifier audiences = ${removeSuffix "/" cfg.publicUrl} ''; + in { @@ -65,6 +70,18 @@ in ''; }; + user = mkOption { + type = types.str; + default = "syncserver"; + description = "User account under which syncserver runs."; + }; + + group = mkOption { + type = types.str; + default = "syncserver"; + description = "Group account under which syncserver runs."; + }; + publicUrl = mkOption { type = types.str; default = "http://localhost:5000/"; @@ -85,7 +102,7 @@ in sqlUri = mkOption { type = types.str; - default = "sqlite:////var/db/firefox-sync-server.db"; + default = defaultSqlUri; example = "postgresql://scott:tiger@localhost/test"; description = '' The location of the database. This URL is composed of @@ -119,22 +136,52 @@ in config = mkIf cfg.enable { - systemd.services.syncserver = { + systemd.services.syncserver = let + syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + in { after = [ "network.target" ]; description = "Firefox Sync Server"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ]; - environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + path = [ pkgs.coreutils syncServerEnv ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + preStart = '' if ! test -e ${cfg.privateConfig}; then - umask u=rwx,g=x,o=x - mkdir -p $(dirname ${cfg.privateConfig}) + mkdir -m 700 -p $(dirname ${cfg.privateConfig}) echo > ${cfg.privateConfig} '[syncserver]' echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi + chown ${cfg.user}:${cfg.group} ${cfg.privateConfig} + '' + optionalString (cfg.sqlUri == defaultSqlUri) '' + if ! test -e $(dirname ${defaultDbLocation}); then + mkdir -m 700 -p $(dirname ${defaultDbLocation}) + chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation}) + fi + # Move previous database file if it exists + oldDb="/var/db/firefox-sync-server.db" + if test -f $oldDb; then + mv $oldDb ${defaultDbLocation} + chown ${cfg.user}:${cfg.group} ${defaultDbLocation} + fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}"; + serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; + users.extraUsers = optionalAttrs (cfg.user == "syncserver") + (singleton { + name = "syncserver"; + group = cfg.group; + isSystemUser = true; + }); + + users.extraGroups = optionalAttrs (cfg.group == "syncserver") + (singleton { + name = "syncserver"; + }); }; } diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 7622f030f832..5c4932075fed 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -28,15 +28,15 @@ let }; mkKeyedEndpointOpt = name: addr: port: keyFile: - (mkEndpointOpt name addr port) // { - keys = mkOption { - type = types.str; - default = ""; - description = '' - File to persist ${lib.toUpper name} keys. - ''; + (mkEndpointOpt name addr port) // { + keys = mkOption { + type = types.str; + default = ""; + description = '' + File to persist ${lib.toUpper name} keys. + ''; + }; }; - }; commonTunOpts = let i2cpOpts = { @@ -59,7 +59,7 @@ let description = "Number of ElGamal/AES tags to send."; default = 40; }; - destination = mkOption { + destination = mkOption { type = types.str; description = "Remote endpoint, I2P hostname or b32.i2p address."; }; @@ -70,88 +70,91 @@ let }; } // mkEndpointOpt name "127.0.0.1" 0; - i2pdConf = pkgs.writeText "i2pd.conf" - '' - ipv4 = ${boolToString cfg.enableIPv4} - ipv6 = ${boolToString cfg.enableIPv6} - notransit = ${boolToString cfg.notransit} - floodfill = ${boolToString cfg.floodfill} - netid = ${toString cfg.netid} - ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } - ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} + i2pdConf = pkgs.writeText "i2pd.conf" '' + # DO NOT EDIT -- this file has been generated automatically. + loglevel = ${cfg.logLevel} - [limits] - transittunnels = ${toString cfg.limits.transittunnels} + ipv4 = ${boolToString cfg.enableIPv4} + ipv6 = ${boolToString cfg.enableIPv6} + notransit = ${boolToString cfg.notransit} + floodfill = ${boolToString cfg.floodfill} + netid = ${toString cfg.netid} + ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } + ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - [upnp] - enabled = ${boolToString cfg.upnp.enable} - name = ${cfg.upnp.name} + [limits] + transittunnels = ${toString cfg.limits.transittunnels} - [precomputation] - elgamal = ${boolToString cfg.precomputation.elgamal} + [upnp] + enabled = ${boolToString cfg.upnp.enable} + name = ${cfg.upnp.name} - [reseed] - verify = ${boolToString cfg.reseed.verify} - file = ${cfg.reseed.file} - urls = ${builtins.concatStringsSep "," cfg.reseed.urls} + [precomputation] + elgamal = ${boolToString cfg.precomputation.elgamal} - [addressbook] - defaulturl = ${cfg.addressbook.defaulturl} - subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} - ${flip concatMapStrings + [reseed] + verify = ${boolToString cfg.reseed.verify} + file = ${cfg.reseed.file} + urls = ${builtins.concatStringsSep "," cfg.reseed.urls} + + [addressbook] + defaulturl = ${cfg.addressbook.defaulturl} + subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} + + ${flip concatMapStrings (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: let portStr = toString proto.port; in - '' - [${proto.name}] - enabled = ${boolToString proto.enable} - address = ${proto.address} - port = ${toString proto.port} - ${if proto ? keys then "keys = ${proto.keys}" else ""} - ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""} - ${if proto ? user then "user = ${proto.user}" else ""} - ${if proto ? pass then "pass = ${proto.pass}" else ""} - ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} - ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} - '') - } + (proto: let portStr = toString proto.port; in '' + [${proto.name}] + enabled = ${boolToString proto.enable} + address = ${proto.address} + port = ${toString proto.port} + ${if proto ? keys then "keys = ${proto.keys}" else ""} + ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""} + ${if proto ? user then "user = ${proto.user}" else ""} + ${if proto ? pass then "pass = ${proto.pass}" else ""} + ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} + ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} + '') + } ''; i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" '' - ${flip concatMapStrings - (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) - (tun: let portStr = toString tun.port; in '' - [${tun.name}] - type = client - destination = ${tun.destination} - keys = ${tun.keys} - address = ${tun.address} - port = ${toString tun.port} - inbound.length = ${toString tun.inbound.length} - outbound.length = ${toString tun.outbound.length} - inbound.quantity = ${toString tun.inbound.quantity} - outbound.quantity = ${toString tun.outbound.quantity} - crypto.tagsToSend = ${toString tun.crypto.tagsToSend} - '') - } - ${flip concatMapStrings - (collect (tun: tun ? port && tun ? host) cfg.inTunnels) - (tun: let portStr = toString tun.port; in '' - [${tun.name}] - type = server - destination = ${tun.destination} - keys = ${tun.keys} - host = ${tun.address} - port = ${tun.port} - inport = ${tun.inPort} - accesslist = ${builtins.concatStringsSep "," tun.accessList} - '') - } + # DO NOT EDIT -- this file has been generated automatically. + ${flip concatMapStrings + (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) + (tun: let portStr = toString tun.port; in '' + [${tun.name}] + type = client + destination = ${tun.destination} + keys = ${tun.keys} + address = ${tun.address} + port = ${toString tun.port} + inbound.length = ${toString tun.inbound.length} + outbound.length = ${toString tun.outbound.length} + inbound.quantity = ${toString tun.inbound.quantity} + outbound.quantity = ${toString tun.outbound.quantity} + crypto.tagsToSend = ${toString tun.crypto.tagsToSend} + '') + } + ${flip concatMapStrings + (collect (tun: tun ? port && tun ? host) cfg.inTunnels) + (tun: let portStr = toString tun.port; in '' + [${tun.name}] + type = server + destination = ${tun.destination} + keys = ${tun.keys} + host = ${tun.address} + port = ${tun.port} + inport = ${tun.inPort} + accesslist = ${builtins.concatStringsSep "," tun.accessList} + '') + } ''; i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh - ${pkgs.i2pd}/bin/i2pd \ - ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \ + exec ${pkgs.i2pd}/bin/i2pd \ + ${if isNull cfg.address then "" else "--host="+cfg.address} \ --conf=${i2pdConf} \ --tunconf=${i2pdTunnelConf} ''; @@ -176,11 +179,23 @@ in ''; }; - extIp = mkOption { + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error"]; + default = "error"; + description = '' + The log level. i2pd defaults to "info" + but that generates copious amounts of log messages. + + We default to "error" which is similar to the default log + level of tor. + ''; + }; + + address = mkOption { type = with types; nullOr str; default = null; description = '' - Your external IP. + Your external IP or hostname. ''; }; @@ -213,7 +228,7 @@ in default = null; description = '' Set a router bandwidth limit integer in KBps. - If not set, i2pd defaults to 32KBps. + If not set, i2pd defaults to 32KBps. ''; }; @@ -261,9 +276,14 @@ in precomputation.elgamal = mkOption { type = types.bool; - default = false; + default = true; description = '' - Use ElGamal precomputated tables. + Whenever to use precomputated tables for ElGamal. + i2pd defaults to false + to save 64M of memory (and looses some performance). + + We default to true as that is what most + users want anyway. ''; }; @@ -353,7 +373,7 @@ in }; }; - proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 ""; + proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 ""; proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "") // { outproxy = mkOption { diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 5451500b56f6..81915b5a2ef8 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -125,8 +125,8 @@ in description = '' Specifies the hashed password for the MQTT User. overrides . - To generate hashed password install mkpasswd - package and run mkpasswd -m sha-512. + To generate hashed password install mosquitto + package and use mosquitto_passwd. ''; }; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 08ba2fdb1646..366bb2ed7a80 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -48,7 +48,7 @@ let # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' iptables -w -t nat -A nixos-nat-pre \ - -i ${cfg.externalInterface} -p tcp \ + -i ${cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} '') cfg.forwardPorts} @@ -133,12 +133,19 @@ in destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward tcp connection to destination ip:port"; + description = "Forward connection to destination ip:port"; + }; + + proto = mkOption { + type = types.str; + default = "tcp"; + example = "udp"; + description = "Protocol of forwarded connection"; }; }; }); default = []; - example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ]; + example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ]; description = '' List of forwarded ports from the external interface to @@ -151,38 +158,41 @@ in ###### implementation - config = mkIf config.networking.nat.enable { + config = mkMerge [ + { networking.firewall.extraCommands = mkBefore flushNat; } + (mkIf config.networking.nat.enable { - environment.systemPackages = [ pkgs.iptables ]; + environment.systemPackages = [ pkgs.iptables ]; - boot = { - kernelModules = [ "nf_nat_ftp" ]; - kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = mkOverride 99 true; - "net.ipv4.conf.default.forwarding" = mkOverride 99 true; - }; - }; - - networking.firewall = mkIf config.networking.firewall.enable { - extraCommands = mkMerge [ (mkBefore flushNat) setupNat ]; - extraStopCommands = flushNat; - }; - - systemd.services = mkIf (!config.networking.firewall.enable) { nat = { - description = "Network Address Translation"; - wantedBy = [ "network.target" ]; - after = [ "network-pre.target" "systemd-modules-load.service" ]; - path = [ pkgs.iptables ]; - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; + boot = { + kernelModules = [ "nf_nat_ftp" ]; + kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = mkOverride 99 true; + "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + }; }; - script = flushNat + setupNat; + networking.firewall = mkIf config.networking.firewall.enable { + extraCommands = setupNat; + extraStopCommands = flushNat; + }; - postStop = flushNat; - }; }; - }; + systemd.services = mkIf (!config.networking.firewall.enable) { nat = { + description = "Network Address Translation"; + wantedBy = [ "network.target" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; + path = [ pkgs.iptables ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = flushNat + setupNat; + + postStop = flushNat; + }; }; + }) + ]; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ab161b7e772c..2b7086afe7e8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -12,6 +12,7 @@ let dns = if cfg.useDnsmasq then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" + else if config.services.unbound.enable then "unbound" else "default"; configFile = writeText "NetworkManager.conf" '' diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index e0eef9ed96f6..c7a128ae212d 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -33,8 +33,8 @@ in package = mkOption { type = types.package; - default = pkgs.pythonPackages.searx; - defaultText = "pkgs.pythonPackages.searx"; + default = pkgs.searx; + defaultText = "pkgs.searx"; description = "searx package to use."; }; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8778b0364f9a..b0eb0460b9ba 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -120,7 +120,7 @@ in wantedBy = [ "multi-user.target" ]; path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; - after = [ "network.target" "keys.target" ]; + after = [ "network-online.target" "keys.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; }; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 79a0aa953feb..7a786b54ccbb 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -79,7 +79,15 @@ in default = null; type = types.nullOr types.str; description = '' - The ip adress to bind to. + The ip address to listen on for incoming connections. + ''; + }; + + bindToAddress = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The ip address to bind to (both listen on and send packets from). ''; }; @@ -123,7 +131,7 @@ in (flip mapAttrsToList cfg.networks (network: data: flip mapAttrs' data.hosts (host: text: nameValuePair ("tinc/${network}/hosts/${host}") - ({ mode = "0444"; inherit text; }) + ({ mode = "0644"; user = "tinc.${network}"; inherit text; }) ) // { "tinc/${network}/tinc.conf" = { mode = "0444"; @@ -131,7 +139,8 @@ in Name = ${if data.name == null then "$HOST" else data.name} DeviceType = ${data.interfaceType} ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"} - ${optionalString (data.listenAddress != null) "BindToAddress = ${data.listenAddress}"} + ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"} + ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"} Device = /dev/net/tun Interface = tinc.${network} ${data.extraConfig} @@ -155,15 +164,14 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ data.package ]; - restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ] - ++ mapAttrsToList (host: _ : config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; serviceConfig = { Type = "simple"; - PIDFile = "/run/tinc.${network}.pid"; - Restart = "on-failure"; + Restart = "always"; + RestartSec = "3"; }; preStart = '' mkdir -p /etc/tinc/${network}/hosts + chown tinc.${network} /etc/tinc/${network}/hosts # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then @@ -185,6 +193,19 @@ in }) ); + environment.systemPackages = let + cli-wrappers = pkgs.stdenv.mkDerivation { + name = "tinc-cli-wrappers"; + buildInputs = [ pkgs.makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + ${concatStringsSep "\n" (mapAttrsToList (network: data: '' + makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid" + '') cfg.networks)} + ''; + }; + in [ cli-wrappers ]; + users.extraUsers = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix deleted file mode 100644 index 757cce287607..000000000000 --- a/nixos/modules/services/networking/tlsdated.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - inherit (pkgs) coreutils tlsdate; - - cfg = config.services.tlsdated; -in - -{ - - ###### interface - - options = { - - services.tlsdated = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tlsdated daemon. - ''; - }; - - extraOptions = mkOption { - type = types.string; - default = ""; - description = '' - Additional command line arguments to pass to tlsdated. - ''; - }; - - sources = mkOption { - type = types.listOf (types.submodule { - options = { - host = mkOption { - type = types.string; - description = '' - Remote hostname. - ''; - }; - port = mkOption { - type = types.int; - description = '' - Remote port. - ''; - }; - proxy = mkOption { - type = types.nullOr types.string; - default = null; - description = '' - The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed: - - http://127.0.0.1:8118 - socks4a://127.0.0.1:9050 - socks5://127.0.0.1:9050 - - The proxy support should not leak DNS requests and is suitable for use with Tor. - ''; - }; - }; - }); - default = [ - { - host = "encrypted.google.com"; - port = 443; - proxy = null; - } - ]; - description = '' - You can list one or more sources to fetch time from. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - # Make tools such as tlsdate available in the system path - environment.systemPackages = [ tlsdate ]; - - systemd.services.tlsdated = { - description = "tlsdated daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we - # hard-code base-path to /tmp and use PrivateTmp. - ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" '' - base-path /tmp - - ${concatMapStrings (src: '' - source - host ${src.host} - port ${toString src.port} - proxy ${if src.proxy == null then "none" else src.proxy} - end - '') cfg.sources} - ''} ${cfg.extraOptions}"; - PrivateTmp = "yes"; - }; - }; - - }; - -} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index a8cff638d3b2..8e5f0bfc070d 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -3,7 +3,12 @@ with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; - cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; + cmd = '' + @${pkgs.jre}/bin/java java \ + ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ + ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ + -jar ${stateDir}/lib/ace.jar + ''; mountPoints = [ { what = "${pkgs.unifi}/dl"; @@ -58,6 +63,26 @@ in ''; }; + services.unifi.initialJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 1024; + description = '' + Set the initial heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + + services.unifi.maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + }; config = mkIf cfg.enable { @@ -121,8 +146,8 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${cmd} start"; - ExecStop = "${cmd} stop"; + ExecStart = "${(removeSuffix "\n" cmd)} start"; + ExecStop = "${(removeSuffix "\n" cmd)} stop"; User = "unifi"; PermissionsStartOnly = true; UMask = "0077"; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 62ff708d244c..4f54b45639f6 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -23,8 +23,23 @@ let privateKey = mkOption { example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; - type = types.str; - description = "Base64 private key generated by wg genkey."; + type = with types; nullOr str; + default = null; + description = '' + Base64 private key generated by wg genkey. + + Warning: Consider using privateKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + privateKeyFile = mkOption { + example = "/private/wireguard_key"; + type = with types; nullOr str; + default = null; + description = '' + Private key file as generated by wg genkey. + ''; }; listenPort = mkOption { @@ -64,6 +79,16 @@ let description = "A list of commands called after shutting down the interface."; }; + table = mkOption { + default = "main"; + type = types.str; + description = ''The kernel routing table to add this interface's + associated routes to. Setting this is useful for e.g. policy routing + ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric + table IDs and table names (/etc/rt_tables) can be used. Defaults to + "main".''; + }; + peers = mkOption { default = []; description = "Peers linked to the interface."; @@ -91,7 +116,22 @@ let example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; type = with types; nullOr str; description = '' - base64 preshared key generated by wg genpsk. Optional, + Base64 preshared key generated by wg genpsk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance. + + Warning: Consider using presharedKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + presharedKeyFile = mkOption { + default = null; + example = "/private/wireguard_psk"; + type = with types; nullOr str; + description = '' + File pointing to preshared key as generated by wg pensk. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -134,54 +174,61 @@ let }; - generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" '' - [Interface] - PrivateKey = ${values.privateKey} - ${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"} - - ${concatStringsSep "\n\n" (map (peer: '' - [Peer] - PublicKey = ${peer.publicKey} - ${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"} - ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"} - ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"} - ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"} - '') values.peers)} - ''; - ipCommand = "${pkgs.iproute}/bin/ip"; wgCommand = "${pkgs.wireguard}/bin/wg"; generateUnit = name: values: + # exactly one way to specify the private key must be set + assert (values.privateKey != null) != (values.privateKeyFile != null); + let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey; + in nameValuePair "wireguard-${name}" { description = "WireGuard Tunnel - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = lib.flatten([ + ExecStart = flatten([ values.preSetup "-${ipCommand} link del dev ${name}" "${ipCommand} link add dev ${name} type wireguard" - "${wgCommand} setconf ${name} ${generateConf name values}" (map (ip: - ''${ipCommand} address add ${ip} dev ${name}'' + "${ipCommand} address add ${ip} dev ${name}" ) values.ips) + ("${wgCommand} set ${name} private-key ${privKey}" + + optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}") + + (map (peer: + assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set + let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; + in + "${wgCommand} set ${name} peer ${peer.publicKey}" + + optionalString (psk != null) " preshared-key ${psk}" + + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" + ) values.peers) + "${ipCommand} link set up dev ${name}" - (flatten (map (peer: (map (ip: - "${ipCommand} route add ${ip} dev ${name}" - ) peer.allowedIPs)) values.peers)) + (map (peer: + (map (allowedIP: + "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" + ) peer.allowedIPs) + ) values.peers) values.postSetup ]); - - ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown; + ExecStop = flatten([ + "${ipCommand} link del dev ${name}" + values.postShutdown + ]); }; }; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 7ce2ae38fb36..855c89303847 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -37,7 +37,7 @@ let [ cups.out additionalBackends cups-filters pkgs.ghostscript ] ++ optional cfg.gutenprint gutenprint ++ cfg.drivers; - pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; + pathsToLink = [ "/lib" "/share/cups" "/bin" ]; postBuild = cfg.bindirCmds; ignoreCollisions = true; }; @@ -324,6 +324,8 @@ in fi ''} ''; + + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index e292fd9851e3..3e5087766b1c 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -21,21 +21,20 @@ let ''; github = cfg: '' - $(optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}") \ - $(optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}") \ + ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \ + ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \ ''; google = cfg: '' --google-admin-email=${cfg.google.adminEmail} \ --google-service-account=${cfg.google.serviceAccountJSON} \ - $(repeatedArgs (group: "--google-group=${group}") cfg.google.groups) \ + ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \ ''; }; authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses; - getProviderOptions = cfg: provider: - if providerSpecificOptions ? provider then providerSpecificOptions.provider cfg else ""; + getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg; mkCommandLine = cfg: '' --provider='${cfg.provider}' \ diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix new file mode 100644 index 000000000000..62308428f326 --- /dev/null +++ b/nixos/modules/services/security/sks.nix @@ -0,0 +1,82 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.sks; + + sksPkg = cfg.package; + +in + +{ + + options = { + + services.sks = { + + enable = mkEnableOption "sks"; + + package = mkOption { + default = pkgs.sks; + defaultText = "pkgs.sks"; + type = types.package; + description = " + Which sks derivation to use. + "; + }; + + hkpAddress = mkOption { + default = [ "127.0.0.1" "::1" ]; + type = types.listOf types.str; + description = " + Wich ip addresses the sks-keyserver is listening on. + "; + }; + + hkpPort = mkOption { + default = 11371; + type = types.int; + description = " + Which port the sks-keyserver is listening on. + "; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ sksPkg ]; + + users.users.sks = { + createHome = true; + home = "/var/db/sks"; + isSystemUser = true; + shell = "${pkgs.coreutils}/bin/true"; + }; + + systemd.services = let + hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ; + hkpPort = builtins.toString cfg.hkpPort; + home = config.users.users.sks.home; + user = config.users.users.sks.name; + in { + sks-keyserver = { + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p ${home}/dump + ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ + ${pkgs.sks}/bin/sks cleandb || true + ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true + ''; + serviceConfig = { + WorkingDirectory = home; + User = user; + Restart = "always"; + ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 10596d6431d0..04b065f6ae4b 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -7,7 +7,7 @@ let torDirectory = "/var/lib/tor"; opt = name: value: optionalString (value != null) "${name} ${value}"; - optint = name: value: optionalString (value != 0) "${name} ${toString value}"; + optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}"; torRc = '' User tor @@ -17,7 +17,7 @@ let GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 ''} - ${optint "ControlPort" cfg.controlPort} + ${optint "ControlPort" (toString cfg.controlPort)} '' # Client connection config + optionalString cfg.client.enable '' @@ -27,7 +27,8 @@ let '' # Relay config + optionalString cfg.relay.enable '' - ORPort ${cfg.relay.portSpec} + ORPort ${toString cfg.relay.port} + ${opt "Address" cfg.relay.address} ${opt "Nickname" cfg.relay.nickname} ${opt "ContactInfo" cfg.relay.contactInfo} @@ -36,19 +37,32 @@ let ${opt "AccountingMax" cfg.relay.accountingMax} ${opt "AccountingStart" cfg.relay.accountingStart} - ${if cfg.relay.isExit then + ${if (cfg.relay.role == "exit") then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"} - ${optionalString cfg.relay.isBridge '' + ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) '' BridgeRelay 1 ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed + ExtORPort auto + ${optionalString (cfg.relay.role == "private-bridge") '' + ExtraInfoStatistics 0 + PublishServerDescriptor 0 + ''} ''} '' + # Hidden services + + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: '' + HiddenServiceDir ${torDirectory}/onion/${v.name} + ${flip concatMapStrings v.map (p: '' + HiddenServicePort ${toString p.port} ${p.destination} + '')} + '')) + cfg.extraConfig; torRcFile = pkgs.writeText "torrc" torRc; + in { options = { @@ -84,8 +98,8 @@ in }; controlPort = mkOption { - type = types.int; - default = 0; + type = types.nullOr (types.either types.int types.str); + default = null; example = 9051; description = '' If set, Tor will accept connections on the specified port @@ -121,9 +135,10 @@ in example = "192.168.0.1:9101"; description = '' Bind to this address to listen for connections from - Socks-speaking applications. Same as socksListenAddress - but uses weaker circuit isolation to provide performance - suitable for a web browser. + Socks-speaking applications. Same as + but uses weaker + circuit isolation to provide performance suitable for a + web browser. ''; }; @@ -133,9 +148,9 @@ in example = "accept 192.168.0.0/16, reject *"; description = '' Entry policies to allow/deny SOCKS requests based on IP - address. First entry that matches wins. If no SocksPolicy + address. First entry that matches wins. If no SocksPolicy is set, we accept all (and only) requests from - SocksListenAddress. + . ''; }; @@ -164,45 +179,147 @@ in description = '' Whether to enable relaying TOR traffic for others. - See https://www.torproject.org/docs/tor-doc-relay for details. + See + for details. + + Setting this to true requires setting + + and + + options. ''; }; - isBridge = mkOption { - type = types.bool; - default = false; + role = mkOption { + type = types.enum [ "exit" "relay" "bridge" "private-bridge" ]; description = '' - Bridge relays (or "bridges") are Tor relays that aren't - listed in the main directory. Since there is no complete - public list of them, even if an ISP is filtering - connections to all the known Tor relays, they probably - won't be able to block all the bridges. + Your role in Tor network. There're several options: - A bridge relay can't be an exit relay. + + + exit + + + An exit relay. This allows Tor users to access regular + Internet services through your public IP. + - You need to set relay.enable to true for this option to - take effect. + + Running an exit relay may expose you to abuse + complaints. See + + for more info. + - The bridge is set up with an obfuscated transport proxy. + + You can specify which services Tor users may access via + your exit relay using option. + + + - See https://www.torproject.org/bridges.html.en for more info. - ''; - }; + + relay + + + Regular relay. This allows Tor users to relay onion + traffic to other Tor nodes, but not to public + Internet. + - isExit = mkOption { - type = types.bool; - default = false; - description = '' - An exit relay allows Tor users to access regular Internet - services. + + Note that some misconfigured and/or disrespectful + towards privacy sites will block you even if your + relay is not an exit relay. That is, just being listed + in a public relay directory can have unwanted + consequences. - Unlike running a non-exit relay, running an exit relay may - expose you to abuse complaints. See - https://www.torproject.org/faq.html.en#ExitPolicies for - more info. + Which means you might not want to use + this role if you browse public Internet from the same + network as your relay, unless you want to write + e-mails to those sites (you should!). + - You can specify which services Tor users may access via - your exit relay using exitPolicy option. + + See + + for more info. + + + + + + bridge + + + Regular bridge. Works like a regular relay, but + doesn't list you in the public relay directory and + hides your Tor node behind obfsproxy. + + + + Using this option will make Tor advertise your bridge + to users through various mechanisms like + , though. + + + + + WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE. + Consult with your lawer when in doubt. + + + + This role should be safe to use in most situations + (unless the act of forwarding traffic for others is + a punishable offence under your local laws, which + would be pretty insane as it would make ISP + illegal). + + + + + See + for more info. + + + + + + private-bridge + + + Private bridge. Works like regular bridge, but does + not advertise your node in any way. + + + + Using this role means that you won't contribute to Tor + network in any way unless you advertise your node + yourself in some way. + + + + Use this if you want to run a private bridge, for + example because you'll give out your bridge address + manually to your friends. + + + + Switching to this role after measurable time in + "bridge" role is pretty useless as some Tor users + would have learned about your node already. In the + latter case you can still change + option. + + + + See + for more info. + + + + ''; }; @@ -229,11 +346,11 @@ in default = null; example = "450 GBytes"; description = '' - Specify maximum bandwidth allowed during an accounting - period. This allows you to limit overall tor bandwidth - over some time period. See the - AccountingMax option by looking at the - tor manual (man tor) for more. + Specify maximum bandwidth allowed during an accounting period. This + allows you to limit overall tor bandwidth over some time period. + See the AccountingMax option by looking at the + tor manual tor + 1 for more. Note this limit applies individually to upload and download; if you specify "500 GBytes" @@ -247,16 +364,17 @@ in default = null; example = "month 1 1:00"; description = '' - Specify length of an accounting period. This allows you to - limit overall tor bandwidth over some time period. See the - AccountingStart option by looking at - the tor manual (man tor) for more. + Specify length of an accounting period. This allows you to limit + overall tor bandwidth over some time period. See the + AccountingStart option by looking at the tor + manual tor + 1 for more. ''; }; bandwidthRate = mkOption { - type = types.int; - default = 0; + type = types.nullOr types.int; + default = null; example = 100; description = '' Specify this to limit the bandwidth usage of relayed (server) @@ -265,7 +383,7 @@ in }; bandwidthBurst = mkOption { - type = types.int; + type = types.nullOr types.int; default = cfg.relay.bandwidthRate; example = 200; description = '' @@ -275,13 +393,24 @@ in ''; }; - portSpec = mkOption { - type = types.str; - example = "143"; + address = mkOption { + type = types.nullOr types.str; + default = null; + example = "noname.example.com"; description = '' - What port to advertise for Tor connections. This corresponds - to the ORPort section in the Tor manual; see - man tor for more details. + The IP address or full DNS name for advertised address of your relay. + Leave unset and Tor will guess. + ''; + }; + + port = mkOption { + type = types.either types.int types.str; + example = 143; + description = '' + What port to advertise for Tor connections. This corresponds to the + ORPort section in the Tor manual; see + tor + 1 for more details. At a minimum, you should just specify the port for the relay to listen on; a common one like 143, 22, 80, or 443 @@ -299,13 +428,15 @@ in considered first to last, and the first match wins. If you want to _replace_ the default exit policy, end this with either a reject *:* or an accept *:*. Otherwise, you're - _augmenting_ (prepending to) the default exit - policy. Leave commented to just use the default, which is + _augmenting_ (prepending to) the default exit policy. + Leave commented to just use the default, which is available in the man page or at - https://www.torproject.org/documentation.html + . - Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses - for issues you might encounter if you use the default exit policy. + Look at + + for issues you might encounter if you use the default + exit policy. If certain IPs and ports are blocked externally, e.g. by your firewall, you should update your exit policy to @@ -314,15 +445,124 @@ in ''; }; }; + + hiddenServices = mkOption { + description = '' + A set of static hidden services that terminate their Tor + circuits at this node. + + Every element in this set declares a virtual onion host. + + You can specify your onion address by putting corresponding + private key to an appropriate place in ${torDirectory}. + + For services without private keys in ${torDirectory} Tor + daemon will generate random key pairs (which implies random + onion addresses) on restart. The latter could take a while, + please be patient. + + + Hidden services can be useful even if you don't intend to + actually hide them, since they can + also be seen as a kind of NAT traversal mechanism. + + E.g. the example will make your sshd, whatever runs on + "8080" and your mail server available from anywhere where + the Tor network is available (which, with the help from + bridges, is pretty much everywhere), even if both client + and server machines are behind NAT you have no control + over. + + ''; + default = {}; + example = literalExample '' + { "my-hidden-service-example".map = [ + { port = 22; } # map ssh port to this machine's ssh + { port = 80; toPort = 8080; } # map http port to whatever runs on 8080 + { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can + ]; + } + ''; + type = types.loaOf (types.submodule ({name, config, ...}: { + options = { + + name = mkOption { + type = types.str; + description = '' + Name of this tor hidden service. + + This is purely descriptive. + + After restarting Tor daemon you should be able to + find your .onion address in + ${torDirectory}/onion/$name/hostname. + ''; + }; + + map = mkOption { + default = []; + description = "Port mapping for this hidden service."; + type = types.listOf (types.submodule ({config, ...}: { + options = { + + port = mkOption { + type = types.either types.int types.str; + example = 80; + description = '' + Hidden service port to "bind to". + ''; + }; + + destination = mkOption { + internal = true; + type = types.str; + description = "Forward these connections where?"; + }; + + toHost = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Mapping destination host."; + }; + + toPort = mkOption { + type = types.either types.int types.str; + example = 8080; + description = "Mapping destination port."; + }; + + }; + + config = { + toPort = mkDefault config.port; + destination = mkDefault "${config.toHost}:${toString config.toPort}"; + }; + })); + }; + + }; + + config = { + name = mkDefault name; + }; + })); + }; }; }; config = mkIf cfg.enable { - assertions = singleton - { message = "Can't be both an exit and a bridge relay at the same time"; - assertion = - cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit); - }; + # Not sure if `cfg.relay.role == "private-bridge"` helps as tor + # sends a lot of stats + warnings = optional (cfg.relay.enable && cfg.hiddenServices != {}) + '' + Running Tor hidden services on a public relay makes the + presence of hidden services visible through simple statistical + analysis of publicly available data. + + You can safely ignore this warning if you don't intend to + actually hide your hidden services. In either case, you can + always create a container/VM with a separate Tor daemon instance. + ''; users.extraGroups.tor.gid = config.ids.gids.tor; users.extraUsers.tor = @@ -342,9 +582,13 @@ in restartTriggers = [ torRcFile ]; # Translated from the upstream contrib/dist/tor.service.in + preStart = '' + install -o tor -g tor -d ${torDirectory}/onion + ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config + ''; + serviceConfig = { Type = "simple"; - ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix new file mode 100644 index 000000000000..1f2c56a9efa1 --- /dev/null +++ b/nixos/modules/services/security/usbguard.nix @@ -0,0 +1,200 @@ +{config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.usbguard; + + # valid policy options + policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]); + + # decide what file to use for rules + ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile; + + daemonConf = '' + # generated by nixos/modules/services/security/usbguard.nix + RuleFile=${ruleFile} + ImplicitPolicyTarget=${cfg.implictPolicyTarget} + PresentDevicePolicy=${cfg.presentDevicePolicy} + PresentControllerPolicy=${cfg.presentControllerPolicy} + InsertedDevicePolicy=${cfg.insertedDevicePolicy} + RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"} + # this does not seem useful for endusers to change + DeviceManagerBackend=uevent + IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} + IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} + IPCAccessControlFiles=${cfg.IPCAccessControlFiles} + DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"} + AuditFilePath=${cfg.auditFilePath} + ''; + + daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf; + +in { + + ###### interface + + options = { + services.usbguard = { + enable = mkEnableOption "USBGuard daemon"; + + ruleFile = mkOption { + type = types.path; + default = "/var/lib/usbguard/rules.conf"; + description = '' + The USBGuard daemon will use this file to load the policy rule set + from it and to write new rules received via the IPC interface. + + Running the command usbguard generate-policy as + root will generate a config for your currently plugged in devices. + For a in depth guide consult the official documentation. + + Setting the rules option will ignore the + ruleFile option. + ''; + }; + + rules = mkOption { + type = types.nullOr types.str; + default = null; + example = '' + allow with-interface equals { 08:*:* } + ''; + description = '' + The USBGuard daemon will load this policy rule set. Modifying it via + the IPC interface won't work if you use this option, since the + contents of this option will be written into the nix-store it will be + read-only. + + You can still use usbguard generate-policy to + generate rules, but you would have to insert them here. + + Setting the rules option will ignore the + ruleFile option. + ''; + }; + + implictPolicyTarget = mkOption { + type = policy; + default = "block"; + description = '' + How to treat USB devices that don't match any rule in the policy. + Target should be one of allow, block or reject (logically remove the + device node from the system). + ''; + }; + + presentDevicePolicy = mkOption { + type = policy; + default = "apply-policy"; + description = '' + How to treat USB devices that are already connected when the daemon + starts. Policy should be one of allow, block, reject, keep (keep + whatever state the device is currently in) or apply-policy (evaluate + the rule set for every present device). + ''; + }; + + presentControllerPolicy = mkOption { + type = policy; + default = "keep"; + description = '' + How to treat USB controller devices that are already connected when + the daemon starts. One of allow, block, reject, keep or apply-policy. + ''; + }; + + insertedDevicePolicy = mkOption { + type = policy; + default = "apply-policy"; + description = '' + How to treat USB devices that are already connected after the daemon + starts. One of block, reject, apply-policy. + ''; + }; + + restoreControllerDeviceState = mkOption { + type = types.bool; + default = false; + description = '' + The USBGuard daemon modifies some attributes of controller + devices like the default authorization state of new child device + instances. Using this setting, you can controll whether the daemon + will try to restore the attribute values to the state before + modificaton on shutdown. + ''; + }; + + IPCAllowedUsers = mkOption { + type = types.listOf types.str; + default = [ "root" ]; + example = [ "root" "yourusername" ]; + description = '' + A list of usernames that the daemon will accept IPC connections from. + ''; + }; + + IPCAllowedGroups = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "wheel" ]; + description = '' + A list of groupnames that the daemon will accept IPC connections + from. + ''; + }; + + IPCAccessControlFiles = mkOption { + type = types.path; + default = "/var/lib/usbguard/IPCAccessControl.d/"; + description = '' + The files at this location will be interpreted by the daemon as IPC + access control definition files. See the IPC ACCESS CONTROL section + in usbguard-daemon.conf + 5 for more details. + ''; + }; + + deviceRulesWithPort = mkOption { + type = types.bool; + default = false; + description = '' + Generate device specific rules including the "via-port" attribute. + ''; + }; + + auditFilePath = mkOption { + type = types.path; + default = "/var/log/usbguard/usbguard-audit.log"; + description = '' + USBGuard audit events log file path. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.usbguard ]; + + systemd.services.usbguard = { + description = "USBGuard daemon"; + + wantedBy = [ "basic.target" ]; + wants = [ "systemd-udevd.service" "local-fs.target" ]; + + # make sure an empty rule file and required directories exist + preStart = ''mkdir -p $(dirname "${cfg.ruleFile}") "${cfg.IPCAccessControlFiles}" && ([ -f "${cfg.ruleFile}" ] || touch ${cfg.ruleFile})''; + + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}''; + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix new file mode 100644 index 000000000000..146afec344ab --- /dev/null +++ b/nixos/modules/services/security/vault.nix @@ -0,0 +1,143 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.vault; + + configFile = pkgs.writeText "vault.hcl" '' + listener "tcp" { + address = "${cfg.address}" + ${if (cfg.tlsCertFile == null || cfg.tlsKeyFile == null) then '' + tls_disable = "true" + '' else '' + tls_cert_file = "${cfg.tlsCertFile}" + tls_key_file = "${cfg.tlsKeyFile}" + ''} + ${cfg.listenerExtraConfig} + } + storage "${cfg.storageBackend}" { + ${optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''} + ${optionalString (cfg.storageConfig != null) cfg.storageConfig} + } + ${optionalString (cfg.telemetryConfig != "") '' + telemetry { + ${cfg.telemetryConfig} + } + ''} + ''; +in +{ + options = { + + services.vault = { + + enable = mkEnableOption "Vault daemon"; + + address = mkOption { + type = types.str; + default = "127.0.0.1:8200"; + description = "The name of the ip interface to listen to"; + }; + + tlsCertFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/cert.pem"; + description = "TLS certificate file. TLS will be disabled unless this option is set"; + }; + + tlsKeyFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/key.pem"; + description = "TLS private key file. TLS will be disabled unless this option is set"; + }; + + listenerExtraConfig = mkOption { + type = types.lines; + default = '' + tls_min_version = "tls12" + ''; + description = "extra configuration"; + }; + + storageBackend = mkOption { + type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" ]; + default = "inmem"; + description = "The name of the type of storage backend"; + }; + + storagePath = mkOption { + type = types.nullOr types.path; + default = if cfg.storageBackend == "file" then "/var/lib/vault" else null; + description = "Data directory for file backend"; + }; + + storageConfig = mkOption { + type = types.nullOr types.lines; + default = null; + description = "Storage configuration"; + }; + + telemetryConfig = mkOption { + type = types.lines; + default = ""; + description = "Telemetry configuration"; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null); + message = ''The "inmem" storage expects no services.vault.storagePath nor services.vault.storageConfig''; + } + { assertion = (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && (cfg.storagePath != null -> cfg.storageBackend == "file"); + message = ''You must set services.vault.storagePath only when using the "file" backend''; + } + ]; + + users.extraUsers.vault = { + name = "vault"; + group = "vault"; + uid = config.ids.uids.vault; + description = "Vault daemon user"; + }; + users.extraGroups.vault.gid = config.ids.gids.vault; + + systemd.services.vault = { + description = "Vault server daemon"; + + wantedBy = ["multi-user.target"]; + after = [ "network.target" ] + ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; + + restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients. + + preStart = optionalString (cfg.storagePath != null) '' + install -d -m0700 -o vault -g vault "${cfg.storagePath}" + ''; + + serviceConfig = { + User = "vault"; + Group = "vault"; + PermissionsStartOnly = true; + ExecStart = "${pkgs.vault}/bin/vault server -config ${configFile}"; + PrivateDevices = true; + PrivateTmp = true; + ProtectSystem = "full"; + ProtectHome = "read-only"; + AmbientCapabilities = "cap_ipc_lock"; + NoNewPrivileges = true; + KillSignal = "SIGINT"; + TimeoutStopSec = "30s"; + Restart = "on-failure"; + StartLimitInterval = "60s"; + StartLimitBurst = 3; + }; + + unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath; + }; + }; + +} diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix new file mode 100644 index 000000000000..281716cf1860 --- /dev/null +++ b/nixos/modules/services/system/saslauthd.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + nssModulesPath = config.system.nssModules.path; + cfg = config.services.saslauthd; + +in + +{ + + ###### interface + + options = { + + services.saslauthd = { + + enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon."; + + package = mkOption { + default = pkgs.cyrus_sasl.bin; + defaultText = "pkgs.cyrus_sasl.bin"; + type = types.package; + description = "Cyrus SASL package to use."; + }; + + mechanism = mkOption { + type = types.str; + default = "pam"; + description = "Auth mechanism to use"; + }; + + config = mkOption { + type = types.lines; + default = ""; + description = "Configuration to use for Cyrus SASL authentication daemon."; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.saslauthd = { + description = "Cyrus SASL authentication daemon"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "@${cfg.package}/sbin/saslauthd saslauthd -a ${cfg.mechanism} -O ${pkgs.writeText "saslauthd.conf" cfg.config}"; + Type = "forking"; + PIDFile = "/run/saslauthd/saslauthd.pid"; + Restart = "always"; + }; + }; + }; +} diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index 051d54e932fb..3429397d2cc2 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -68,24 +68,35 @@ in services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>''; systemd.services."getty@" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM") + ]; restartIfChanged = false; }; systemd.services."serial-getty@" = - { serviceConfig.ExecStart = - let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); - in gettyCmd "%I ${speeds} $TERM"; + let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "%I ${speeds} $TERM") + ]; restartIfChanged = false; }; systemd.services."container-getty@" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM") + ]; restartIfChanged = false; }; systemd.services."console-getty" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") + ]; serviceConfig.Restart = "always"; restartIfChanged = false; enable = mkDefault config.boot.isContainer; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index c1d7d4ea06d4..2344b9922d0b 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -6,7 +6,22 @@ let cfg = config.services.confluence; - pkg = pkgs.atlassian-confluence; + pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }); in @@ -76,6 +91,42 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this Confluence instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this Confluence instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + + + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 0ab94d95eee8..19b6a8d30851 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -6,7 +6,22 @@ let cfg = config.services.jira; - pkg = pkgs.atlassian-jira; + pkg = pkgs.atlassian-jira.override { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }; in @@ -82,6 +97,40 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this JIRA instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this JIRA instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix new file mode 100644 index 000000000000..93f69bd12651 --- /dev/null +++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.pgpkeyserver-lite; + sksCfg = config.services.sks; + + webPkg = cfg.package; + +in + +{ + + options = { + + services.pgpkeyserver-lite = { + + enable = mkEnableOption "pgpkeyserver-lite on a nginx vHost proxying to a gpg keyserver"; + + package = mkOption { + default = pkgs.pgpkeyserver-lite; + defaultText = "pkgs.pgpkeyserver-lite"; + type = types.package; + description = " + Which webgui derivation to use. + "; + }; + + hostname = mkOption { + type = types.str; + description = " + Which hostname to set the vHost to that is proxying to sks. + "; + }; + + hkpAddress = mkOption { + default = builtins.head sksCfg.hkpAddress; + type = types.str; + description = " + Wich ip address the sks-keyserver is listening on. + "; + }; + + hkpPort = mkOption { + default = sksCfg.hkpPort; + type = types.int; + description = " + Which port the sks-keyserver is listening on. + "; + }; + }; + }; + + config = mkIf cfg.enable { + + services.nginx.enable = true; + + services.nginx.virtualHosts = let + hkpPort = builtins.toString cfg.hkpPort; + in { + "${cfg.hostname}" = { + root = webPkg; + locations = { + "/pks".extraConfig = '' + proxy_pass http://${cfg.hkpAddress}:${hkpPort}; + proxy_pass_header Server; + add_header Via "1.1 ${cfg.hostname}"; + ''; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml index a1d8a5b7556a..21342d4454fb 100644 --- a/nixos/modules/services/web-apps/piwik-doc.xml +++ b/nixos/modules/services/web-apps/piwik-doc.xml @@ -23,16 +23,24 @@ and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: + + # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - ALTER USER root IDENTIFIED VIA unix_socket; CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket; + CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket; + GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + + # For MySQL + INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; + CREATE DATABASE piwik; + CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket; GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + Then fill in piwik as database user and database name, and leave the password field blank. - This works with MariaDB and MySQL. This authentication works by allowing only the piwik unix - user to authenticate as piwik database (without needing a password), but no other users. + This authentication works by allowing only the piwik unix user to authenticate as the + piwik database user (without needing a password), but no other users. For more information on passwordless login, see . diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index ee32a1c86d4d..d8efa24bc6d5 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -5,12 +5,22 @@ with lib; let cfg = config.services.caddy; configFile = pkgs.writeText "Caddyfile" cfg.config; -in -{ +in { options.services.caddy = { enable = mkEnableOption "Caddy web server"; config = mkOption { + default = ""; + example = '' + example.com { + gzip + minify + log syslog + + root /srv/http + } + ''; + type = types.lines; description = "Verbatim Caddyfile to use"; }; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 84cd0a4095d9..45a65965112a 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -37,8 +37,10 @@ let "mod_rrdtool" "mod_accesslog" # Remaining list of modules, order assumed to be unimportant. + "mod_authn_file" + "mod_authn_mysql" "mod_cml" - "mod_dirlisting" + "mod_deflate" "mod_evasive" "mod_extforward" "mod_flv_streaming" @@ -47,6 +49,7 @@ let "mod_scgi" "mod_setenv" "mod_trigger_b4_dl" + "mod_uploadprogress" "mod_webdav" ]; @@ -86,14 +89,9 @@ let accesslog.use-syslog = "enable" server.errorlog-use-syslog = "enable" - mimetype.assign = ( - ".html" => "text/html", - ".htm" => "text/html", - ".txt" => "text/plain", - ".jpg" => "image/jpeg", - ".png" => "image/png", - ".css" => "text/css" - ) + ${lib.optionalString cfg.enableUpstreamMimeTypes '' + include "${pkgs.lighttpd}/share/lighttpd/doc/config/conf.d/mime.conf" + ''} static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" ) index-file.names = ( "index.html" ) @@ -165,6 +163,17 @@ in ''; }; + enableUpstreamMimeTypes = mkOption { + type = types.bool; + default = true; + description = '' + Whether to include the list of mime types bundled with lighttpd + (upstream). If you disable this, no mime types will be added by + NixOS and you will have to add your own mime types in + . + ''; + }; + mod_status = mkOption { default = false; type = types.bool; @@ -177,7 +186,7 @@ in configText = mkOption { default = ""; type = types.lines; - example = ''...verbatim config file contents...''; + example = ''...verbatim config file contents...''; description = '' Overridable config file contents to use for lighttpd. By default, use the contents automatically generated by NixOS. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ae14aa28ae34..293fa77107e3 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -36,6 +36,11 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; + + ${optionalString (cfg.resolver.addresses != []) '' + resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"}; + ''} ${optionalString (cfg.recommendedOptimisation) '' # optimisation @@ -65,6 +70,7 @@ let gzip_proxied any; gzip_comp_level 9; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + gzip_vary on; ''} ${optionalString (cfg.recommendedProxySettings) '' @@ -115,6 +121,7 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; ${cfg.httpConfig} }''} @@ -122,46 +129,66 @@ let ''; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: - let - serverName = vhost.serverName; - ssl = vhost.enableSSL || vhost.forceSSL; - port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); - listenString = toString port + optionalString ssl " ssl http2" - + optionalString vhost.default " default_server"; - acmeLocation = optionalString vhost.enableACME ('' + let + ssl = with vhost; addSSL || onlySSL || enableSSL; + + defaultListen = with vhost; + if listen != [] then listen + else if onlySSL || enableSSL then + singleton { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } + else singleton { addr = "0.0.0.0"; port = 80; ssl = false; } + ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } + ++ optional addSSL { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional (enableIPv6 && addSSL) { addr = "[::]"; port = 443; ssl = true; }; + + hostListen = + if !vhost.forceSSL + then defaultListen + else filter (x: x.ssl) defaultListen; + + listenString = { addr, port, ssl, ... }: + "listen ${addr}:${toString port} " + + optionalString ssl "ssl http2 " + + optionalString vhost.default "default_server " + + ";"; + + redirectListen = filter (x: !x.ssl) defaultListen; + + redirectListenString = { addr, ... }: + "listen ${addr}:80 ${optionalString vhost.default "default_server"};"; + + acmeLocation = '' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} root ${vhost.acmeRoot}; auth_basic off; } - '' + (optionalString (vhost.acmeFallbackHost != null) '' - location @acme-fallback { - auth_basic off; - proxy_pass http://${vhost.acmeFallbackHost}; - } - '')); + ${optionalString (vhost.acmeFallbackHost != null) '' + location @acme-fallback { + auth_basic off; + proxy_pass http://${vhost.acmeFallbackHost}; + } + ''} + ''; + in '' ${optionalString vhost.forceSSL '' server { - listen 80 ${optionalString vhost.default "default_server"}; - ${optionalString enableIPv6 - ''listen [::]:80 ${optionalString vhost.default "default_server"};'' - } + ${concatMapStringsSep "\n" redirectListenString redirectListen} - server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; - ${acmeLocation} + server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; + ${optionalString vhost.enableACME acmeLocation} location / { - return 301 https://$host${optionalString (port != 443) ":${toString port}"}$request_uri; + return 301 https://$host$request_uri; } } ''} server { - listen ${listenString}; - ${optionalString enableIPv6 "listen [::]:${listenString};"} - - server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; - ${acmeLocation} + ${concatMapStringsSep "\n" listenString hostListen} + server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; + ${optionalString vhost.enableACME acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri; @@ -378,9 +405,35 @@ in description = "Path to DH parameters file."; }; + resolver = mkOption { + type = types.submodule { + options = { + addresses = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]''; + description = "List of resolvers to use"; + }; + valid = mkOption { + type = types.str; + default = ""; + example = "30s"; + description = '' + By default, nginx caches answers using the TTL value of a response. + An optional valid parameter allows overriding it + ''; + }; + }; + }; + description = '' + Configures name servers used to resolve names of upstream servers into addresses + ''; + default = {}; + }; + virtualHosts = mkOption { type = types.attrsOf (types.submodule (import ./vhost-options.nix { - inherit lib; + inherit config lib; })); default = { localhost = {}; @@ -388,6 +441,7 @@ in example = literalExample '' { "hydra.example.com" = { + addSSL = true; forceSSL = true; enableACME = true; locations."/" = { @@ -404,11 +458,40 @@ in config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test - assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ + warnings = + let + deprecatedSSL = name: config: optional config.enableSSL + '' + config.services.nginx.virtualHosts..enableSSL is deprecated, + use config.services.nginx.virtualHosts..onlySSL instead. + ''; + + in flatten (mapAttrsToList deprecatedSSL virtualHosts); + + assertions = + let + hostOrAliasIsNull = l: l.root == null || l.alias == null; + in [ { assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts); message = "Only one of nginx root or alias can be specified on a location."; } + + { + assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts); + message = '' + Options services.nginx.service.virtualHosts..addSSL and + services.nginx.virtualHosts..onlySSL are mutually esclusive + ''; + } + + { + assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts); + message = '' + Option services.nginx.virtualHosts..forceSSL requires + services.nginx.virtualHosts..addSSL set to true. + ''; + } ]; systemd.services.nginx = { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index c0ea645b3dfe..362f8ee90524 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -3,7 +3,7 @@ # has additional options that affect the web server as a whole, like # the user/group to run under.) -{ lib }: +{ config, lib }: with lib; { @@ -26,12 +26,22 @@ with lib; ''; }; - port = mkOption { - type = types.nullOr types.int; - default = null; + listen = mkOption { + type = with types; listOf (submodule { options = { + addr = mkOption { type = str; description = "IP address."; }; + port = mkOption { type = int; description = "Port number."; default = 80; }; + ssl = mkOption { type = bool; description = "Enable SSL."; default = false; }; + }; }); + default = []; + example = [ + { addr = "195.154.1.1"; port = 443; ssl = true;} + { addr = "192.154.1.1"; port = 80; } + ]; description = '' - Port for the server. Defaults to 80 for http - and 443 for https (i.e. when enableSSL is set). + Listen addresses and ports for this virtual host. + IPv6 addresses must be enclosed in square brackets. + Note: this option overrides addSSL + and onlySSL. ''; }; @@ -56,16 +66,39 @@ with lib; ''; }; - enableSSL = mkOption { + addSSL = mkOption { type = types.bool; default = false; - description = "Whether to enable SSL (https) support."; + description = '' + Whether to enable HTTPS in addition to plain HTTP. This will set defaults for + listen to listen on all interfaces on the respective default + ports (80, 443). + ''; + }; + + onlySSL = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable HTTPS and reject plain HTTP connections. This will set + defaults for listen to listen on all interfaces on port 443. + ''; + }; + + enableSSL = mkOption { + type = types.bool; + visible = false; + default = false; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether to always redirect to https."; + description = '' + Whether to add a separate nginx server block that permanently redirects (301) + all plain HTTP traffic to HTTPS. This option needs addSSL + to be set to true. + ''; }; sslCertificate = mkOption { diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 26f546022035..f9febbfbacdf 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -150,7 +150,6 @@ in { PrivateDevices = true; ProtectSystem = "full"; ProtectHome = true; - NoNewPrivileges = true; RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; Type = "notify"; ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 5433db3b91c8..c3bc065d4651 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -7,14 +7,10 @@ with lib; { options = { services.varnish = { - enable = mkOption { - default = false; - description = " - Enable the Varnish Server. - "; - }; + enable = mkEnableOption "Varnish Server"; http_address = mkOption { + type = types.str; default = "*:6081"; description = " HTTP listen address and port. @@ -22,17 +18,37 @@ with lib; }; config = mkOption { + type = types.lines; description = " Verbatim default.vcl configuration. "; }; stateDir = mkOption { + type = types.path; default = "/var/spool/varnish/${config.networking.hostName}"; description = " Directory holding all state for Varnish to run. "; }; + + extraModules = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.varnish-geoip ]"; + description = " + Varnish modules (except 'std'). + "; + }; + + extraCommandLine = mkOption { + type = types.str; + default = ""; + example = "-s malloc,256M"; + description = " + Command line switches for varnishd (run 'varnishd -?' to get list of options) + "; + }; }; }; @@ -42,6 +58,7 @@ with lib; systemd.services.varnish = { description = "Varnish"; wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; preStart = '' mkdir -p ${cfg.stateDir} chown -R varnish:varnish ${cfg.stateDir} @@ -49,8 +66,19 @@ with lib; postStop = '' rm -rf ${cfg.stateDir} ''; - serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish"; - serviceConfig.Type = "forking"; + serviceConfig = { + Type = "simple"; + PermissionsStartOnly = true; + ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}" + + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path"; + Restart = "always"; + RestartSec = "5s"; + User = "varnish"; + Group = "varnish"; + AmbientCapabilities = "cap_net_bind_service"; + NoNewPrivileges = true; + LimitNOFILE = 131072; + }; }; environment.systemPackages = [ pkgs.varnish ]; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index c207aab5de0a..4b57d9641f50 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c043884f8e0b..2434aa1654a6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -176,7 +176,7 @@ in { services.xserver.updateDbusEnvironment = true; - environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" + environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules" "${gnome3.glib_networking.out}/lib/gio/modules" "${gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix new file mode 100644 index 000000000000..d7bd2fc5eb0c --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/maxx.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.maxx; +in { + options.services.xserver.desktopManager.maxx = { + enable = mkEnableOption "MaXX desktop environment"; + }; + + config = mkIf (xcfg.enable && cfg.enable) { + environment.systemPackages = [ pkgs.maxx ]; + + services.xserver.desktopManager.session = [ + { name = "MaXX"; + start = '' + exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt + ''; + }]; + }; + + meta.maintainers = [ maintainers.gnidorah ]; +} diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index e25a8ae22823..43de746ab1f1 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -29,6 +29,7 @@ in extraPackages = mkOption { default = self: []; + defaultText = "self: []"; example = literalExample '' haskellPackages: [ haskellPackages.xmonad-contrib diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 638509e710be..3ce124d3da27 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -648,51 +648,11 @@ in services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb"; - system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" { - inherit (cfg) layout xkbDir; + system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" { + inherit (cfg) xkbModel layout xkbVariant xkbOptions; + nativeBuildInputs = [ pkgs.xkbvalidate ]; } '' - # We can use the default IFS here, because the layouts won't contain - # spaces or tabs and are ruled out by the sed expression below. - availableLayouts="$( - sed -n -e ':i /^! \(layout\|variant\) *$/ { - # Loop through all of the layouts/variants until we hit another ! at - # the start of the line or the line is empty ('t' branches only if - # the last substitution was successful, so if the line is empty the - # substition will fail). - :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl - }' "$xkbDir/rules/base.lst" | sort -u - )" - - layoutNotFound() { - echo >&2 - echo "The following layouts and variants are available:" >&2 - echo >&2 - - # While an output width of 80 is more desirable for small terminals, we - # really don't know the amount of columns of the terminal from within - # the builder. The content in $availableLayouts however is pretty - # large, so let's opt for a larger width here, because it will print a - # smaller amount of lines on modern KMS/framebuffer terminals and won't - # lose information even in smaller terminals (it only will look a bit - # ugly). - echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2 - - echo >&2 - echo "However, the keyboard layout definition in" \ - "\`services.xserver.layout' contains the layout \`$1', which" \ - "isn't a valid layout or variant." >&2 - echo >&2 - exit 1 - } - - # Again, we don't need to take care of IFS, see the comment for - # $availableLayouts. - for l in ''${layout//,/ }; do - if ! echo "$availableLayouts" | grep -qxF "$l"; then - layoutNotFound "$l" - fi - done - + validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" ''); diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index e9897cc01b6a..67cb2264e3f3 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -141,6 +141,7 @@ in system.build = mkOption { internal = true; default = {}; + type = types.attrs; description = '' Attribute set of derivations used to setup the system. ''; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f96dde153610..9d2cea3ad165 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -94,7 +94,7 @@ let checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute" - "LLMNR" "Domains" "Bridge" "Bond" + "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" ]) (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) @@ -103,6 +103,7 @@ let (assertValueOneOf "IPv4LL" boolValues) (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" boolValues) + (assertValueOneOf "MulticastDNS" boolValues) ]; checkAddress = checkUnitConfig "Address" [ @@ -141,6 +142,18 @@ let (assertValueOneOf "EmitTimezone" boolValues) ]; + # .network files have a [Link] section with different options than in .netlink files + checkNetworkLink = checkUnitConfig "Link" [ + (assertOnlyFields [ + "MACAddress" "MTUBytes" "ARP" "Unmanaged" + ]) + (assertMacAddress "MACAddress") + (assertByteFormat "MTUBytes") + (assertValueOneOf "ARP" boolValues) + (assertValueOneOf "Unmanaged" boolValues) + ]; + + commonNetworkOptions = { enable = mkOption { @@ -370,6 +383,18 @@ let ''; }; + linkConfig = mkOption { + default = {}; + example = { Unmanaged = true; }; + type = types.addCheck (types.attrsOf unitOption) checkNetworkLink; + description = '' + Each attribute in this set specifies an option in the + [Link] section of the unit. See + systemd.network + 5 for details. + ''; + }; + name = mkOption { type = types.nullOr types.str; default = null; @@ -580,6 +605,12 @@ let { inherit (def) enable; text = commonMatchText def + '' + ${optionalString (def.linkConfig != { }) '' + [Link] + ${attrsToSection def.linkConfig} + + ''} + [Network] ${attrsToSection def.networkConfig} ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)} diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 9a125dcb0aeb..1f4ab3eae07e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -301,6 +301,7 @@ mountFS() { *x-nixos.autoresize*) if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then echo "resizing $device..." + e2fsck -fp "$device" resize2fs "$device" fi ;; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 02870878c0f3..d6e3e3a87d01 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -207,7 +207,7 @@ let preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") - (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption + (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable # Don't include zram devices && !(hasPrefix "/dev/zram" sd.device) ) config.swapDevices); diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 00d6d370dd75..d12d0a06f444 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,7 +593,7 @@ in services.logind.extraConfig = mkOption { default = ""; type = types.lines; - example = "HandleLidSwitch=ignore"; + example = "IdleAction=lock"; description = '' Extra config options for systemd-logind. See man logind.conf for available options. @@ -659,16 +659,22 @@ in })); }; + systemd.user.paths = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); + description = "Definition of systemd per-user path units."; + }; + systemd.user.services = mkOption { default = {}; type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); description = "Definition of systemd per-user service units."; }; - systemd.user.timers = mkOption { + systemd.user.slices = mkOption { default = {}; - type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); - description = "Definition of systemd per-user timer units."; + type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig ] ); + description = "Definition of systemd per-user slice units."; }; systemd.user.sockets = mkOption { @@ -683,6 +689,12 @@ in description = "Definition of systemd per-user target units."; }; + systemd.user.timers = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); + description = "Definition of systemd per-user timer units."; + }; + systemd.additionalUpstreamSystemUnits = mkOption { default = [ ]; type = types.listOf types.str; @@ -799,12 +811,12 @@ in }; systemd.units = - mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers - // mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets + // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers // listToAttrs (map (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts) @@ -813,7 +825,9 @@ in in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); systemd.user.units = - mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.user.paths + // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.user.slices // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.user.targets // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index fd6e58cd5b43..7d43ba07ca57 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -20,8 +20,8 @@ let sources = map (x: x.source) etc'; targets = map (x: x.target) etc'; modes = map (x: x.mode) etc'; - uids = map (x: x.uid) etc'; - gids = map (x: x.gid) etc'; + users = map (x: x.user) etc'; + groups = map (x: x.group) etc'; }; in @@ -108,6 +108,26 @@ in ''; }; + user = mkOption { + default = "+${toString config.uid}"; + type = types.str; + description = '' + User name of created file. + Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Changing this option takes precedence over uid. + ''; + }; + + group = mkOption { + default = "+${toString config.gid}"; + type = types.str; + description = '' + Group name of created file. + Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Changing this option takes precedence over gid. + ''; + }; + }; config = { @@ -130,7 +150,7 @@ in system.build.etc = etc; - system.activationScripts.etc = stringAfter [ "stdio" ] + system.activationScripts.etc = stringAfter [ "users" "groups" ] '' # Set up the statically computed bits of /etc. echo "setting up /etc..." diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh index 60d4ba1301a3..1ca4c3046f0e 100644 --- a/nixos/modules/system/etc/make-etc.sh +++ b/nixos/modules/system/etc/make-etc.sh @@ -6,8 +6,8 @@ set -f sources_=($sources) targets_=($targets) modes_=($modes) -uids_=($uids) -gids_=($gids) +users_=($users) +groups_=($groups) set +f for ((i = 0; i < ${#targets_[@]}; i++)); do @@ -36,9 +36,9 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do fi if test "${modes_[$i]}" != symlink; then - echo "${modes_[$i]}" > $out/etc/$target.mode - echo "${uids_[$i]}" > $out/etc/$target.uid - echo "${gids_[$i]}" > $out/etc/$target.gid + echo "${modes_[$i]}" > $out/etc/$target.mode + echo "${users_[$i]}" > $out/etc/$target.uid + echo "${groups_[$i]}" > $out/etc/$target.gid fi fi diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index efda74161ff8..eed20065087f 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -108,6 +108,8 @@ sub link { my $uid = read_file("$_.uid"); chomp $uid; my $gid = read_file("$_.gid"); chomp $gid; copy "$static/$fn", "$target.tmp" or warn; + $uid = getpwnam $uid unless $uid =~ /^\+/; + $gid = getgrnam $gid unless $gid =~ /^\+/; chown int($uid), int($gid), "$target.tmp" or warn; chmod oct($mode), "$target.tmp" or warn; rename "$target.tmp", $target or warn; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2de3a3d8a330..f300091b11ee 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,11 +24,7 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; - zfs = kernel.zfsUnstable; - zfsUser = pkgs.zfsUnstable; - } else { + packages = { spl = kernel.spl; zfs = kernel.zfs; zfsUser = pkgs.zfs; @@ -62,19 +58,6 @@ in options = { boot.zfs = { - enableUnstable = mkOption { - type = types.bool; - default = false; - description = '' - Use the unstable zfs package. This might be an option, if the latest - kernel is not yet supported by a published release of ZFS. Enabling - this option will install a development version of ZFS on Linux. The - version will have already passed an extensive test suite, but it is - more likely to hit an undiscovered bug compared to running a released - version of ZFS on Linux. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix index a463cb803ade..7c2b9c05cf9a 100644 --- a/nixos/modules/testing/minimal-kernel.nix +++ b/nixos/modules/testing/minimal-kernel.nix @@ -6,7 +6,7 @@ let ); origKernel = pkgs.buildLinux { - inherit (pkgs.linux) src version; + inherit (pkgs.linux) src version stdenv; inherit configfile; allowImportFromDerivation = true; kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ]; diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix new file mode 100644 index 000000000000..22c82fc14f65 --- /dev/null +++ b/nixos/modules/virtualisation/azure-images.nix @@ -0,0 +1,5 @@ +let self = { + "16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd"; + + latest = self."16.09"; +}; in self diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix new file mode 100644 index 000000000000..0f0141abfb16 --- /dev/null +++ b/nixos/modules/virtualisation/cloud-image.nix @@ -0,0 +1,44 @@ +# Usage: +# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '' -A config.system.build.cloudImage + +{ config, lib, pkgs, ... }: + +with lib; + +{ + system.build.cloudImage = import ../../lib/make-disk-image.nix { + inherit pkgs lib config; + partitioned = true; + diskSize = 1 * 1024; + configFile = pkgs.writeText "configuration.nix" + '' + { config, lib, pkgs, ... }: + + with lib; + + { + imports = [ ]; + } + ''; + }; + + imports = [ ../profiles/qemu-guest.nix ]; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + boot = { + kernelParams = [ "console=ttyS0" ]; + loader.grub.device = "/dev/vda"; + loader.timeout = 0; + }; + + networking.hostName = mkDefault ""; + + services.openssh = { + enable = true; + permitRootLogin = "without-password"; + passwordAuthentication = mkDefault false; + }; + + services.cloud-init.enable = true; +} diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 6adb2c1681a2..001c6473a98e 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -120,7 +120,6 @@ let # Run systemd-nspawn without startup notification (we'll # wait for the container systemd to signal readiness). - EXIT_ON_REBOOT=1 \ exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" $extraFlags \ diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index c26cae06cd1d..5a8a0e27436f 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -94,6 +94,38 @@ in docker daemon. ''; }; + + autoPrune = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to periodically prune Docker resources. If enabled, a + systemd timer will run docker system prune -f + as specified by the dates option. + ''; + }; + + flags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--all" ]; + description = '' + Any additional flags passed to docker system prune. + ''; + }; + + dates = mkOption { + default = "weekly"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 7) of the time at + which the prune will occur. + ''; + }; + }; }; ###### implementation @@ -137,6 +169,22 @@ in SocketGroup = "docker"; }; }; + + + systemd.services.docker-prune = { + description = "Prune docker resources"; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + script = '' + ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags} + ''; + + startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates; + }; } ]); diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix new file mode 100644 index 000000000000..8a9bda1b60c2 --- /dev/null +++ b/nixos/modules/virtualisation/gce-images.nix @@ -0,0 +1,8 @@ +let self = { + "14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz"; + "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; + "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; + "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; + + latest = self."17.03"; +}; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 3943a62f8a45..4a8dadaa281d 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -3,13 +3,11 @@ with lib; let diskSize = 1024; # MB + gce = pkgs.google-compute-engine; in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ]; - # https://cloud.google.com/compute/docs/tutorials/building-images - networking.firewall.enable = mkDefault false; - system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' @@ -49,12 +47,18 @@ in services.openssh.permitRootLogin = "prohibit-password"; services.openssh.passwordAuthentication = mkDefault false; + # Use GCE udev rules for dynamic disk volumes + services.udev.packages = [ gce ]; + # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Rely on GCP's firewall instead + networking.firewall.enable = mkDefault false; + # Configure default metadata hostnames networking.extraHosts = '' 169.254.169.254 metadata.google.internal metadata @@ -64,6 +68,132 @@ in networking.usePredictableInterfaceNames = false; + # allow the google-accounts-daemon to manage users + users.mutableUsers = true; + # and allow users to sudo without password + security.sudo.enable = true; + security.sudo.extraConfig = '' + %google-sudoers ALL=(ALL:ALL) NOPASSWD:ALL + ''; + + # NOTE: google-accounts tries to write to /etc/sudoers.d but the folder doesn't exist + # FIXME: not such file or directory on dynamic SSH provisioning + systemd.services.google-accounts-daemon = { + description = "Google Compute Engine Accounts Daemon"; + # This daemon creates dynamic users + enable = config.users.mutableUsers; + after = [ + "network.target" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wantedBy = [ "multi-user.target" ]; + requires = ["network.target"]; + path = with pkgs; [ shadow ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_accounts_daemon --debug"; + }; + }; + + systemd.services.google-clock-skew-daemon = { + description = "Google Compute Engine Clock Skew Daemon"; + after = [ + "network.target" + "google-instance-setup.service" + "google-network-setup.service" + ]; + requires = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_clock_skew_daemon --debug"; + }; + }; + + systemd.services.google-instance-setup = { + description = "Google Compute Engine Instance Setup"; + after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"]; + before = ["sshd.service"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "sshd.service" "multi-user.target" ]; + path = with pkgs; [ ethtool ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_instance_setup --debug"; + Type = "oneshot"; + }; + }; + + systemd.services.google-ip-forwarding-daemon = { + description = "Google Compute Engine IP Forwarding Daemon"; + after = ["network.target" "google-instance-setup.service" "google-network-setup.service"]; + requires = ["network.target"]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ iproute ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug"; + }; + }; + + systemd.services.google-shutdown-scripts = { + description = "Google Compute Engine Shutdown Scripts"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown"; + Type = "oneshot"; + RemainAfterExit = true; + TimeoutStopSec = 0; + }; + }; + + systemd.services.google-network-setup = { + description = "Google Compute Engine Network Setup"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_network_setup --debug"; + KillMode = "process"; + Type = "oneshot"; + }; + }; + + systemd.services.google-startup-scripts = { + description = "Google Compute Engine Startup Scripts"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup"; + KillMode = "process"; + Type = "oneshot"; + }; + }; + + # TODO: remove this systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -113,9 +243,13 @@ in serviceConfig.StandardOutput = "journal+console"; }; - # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel + # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf boot.kernel.sysctl = { - # enables syn flood protection + # Turn on SYN-flood protections. Starting with 2.6.26, there is no loss + # of TCP functionality/features under normal conditions. When flood + # protections kick in under high unanswered-SYN load, the system + # should remain more stable, with a trade off of some loss of TCP + # functionality/features (e.g. TCP Window scaling). "net.ipv4.tcp_syncookies" = mkDefault "1"; # ignores source-routed packets @@ -169,6 +303,11 @@ in # randomizes addresses of mmap base, heap, stack and VDSO page "kernel.randomize_va_space" = mkDefault "2"; + # Reboot the machine soon after a kernel panic. + "kernel.panic" = mkDefault "10"; + + ## Not part of the original config + # provides protection from ToCToU races "fs.protected_hardlinks" = mkDefault "1"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 10a38b99f871..ade0ba531cfa 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -15,7 +15,7 @@ let ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' ${optionalString cfg.qemuOvmf '' - nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"] + nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"] ''} ${cfg.qemuVerbatimConfig} ''; @@ -102,9 +102,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; - [ libvirt netcat-openbsd ] - ++ optional cfg.enableKVM qemu_kvm; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ]; boot.kernelModules = [ "tun" ]; @@ -129,7 +127,6 @@ in { dnsmasq ebtables ] - ++ optional cfg.enableKVM qemu_kvm ++ optional vswitch.enable vswitch.package; preStart = '' @@ -155,31 +152,31 @@ in { # Copy generated qemu config to libvirt directory cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf - # libvirtd puts the full path of the emulator binary in the machine - # config file. But this path can unfortunately be garbage collected - # while still being used by the virtual machine. So update the - # emulator path on each startup to something valid (re-scan $PATH). - for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do - test -f "$file" || continue - # get (old) emulator path from config file - emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') - # get a (definitely) working emulator path by re-scanning $PATH - new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) - # write back - sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file" - done - ''; # */ + # 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/"} + + ${optionalString cfg.qemuOvmf '' + mkdir -p /run/libvirt/nix-ovmf + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/ + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/ + ''} + ''; serviceConfig = { Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone - Restart = "on-failure"; + Restart = "no"; }; + restartIfChanged = false; }; systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ coreutils libvirt gawk ]; + restartIfChanged = false; }; systemd.sockets.virtlogd = { @@ -191,6 +188,7 @@ in { systemd.services.virtlogd = { description = "Virtual machine log manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd"; + restartIfChanged = false; }; systemd.sockets.virtlockd = { @@ -202,6 +200,7 @@ in { systemd.services.virtlockd = { description = "Virtual machine lock manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd"; + restartIfChanged = false; }; }; } diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index ce1224a8f131..68930a0e3254 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -33,7 +33,7 @@ in serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; - environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*"; + environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*"; services.xserver = mkIf (!cfg.headless) { videoDrivers = mkOverride 50 [ "vmware" ]; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5239652d4075..c7656bc309c0 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -16,6 +16,7 @@ in virtualisation.xen.enable = mkOption { default = false; + type = types.bool; description = '' Setting this option enables the Xen hypervisor, a diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ecbd317cb9a4..54fd4a15ffcc 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,8 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" ] }: let @@ -19,10 +20,16 @@ let else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else set; + allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { + supportedSystems = supportedSystems ++ limitedSupportedSystems; + nixpkgs = nixpkgsSrc; + })) [ "unstable" ]; + in rec { nixos = removeMaintainers (import ./release.nix { - inherit stableBranch supportedSystems; + inherit stableBranch; + supportedSystems = supportedSystems ++ limitedSupportedSystems; nixpkgs = nixpkgsSrc; }); @@ -38,8 +45,11 @@ in rec { maintainers = [ pkgs.lib.maintainers.eelco ]; }; constituents = - let all = x: map (system: x.${system}) supportedSystems; in - [ nixos.channel + let + all = x: map (system: x.${system}) + (supportedSystems ++ limitedSupportedSystems); + in [ + nixos.channel (all nixos.dummy) (all nixos.manual) @@ -60,6 +70,7 @@ in rec { (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) (all nixos.tests.installer.simpleProvided) + (all nixos.tests.installer.simpleUefiSystemdBoot) (all nixos.tests.installer.swraid) (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) @@ -106,8 +117,8 @@ in rec { (all nixos.tests.xfce) nixpkgs.tarball - (all nixpkgs.emacs) - (all nixpkgs.jdk) + (all allSupportedNixpkgs.emacs) + (all allSupportedNixpkgs.jdk) ]; }); diff --git a/nixos/release.nix b/nixos/release.nix index 467e3bb8cd61..761a151e12e2 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" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] }: with import ../lib; @@ -239,6 +239,7 @@ in rec { tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; + tests.elk = callTest tests/elk.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; @@ -303,6 +304,7 @@ in rec { tests.simple = callTest tests/simple.nix {}; tests.slim = callTest tests/slim.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; + tests.snapper = callTest tests/snapper.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a6afe8a4b72a..a8090dc62eec 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -18,6 +18,9 @@ let ]; + # To ensure that we can rebuild the grub configuration on the nixos-rebuild + system.extraDependencies = with pkgs; [ stdenvNoCC ]; + ${optionalString (bootLoader == "grub") '' boot.loader.grub.version = ${toString grubVersion}; ${optionalString (grubVersion == 1) '' @@ -270,7 +273,7 @@ in { }; # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem - simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot" + simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot" { createPartitions = '' $machine->succeed( diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 55a0e7603882..c431c1a34174 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -49,6 +49,38 @@ let machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; + machine.services.xserver.displayManager.slim = { + enable = true; + + # Use a custom theme in order to get best OCR results + theme = pkgs.runCommand "slim-theme-ocr" { + nativeBuildInputs = [ pkgs.imagemagick ]; + } '' + mkdir "$out" + convert -size 1x1 xc:white "$out/background.jpg" + convert -size 200x100 xc:white "$out/panel.jpg" + cat > "$out/slim.theme" <start; + $router->start; + $server->start; # The router should have access to the server. $server->waitForUnit("network.target"); @@ -87,13 +101,18 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, $router->succeed("ping -c 1 client >&2"); # If we turn off NAT, the client shouldn't be able to reach the server. - $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre"); - $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post"); + $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"); $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); $client->fail("ping -c 1 server >&2"); # And make sure that reloading the NAT job works. - $router->succeed("systemctl restart ${unit}"); + $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1"); + # FIXME: this should not be necessary, but nat.service is not started because + # network.target is not triggered + # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) + ${lib.optionalString (!withFirewall) '' + $router->succeed("systemctl start nat.service"); + ''} $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); ''; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index c2beb5590ef7..7f7bc0f0b4fe 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -3,7 +3,7 @@ # generated virtual hosts config. import ./make-test.nix ({ pkgs, ...} : { - name = "jenkins"; + name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mbbx6spp ]; }; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f97544b5ea52..f3bd4c5915b0 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. nixpkgs.config.packageOverrides = superPkgs: { - fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs - (_attrs: rec { - version = "0.3.3"; - name = "fontconfig-penultimate-${version}"; - src = pkgs.fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; - }; - }); + fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { + version = "0.3.3"; + sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9"; + }; }; }; diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 1f4f43a26669..0ce37b55bb7b 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -13,8 +13,10 @@ let INSERT INTO sth (id) VALUES (1); INSERT INTO sth (id) VALUES (1); INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled ''; - make-postgresql-test = postgresql-name: postgresql-package: { + make-postgresql-test = postgresql-name: postgresql-package: makeTest { name = postgresql-name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ zagy ]; @@ -27,17 +29,23 @@ let }; testScript = '' + sub check_count { + my ($select, $nlines) = @_; + return 'test $(sudo -u postgres psql postgres -tAc "' . $select . '"|wc -l) -eq ' . $nlines; + } + $machine->start; $machine->waitForUnit("postgresql"); # postgresql should be available just after unit start - $machine->succeed("cat ${test-sql} | psql postgres"); + $machine->succeed("cat ${test-sql} | sudo -u postgres psql"); $machine->shutdown; # make sure that postgresql survive restart (bug #1735) sleep(2); $machine->start; $machine->waitForUnit("postgresql"); - $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3'); - $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5'); - $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4'); + $machine->fail(check_count("SELECT * FROM sth;", 3)); + $machine->succeed(check_count("SELECT * FROM sth;", 5)); + $machine->fail(check_count("SELECT * FROM sth;", 4)); + $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1)); $machine->shutdown; ''; diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix new file mode 100644 index 000000000000..74ec22fd3499 --- /dev/null +++ b/nixos/tests/snapper.nix @@ -0,0 +1,43 @@ +import ./make-test.nix ({ ... }: +{ + name = "snapper"; + + machine = { pkgs, lib, ... }: { + boot.initrd.postDeviceCommands = '' + ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb + ''; + + virtualisation.emptyDiskImages = [ 4096 ]; + + fileSystems = lib.mkVMOverride { + "/home" = { + device = "/dev/disk/by-label/aux"; + fsType = "btrfs"; + }; + }; + services.snapper.configs.home.subvolume = "/home"; + services.snapper.filters = "/nix"; + }; + + testScript = '' + $machine->succeed("btrfs subvolume create /home/.snapshots"); + + $machine->succeed("snapper -c home list"); + + $machine->succeed("snapper -c home create --description empty"); + + $machine->succeed("echo test > /home/file"); + $machine->succeed("snapper -c home create --description file"); + + $machine->succeed("snapper -c home status 1..2"); + + $machine->succeed("snapper -c home undochange 1..2"); + $machine->fail("ls /home/file"); + + $machine->succeed("snapper -c home delete 2"); + + $machine->succeed("systemctl --wait start snapper-timeline.service"); + + $machine->succeed("systemctl --wait start snapper-cleanup.service"); + ''; +}) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index cdccb11d8887..75be97a507d0 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -246,6 +246,10 @@ in { }; subtest "check manual configuration", sub { + # Remove the keys from automatic CA creation, to make sure the new + # generation doesn't use keys from before. + $server->succeed('rm -rf ${cfg.dataDir}/keys/* >&2'); + $server->succeed('${switchToNewServer} >&2'); $server->waitForUnit("taskserver.service"); $server->waitForOpenPort(${portStr}); diff --git a/nixos/tests/timezone.nix b/nixos/tests/timezone.nix new file mode 100644 index 000000000000..2204649a3fc4 --- /dev/null +++ b/nixos/tests/timezone.nix @@ -0,0 +1,45 @@ +{ + timezone-static = import ./make-test.nix ({ pkgs, ... }: { + name = "timezone-static"; + meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ]; + + machine.time.timeZone = "Europe/Amsterdam"; + + testScript = '' + $machine->waitForUnit("dbus.socket"); + $machine->fail("timedatectl set-timezone Asia/Tokyo"); + my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); + $dateResult[1] eq "1970-01-01 01:00:00\n" or die "Timezone seems to be wrong"; + ''; + }); + + timezone-imperative = import ./make-test.nix ({ pkgs, ... }: { + name = "timezone-imperative"; + meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ]; + + machine.time.timeZone = null; + + testScript = '' + $machine->waitForUnit("dbus.socket"); + + # Should default to UTC + my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); + print $dateResult[1]; + $dateResult[1] eq "1970-01-01 00:00:00\n" or die "Timezone seems to be wrong"; + + $machine->succeed("timedatectl set-timezone Asia/Tokyo"); + + # Adjustment should be taken into account + my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); + print $dateResult[1]; + $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone was not adjusted"; + + # Adjustment should persist across a reboot + $machine->shutdown; + $machine->waitForUnit("dbus.socket"); + my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); + print $dateResult[1]; + $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone adjustment was not persisted"; + ''; + }); +} diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index be4ea1fd6b66..57a969825bac 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec{ Core release, applying a series of patches, and then doing deterministic builds so anyone can check the downloads correspond to the source code. ''; - homepage = "https://bitcoinxt.software/"; + homepage = https://bitcoinxt.software/; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index ddbe7104f1d9..9fb7df9fecdc 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec{ parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = "http://www.bitcoin.org/"; + homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix new file mode 100644 index 000000000000..0136ab18ceac --- /dev/null +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -0,0 +1,24 @@ +{ lib, python2}: + +python2.pkgs.buildPythonApplication rec { + pname = "cryptop"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = python2.pkgs.fetchPypi { + inherit pname version; + sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; + }; + + propagatedBuildInputs = [ python2.pkgs.requests ]; + + # No tests in archive + doCheck = false; + + meta = { + homepage = https://github.com/huwwp/cryptop; + description = "Command line Cryptocurrency Portfolio"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix new file mode 100644 index 000000000000..51de4d202e84 --- /dev/null +++ b/pkgs/applications/altcoins/dapp.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper +, seth, git, solc, shellcheck, nodejs, hsevm }: + +stdenv.mkDerivation rec { + name = "dapp"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "dapp"; + rev = "v${version}"; + sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird"; + }; + + nativeBuildInputs = [makeWrapper shellcheck]; + buildPhase = "true"; + doCheck = true; + checkPhase = "make test"; + makeFlags = ["prefix=$(out)"]; + postInstall = let path = lib.makeBinPath [ + nodejs solc git seth hsevm + ]; in '' + wrapProgram "$out/bin/dapp" --prefix PATH : "${path}" + ''; + + meta = { + description = "Simple tool for creating Ethereum-based dapps"; + homepage = https://github.com/dapphub/dapp/; + maintainers = [stdenv.lib.maintainers.dbrock]; + license = lib.licenses.gpl3; + inherit version; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 22da4ed50b42..1fbabc338f2a 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -38,6 +38,9 @@ rec { ethabi = callPackage ./ethabi.nix { }; ethrun = callPackage ./ethrun.nix { }; seth = callPackage ./seth.nix { }; + dapp = callPackage ./dapp.nix { }; + + hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index e8a26365361d..a44dbbd62ce6 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages + preBuild = "unset AR"; + installPhase = '' mkdir -p $out/bin cp freicoin-qt $out/bin diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index b7585b2f109b..3687905ae57a 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Golang implementation of Ethereum Classic"; - homepage = "https://github.com/ethereumproject/go-ethereum"; + homepage = https://github.com/ethereumproject/go-ethereum; license = with lib.licenses; [ lgpl3 gpl3 ]; }; } diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 7f7c3f304c22..ce58984c8b8e 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -16,7 +16,7 @@ buildGoPackage rec { }; meta = { - homepage = "https://ethereum.github.io/go-ethereum/"; + homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; license = with lib.licenses; [ lgpl3 gpl3 ]; }; diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix index 1b2682f7d4c0..208a2d3915f0 100644 --- a/pkgs/applications/altcoins/hivemind.nix +++ b/pkgs/applications/altcoins/hivemind.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { into a blockchain so that Bitcoin-users can speculate in Prediction Markets. ''; - homepage = "https://bitcoinhivemind.com"; + homepage = https://bitcoinhivemind.com; maintainers = with maintainers; [ canndrew ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix new file mode 100644 index 000000000000..d68526e2cd9a --- /dev/null +++ b/pkgs/applications/altcoins/hsevm.nix @@ -0,0 +1,53 @@ +{ aeson, ansi-wl-pprint, base, base16-bytestring +, base64-bytestring, binary, brick, bytestring, containers +, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty +, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic +, process, QuickCheck, quickcheck-text, readline, rosezipper +, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text +, text-format, unordered-containers, vector, vty +, mkDerivation, fetchFromGitHub, lib +, ncurses, zlib, bzip2, solc +}: + +lib.overrideDerivation (mkDerivation rec { + pname = "hsevm"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "hsevm"; + rev = "v${version}"; + sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4"; + }; + + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + + postInstall = '' + rm -rf $out/{lib,share} + ''; + + extraLibraries = [ + aeson ansi-wl-pprint base base16-bytestring base64-bytestring + binary brick bytestring containers cryptonite data-dword deepseq + directory filepath ghci-pretty lens lens-aeson memory mtl + optparse-generic process QuickCheck quickcheck-text readline + rosezipper temporary text text-format unordered-containers vector + vty + ]; + executableHaskellDepends = [ + readline zlib bzip2 + ]; + testHaskellDepends = [ + base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck + tasty tasty-hunit tasty-quickcheck text vector + ]; + + homepage = https://github.com/dapphub/hsevm; + description = "Ethereum virtual machine evaluator"; + license = stdenv.lib.licenses.agpl3; + maintainers = [stdenv.lib.maintainers.dbrock]; +}) (attrs: { + buildInputs = attrs.buildInputs ++ [solc]; +}) diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 2723bf9dabdb..9efab9a8babb 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui @@ -42,7 +43,7 @@ stdenv.mkDerivation rec{ Memorycoin is based on the Bitcoin code, but with some key differences. ''; - homepage = "http://www.bitcoin.org/"; + homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 311836702122..e6ed05dd27f1 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index 0146bad6f86f..456ed41931cc 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -1,27 +1,27 @@ { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost -, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent +, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent , withGui }: let libsnark = callPackage ./libsnark { inherit boost openssl; }; librustzcash = callPackage ./librustzcash {}; in with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.8"; + version = "1.0.11"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; - rev = "f630519d865ce22a6cf72a29785f2a876902f8e1"; - sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv"; + rev = "v${version}"; + sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55"; }; enableParallelBuilding = true; buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib - miniupnpc protobuf libevent libsodium librustzcash ] + protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec{ meta = { description = "Peer-to-peer, anonymous electronic cash system"; - homepage = "https://z.cash/"; + homepage = https://z.cash/; maintainers = with maintainers; [ rht ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix index 4ce9a279d919..2b2094c84018 100644 --- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix +++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Rust-language assets for Zcash"; - homepage = "https://github.com/zcash/librustzcash"; + homepage = https://github.com/zcash/librustzcash; maintainers = with maintainers; [ rht ]; license = with licenses; [ mit asl20 ]; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix index c5a824cd17d3..303b3bc171ef 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimal Ate Pairing over Barreto-Naehrig Curves"; - homepage = "https://github.com/herumi/ate-pairing"; + 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 index 9dd3f6886c8f..be885493dcda 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/default.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "a C++ library for zkSNARK proofs"; - homepage = "https://github.com/zcash/libsnark"; + 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 index c92c113a27a9..a66ff128293e 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/mie.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/herumi/mie"; + 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 index c0b36ab93443..88d432fd1637 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; }; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; installPhase = '' mkdir -p $out/include @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JIT assembler for x86, x64"; - homepage = "https://github.com/herumi/xbyak"; + homepage = https://github.com/herumi/xbyak; maintainers = with maintainers; [ rht ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ddd34f1bfeb9..efb69d4c481f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -8,8 +8,8 @@ in stdenv.mkDerivation rec { version = "8"; src = fetchurl { - url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; - sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; + url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; + sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ]; @@ -24,7 +24,6 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://home.gna.org/a2jmidid; description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 6cb1ae6de719..a23af5b5caf8 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -3,13 +3,13 @@ , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.7.2"; +let version = "2.8.1"; in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; - sha256 = "1pakpi41k8yd780mfp0snhia6mmwjwxk9lcrq6gynimch8b8hfda"; + sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; }; # FIXME: This package does not support `distmp3', `eject', etc. diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 3b675cd9020b..022e33991f98 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { repositories.git = git://anongit.kde.org/amarok.git; description = "Popular music player for KDE"; license = "GPL"; - homepage = http://amarok.kde.org; + homepage = https://amarok.kde.org; inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c447863e1497..a1cca6ee1627 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.10"; + tag = "5.11"; in @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; - rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6"; - sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl"; + rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71"; + sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay"; }; buildInputs = diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 3840d06dd467..29d0241fa02f 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK2 client for MPD (Music player daemon)"; - homepage = "http://ario-player.sourceforge.net/"; + homepage = http://ario-player.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index e6addd6c4fdf..c482e44e7aa4 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./icon-names.diff ]; buildInputs = with gst_all_1; [ - glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf + glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ] ++ optional pulseaudioSupport libpulseaudio; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"' - '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"' - '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"') + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0 + --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index e3cef30ccdaa..deaa3f98e52e 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack +{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2 , makeWrapper }: let rpath = stdenv.lib.makeLibraryPath - [ libXmu libXt libX11 libXext libXxf86vm jack ]; + [ libXmu libXt libX11 libXext libXxf86vm libjack2 ]; in stdenv.mkDerivation rec { name = "baudline-${version}"; diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index af0d2bbd0e9c..c597e42eaa6d 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "2.0"; + version = "2.1.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas"; + sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 0241e38281b7..2401a6101566 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A audio/video loudness scanner implementing ITU-R BS.1770"; license = licenses.gpl2Plus; - homepage = "http://bs1770gain.sourceforge.net/"; + homepage = http://bs1770gain.sourceforge.net/; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 82a6d44f6436..f09791d9aa1f 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, vlc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools +, withQt5 ? true, 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. @@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.0.1"; + version = "2.1.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -44,24 +44,27 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { - owner = "CDrummond"; - repo = "cantata"; - rev = "v${version}"; - sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36"; + owner = "CDrummond"; + repo = "cantata"; + rev = "v${version}"; + sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh"; }; - buildInputs = - [ cmake vlc ] - ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] + buildInputs = [ vlc ] + ++ stdenv.lib.optional withQt4 qt4 + ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ stdenv.lib.optional withCdda cdparanoia - ++ stdenv.lib.optional withCddb libcddb - ++ stdenv.lib.optional withLame lame - ++ stdenv.lib.optional withMtp libmtp - ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + ++ stdenv.lib.optional withCdda cdparanoia + ++ stdenv.lib.optional withCddb libcddb + ++ stdenv.lib.optional withLame lame + ++ stdenv.lib.optional withMtp libmtp + ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 + ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") @@ -94,6 +97,6 @@ stdenv.mkDerivation rec { # Technically Cantata can run on Windows so if someone wants to # bother figuring that one out, be my guest. platforms = platforms.linux; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = with maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch deleted file mode 100644 index 4c17846b99df..000000000000 --- a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt ---- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600 -+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600 -@@ -158,6 +158,10 @@ - include_directories(${TAGLIB_INCLUDE_DIRS}) - include_directories(${QJSON_INCLUDE_DIRS}) - include_directories(${GSTREAMER_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) - include_directories(${GLIB_INCLUDE_DIRS}) - include_directories(${GLIBCONFIG_INCLUDE_DIRS}) - include_directories(${LIBXML_INCLUDE_DIRS}) diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch deleted file mode 100644 index 2240debd0e4a..000000000000 --- a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 -From: Chocobozzz -Date: Wed, 16 Jul 2014 15:57:25 +0200 -Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 - ---- - src/CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 650fa74..775b0a5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) - if(HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) - -- # Hack to get it to generate interfaces without namespaces - required -- # because otherwise org::freedesktop::UDisks and -- # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) -- - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES - dbus/org.freedesktop.MediaPlayer.player.xml -@@ -964,6 +959,10 @@ if(HAVE_DBUS) - - # DeviceKit DBUS interfaces - if(HAVE_DEVICEKIT) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml -+ PROPERTIES NO_NAMESPACE dbus/udisks) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml -+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES - dbus/org.freedesktop.UDisks.xml - dbus/udisks) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch new file mode 100644 index 000000000000..226536a13ba7 --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23070d9..83b6772 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" + optional_component(VISUALISATIONS ON "Visualisations") + + if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) +- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " +- "code must be compiled in") + elseif(CRYPTOPP_FOUND) + set(HAVE_CRYPTOPP ON) + set(HAVE_SPOTIFY_DOWNLOADER ON) +@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD) + endif(HAVE_BREAKPAD) + + if(HAVE_SPOTIFY_BLOB) +- add_subdirectory(ext/clementine-spotifyblob) + endif(HAVE_SPOTIFY_BLOB) + + if(HAVE_MOODBAR) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch index d41720c90215..344fc31d70dc 100644 --- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch @@ -1,25 +1,13 @@ -From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 4 May 2015 19:59:38 -0500 -Subject: [PATCH] Runtime selection of Spotify blob - ---- - src/internet/spotifyservice.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp -index 543744e..d987a36 100644 ---- a/src/internet/spotifyservice.cpp -+++ b/src/internet/spotifyservice.cpp -@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) +diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp +index 88c7383..6e0893c 100644 +--- a/src/internet/spotify/spotifyservice.cpp ++++ b/src/internet/spotify/spotifyservice.cpp +@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) system_blob_path_ = QCoreApplication::applicationDirPath() + - "/../PlugIns/clementine-spotifyblob"; + "/../PlugIns/clementine-spotifyblob"; #else - system_blob_path_ = QCoreApplication::applicationDirPath() + + system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") + - "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; + "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; #endif --- -2.3.6 - diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 78841da46c59..5b0d285f82d9 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base -, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist -, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig -, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp +, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf +, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: let withSpotify = config.clementine.spotify or false; @@ -10,31 +10,36 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - version = "1.2.3"; + version = "1.3.1"; exeName = "clementine"; src = fetchurl { - url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; - sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; + sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; }; patches = [ - ./clementine-1.2.1-include-paths.patch - ./clementine-dbus-namespace.patch ./clementine-spotify-blob.patch + # Required so as to avoid adding libspotify as a build dependency (as it is + # unfree and thus would prevent us from having a free package). + ./clementine-spotify-blob-remove-from-build.patch ]; buildInputs = [ boost cmake + chromaprint fftw gettext glew - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gvfs + libechonest liblastfm + libpulseaudio + pcre pkgconfig protobuf qca2 @@ -59,7 +64,7 @@ let -e 's,-Wno-unused-private-field,,g' ''; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = http://www.clementine-player.org; description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; @@ -71,7 +76,12 @@ let blob = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine - inherit patches src; + inherit src; + + patches = [ + ./clementine-spotify-blob.patch + ]; + buildInputs = buildInputs ++ [ libspotify ]; # Only build and install the Spotify blob preBuild = '' @@ -84,7 +94,7 @@ let ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = http://www.clementine-player.org; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. license = licenses.asl20; @@ -104,7 +114,7 @@ runCommand "clementine-${version}" dontPatchELF = true; dontStrip = true; meta = { - homepage = "http://www.clementine-player.org"; + homepage = http://www.clementine-player.org; description = "A multiplatform music player" + " (" + (optionalString withSpotify "with Spotify, ") + "with gstreamer plugins: " @@ -119,7 +129,7 @@ runCommand "clementine-${version}" mkdir -p $out/bin makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" mkdir -p $out/share for dir in applications icons kde4; do diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index babbcc51e402..4da2228c6c13 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -13,13 +13,11 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper pythonPackages.mpd2 ]; - buildPhase = '' - echo skipping build phase... - ''; + dontBuild = true; installPhase = '' DESTDIR=$out PREFIX=/ make install - wrapProgram $out/bin/clerk $out/bin/clerk \ + wrapProgram $out/bin/clerk \ --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}" ''; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index c9346248438b..633ba3832c2c 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ concatMap (a: a.deps) opts; + makeFlags = [ "LD=$(CC)" ]; + meta = with stdenv.lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 07f9e565c2a0..1552982cf1ad 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ultimate Music Player for GNU/Linux"; - homepage = "http://deadbeef.sourceforge.net/"; + homepage = http://deadbeef.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 871621d3bb1b..c6509b5f460e 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; + homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index bb317ca7a40e..740d6d8d7e0a 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; - homepage = "https://github.com/tidalcycles/Dirt"; + homepage = https://github.com/tidalcycles/Dirt; license = licenses.gpl3; maintainers = with maintainers; [ anderspapitto ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 5d4e19700d8d..9d157833c0d9 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-2016-06-26"; + name = "distrho-ports-unstable-2017-08-04"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "e3969853ec9ba897c50ac060f0167313e2a18b29"; - sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m"; + rev = "f591a1066cd3929536699bb516caa4b5efd9d025"; + sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9"; }; patchPhase = '' diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 7a2e2a6da45b..c42d290c5993 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An LV2 sample based drum plugin"; - homepage = http://www.drumgizmo.org; + homepage = https://www.drumgizmo.org; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e9186cd3242c..f9c9dc2faef0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { description = "View and edit tags for various audio files"; - homepage = "http://projects.gnome.org/easytag/"; + homepage = http://projects.gnome.org/easytag/; license = licenses.gpl2Plus; maintainers = with maintainers; [ fuuzetsu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index cb2e15bc5b23..889506deb768 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = "https://github.com/espeak-ng/espeak-ng"; + homepage = https://github.com/espeak-ng/espeak-ng; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 52e29e3da4c8..425b2b866a5a 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { #doCheck = true; # takes lots of time - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with stdenv.lib; { - homepage = http://xiph.org/flac/; + homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix new file mode 100644 index 000000000000..f0863bfc50b0 --- /dev/null +++ b/pkgs/applications/audio/flac123/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: + +stdenv.mkDerivation rec { + name = "flac123-${version}"; + version = "0.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz"; + sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ flac libao libogg popt ]; + + meta = with stdenv.lib; { + homepage = http://flac-tools.sourceforge.net/; + description = "A command-line program for playing FLAC audio files"; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 2ee03a3f3991..545e7c5047a9 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; - homepage = http://sourceforge.net/projects/fldigi/; + homepage = https://sourceforge.net/projects/fldigi/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 6b4913d30dca..f37b44f92317 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { improv. We leave mice and menus, and dive into our own process of making sound. - Freewheeling runs under Mac OS X and Linux, and is open source + Freewheeling runs under macOS and Linux, and is open source software, released under the GNU GPL license. '' ; - homepage = "http://freewheeling.sourceforge.net"; + homepage = http://freewheeling.sourceforge.net; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.sepi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 4f22ca62c1a8..a0a79785283c 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/game-music-emu/; + homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; 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 47b85af724a7..ba9bd0338f57 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -4,7 +4,7 @@ }: let - version = "4.3.0"; + version = "4.4.0"; deps = [ alsaLib @@ -46,7 +46,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb"; + sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc"; }; dontBuild = true; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 5a10d1262f4a..f49962450a09 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -61,7 +61,7 @@ python2Packages.buildPythonApplication rec { gPodder downloads and manages free audio and video content (podcasts) for you. Listen directly on your computer or on your mobile devices. ''; - homepage = "http://gpodder.org/"; + homepage = http://gpodder.org/; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ skeidel mic92 ]; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index c0a137d7de92..fae8d3e4b605 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = { - homepage = "http://das.nasophon.de/gtklick/"; + homepage = http://das.nasophon.de/gtklick/; description = "Simple metronome with an easy-to-use GTK interface"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index d72a2b13c42d..d56ac7534053 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical open-source sequencer,"; - homepage = http://www.iannix.org/; + homepage = https://www.iannix.org/; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 1b31eed0699a..f8febbe21781 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; meta = { - homepage = "http://das.nasophon.de/klick/"; + homepage = http://das.nasophon.de/klick/; description = "Advanced command-line metronome for JACK"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index ea182d73a5ba..01b450ab7dd0 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/"; + homepage = http://www.red-bean.com/decklin/lastfmsubmitd/; description = "An last.fm audio scrobbler and daemon"; }; } diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index 0e4e1a5a8a38..fff166493339 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec { ]; meta = { - homepage = "https://github.com/aszlig/LastWatch"; + homepage = https://github.com/aszlig/LastWatch; description = "An inotify-based last.fm audio scrobbler"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 5bd8068cd4cb..7ba5bcc4ac48 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux MultiMedia Studio"; - homepage = "http://lmms.sourceforge.net"; + homepage = http://lmms.sourceforge.net; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index d7cdfcf0d081..0bf7472ea115 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; }; + patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776 + buildInputs = [ chromaprint fftw flac libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mixxx.org; + homepage = https://mixxx.org; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch new file mode 100644 index 000000000000..ed9f4ee51437 --- /dev/null +++ b/pkgs/applications/audio/mixxx/sqlite.patch @@ -0,0 +1,13 @@ +diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h +--- old/src/library/trackcollection.h 2017-07-30 00:04:48.511029517 -0400 ++++ mixxx-2.0.0/src/library/trackcollection.h 2017-07-30 00:05:03.378699826 -0400 +@@ -34,8 +34,7 @@ + #include "library/dao/libraryhashdao.h" + + #ifdef __SQLITE3__ +-typedef struct sqlite3_context sqlite3_context; +-typedef struct Mem sqlite3_value; ++#include + #endif + + class TrackInfoObject; diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff index 3c48f6ad828f..9684e5bf8e43 100644 --- a/pkgs/applications/audio/monkeys-audio/buildfix.diff +++ b/pkgs/applications/audio/monkeys-audio/buildfix.diff @@ -1,7 +1,8 @@ -diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp ---- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp 2006-06-01 11:00:57.000000000 +0200 -+++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp 2012-01-05 14:51:47.000000000 +0100 -@@ -63,10 +63,10 @@ +diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp +index d349f4b..b00ec83 100644 +--- a/src/MACLib/APELink.cpp ++++ b/src/MACLib/APELink.cpp +@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename) if (pData != NULL) { // parse out the information @@ -16,7 +17,7 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b if (pHeader && pImageFile && pStartBlock && pFinishBlock) { -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename) // get the path char cImageFile[MAX_PATH + 1]; int nIndex = 0; @@ -25,3 +26,24 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n')) cImageFile[nIndex++] = *pImageCharacter++; cImageFile[nIndex] = 0; +diff --git a/src/Shared/All.h b/src/Shared/All.h +index 328addc..7730e89 100644 +--- a/src/Shared/All.h ++++ b/src/Shared/All.h +@@ -21,6 +21,8 @@ Global includes + #include + #endif + ++#include ++ + #ifdef _WIN32 + #include + #include +@@ -34,7 +36,6 @@ Global includes + #include "NoWindows.h" + #endif + +-#include + #include + #include + #include diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index d2ba955f9fb7..32d7bf787303 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.0.3"; + version = "3.2.0"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "1j8zrkvgs2f6jcqf1sn79afiirk5plfrkychlzcwqrxix293ngjr"; + sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30"; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/jaedb/Iris"; + homepage = https://github.com/jaedb/Iris; description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix index e9538273568a..b09db88bbcb0 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy-local-images/default.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-images"; + homepage = https://github.com/mopidy/mopidy-local-images; description = "Mopidy local library proxy extension for handling embedded album art"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix index 54501895e313..7aebc43dabbb 100644 --- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix +++ b/pkgs/applications/audio/mopidy-local-sqlite/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-sqlite"; + homepage = https://github.com/mopidy/mopidy-local-sqlite; description = "Mopidy SQLite local library extension"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 0fa9022f67bc..f2922e7eecf9 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - homepage = http://sourceforge.net/projects/mp3splt/; + homepage = https://sourceforge.net/projects/mp3splt/; license = licenses.gpl2; maintainers = [ maintainers.bosu ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 59012432caf6..37717babce4a 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.23.8"; + name = "mpg123-1.25.4"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy"; + sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index fff3582f7dfb..b361e6c33ae4 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '4d' SConstruct sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp + sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp ''; @@ -27,10 +28,11 @@ stdenv.mkDerivation rec { scons $sconsFlags "prefix=$out" install ''; - meta = { - homepage = http://klingt.org/~tim/nova-filters/; + meta = with stdenv.lib; { description = "LADSPA plugins based on filters of nova"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + homepage = http://klingt.org/~tim/nova-filters/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 7cce08e733d8..f21c171ef609 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dialog for the PulseAudio sound server. ''; - homepage = "http://freedesktop.org/software/pulseaudio/paprefs/"; + homepage = http://freedesktop.org/software/pulseaudio/paprefs/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f218767c55ef..69db9d74ee34 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { easily control the volume of all clients, sinks, etc. ''; - homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; + homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 7cd244c9ea4f..8b7c2121bd79 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake puredata ]; - patchPhase = '' + preBuild = '' + export LD=$CXX cd src/ for i in ${puredata}/include/pd/*; do ln -s $i . diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 87f79583c3b0..7dc3e00ebf7b 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; - homepage = "http://6xq.net/projects/pianobar/"; + homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version maintainers = with maintainers; [ eduarrrd ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 886a77bb714a..66f68c066c88 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication { doCheck = false; meta = with stdenv.lib; { - homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; + homepage = http://musicbrainz.org/doc/MusicBrainz_Picard; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index ced5262f5d25..5cfbb7bf5a48 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI PulseAudio Volume Control"; - homepage = "http://github.com/falconindy/ponymix"; + homepage = https://github.com/falconindy/ponymix; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 764ee629dbf6..7b103286fe27 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Music Visualizer"; - homepage = "http://projectm.sourceforge.net/"; + homepage = http://projectm.sourceforge.net/; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fa582d852157..2e6d61b693de 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -75,6 +75,6 @@ in buildPythonApplication { ''; maintainers = [ stdenv.lib.maintainers.coroa ]; - homepage = http://code.google.com/p/quodlibet/; + homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 91e8f1be6ece..d02c551be8af 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,36 +1,35 @@ -{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }: +{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: +# To use the full release version: +# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version +# for your machine to some stable location. +# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. +# Note: Renoise creates an individual build for each license which screws somewhat with the +# use of functions like requireFile as the hash will be different for every user. +let fileversion = "3_1_0"; +in stdenv.mkDerivation rec { name = "renoise"; - buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; src = if stdenv.system == "x86_64-linux" then - if demo then + if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; - sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg"; + url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2"; + sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else - requireFile { - url = "http://backstage.renoise.com/frontend/app/index.html#/login"; - name = "rns_3_0_1_linux_x86_64.tar.gz"; - sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd"; - } + releasePath else if stdenv.system == "i686-linux" then - if demo then + if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; - sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58"; + url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2"; + sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; } else - requireFile { - url = "http://backstage.renoise.com/frontend/app/index.html#/login"; - name = "rns_3_0_1_reg_x86.tar.gz"; - sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; - } - else throw "platform is not suppored by Renoise"; + releasePath + else throw "Platform is not supported by Renoise"; installPhase = '' cp -r Resources $out diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 1a448c74b477..2b2fd161ede3 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Music tracker application, free reimplementation of Impulse Tracker"; - homepage = "http://schismtracker.org/"; + homepage = http://schismtracker.org/; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index eafa0980b4b2..ebeef301e103 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal loop based midi sequencer"; - homepage = "http://www.filter24.org/seq24"; + homepage = http://www.filter24.org/seq24; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu nckx ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 2acafb0be636..9f8ad3e649b6 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -62,7 +62,7 @@ in buildPythonApplication rec { - Commandline control - Available in 24 languages ''; - homepage = "http://www.nongnu.org/sonata/"; + homepage = http://www.nongnu.org/sonata/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.rvl ]; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index e4d9541673a6..bf4d96c6fc4e 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; version = "${version}"; - homepage = "http://essej.net/sooperlooper/index.html"; + homepage = http://essej.net/sooperlooper/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 02a97dde4e24..ba550580cba5 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes - makeWrapper gnome3.dconf + makeWrapper (stdenv.lib.getLib gnome3.dconf) 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-libav @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { wrapProgram "$f" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done ''; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 266e221649e4..ad0f7ee14c5a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,8 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.57.474.gca9c9538-30"; + # Be careful not to pick the testing version. + version = "1.0.49.125.g72ee7853-111"; deps = [ alsaLib @@ -53,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 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437"; + sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index fa2b54d0e8a1..19386b477942 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; version = "${version}"; - homepage = "http://shibatch.sourceforge.net/"; + homepage = http://shibatch.sourceforge.net/; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = with platforms; [ linux ] ; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index d7072e961635..5e26b6c1cdb8 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "svox-${version}"; - version = "2016-10-20"; + version = "2017-07-18"; src = fetchgit { url = "https://android.googlesource.com/platform/external/svox"; - rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d"; - sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g"; + rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb"; + sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r"; }; postPatch = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Text-to-speech engine"; - homepage = "https://android.googlesource.com/platform/external/svox"; + homepage = https://android.googlesource.com/platform/external/svox; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index ca9f514eace1..2787c65fc547 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-source music player"; - homepage = "http://tomahawk-player.org/"; + homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.aszlig ]; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index 1008d3e8e983..ca6d6240688a 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # taken from the debian yasr package meta = { - homepage = "http://yasr.sourceforge.net"; + homepage = http://yasr.sourceforge.net; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 54d07e71f42a..672237a8462f 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig mpd_clientlib openssl ]; meta = { - homepage = "http://www.ympd.org"; + homepage = http://www.ympd.org; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 42fe3e34cd42..52b9a57c00b2 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8"; + sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 3bfee48b8cd3..e840c6eeda0a 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An online/offline backup solution"; - homepage = "http://www.crashplan.org"; + homepage = http://www.crashplan.org; license = licenses.unfree; maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; }; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index d54fb455fcb1..920e5ba9abd2 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -14,7 +14,7 @@ let }; in mkDerivation rec { - name = "sddm-unwrapped-${version}"; + name = "sddm-${version}"; src = fetchFromGitHub { owner = "sddm"; @@ -36,11 +36,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau pam systemd - ]; - - propagatedBuildInputs = [ - qtbase qtdeclarative + libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd ]; cmakeFlags = [ @@ -65,7 +61,7 @@ in mkDerivation rec { meta = with lib; { description = "QML based X11 display manager"; - homepage = "https://github.com/sddm/sddm"; + homepage = https://github.com/sddm/sddm; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ttuegel ]; }; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index a46b52436a37..214b435429ae 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = "http://aewan.sourceforge.net/"; + homepage = http://aewan.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/common.nix similarity index 74% rename from pkgs/applications/editors/android-studio/default.nix rename to pkgs/applications/editors/android-studio/common.nix index 0ba89099eb3d..360d373f0707 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,3 +1,4 @@ +{ pname, version, build, sha256Hash, meta }: { bash , buildFHSUserEnv , coreutils @@ -32,12 +33,14 @@ }: let - - version = "2.3.3.0"; - build = "162.4069837"; - androidStudio = stdenv.mkDerivation { - name = "android-studio"; + name = "${pname}"; + + src = fetchurl { + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + sha256 = sha256Hash; + }; + buildInputs = [ makeWrapper unzip @@ -96,32 +99,22 @@ let --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} ''; - src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; - }; - meta = with stdenv.lib; { - description = "The Official IDE for Android"; - homepage = https://developer.android.com/studio/index.html; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; - }; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSUserEnv { - name = "android-studio-fhs-env"; + name = "${pname}-fhs-env"; }; -in writeTextFile { - name = "android-studio-${version}"; - destination = "/bin/android-studio"; - executable = true; - text = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh - ''; -} +in + writeTextFile { + name = "${pname}-${version}"; + destination = "/bin/${pname}"; + executable = true; + text = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh + ''; + } // { inherit meta; } diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix new file mode 100644 index 000000000000..471f78f0c072 --- /dev/null +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -0,0 +1,40 @@ +{ stdenv, callPackage, fetchurl, makeFontsConf }: +let + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; +in rec { + stable = mkStudio rec { + pname = "android-studio"; + version = "2.3.3.0"; + build = "162.4069837"; + sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; + + meta = with stdenv.lib; { + description = "The Official IDE for Android (stable version)"; + longDescription = '' + Android Studio is the official IDE for Android app development, based on + IntelliJ IDEA. + ''; + homepage = https://developer.android.com/studio/index.html; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; + }; + }; + + preview = mkStudio rec { + pname = "android-studio-preview"; + version = "3.0.0.10"; # "Android Studio 3.0 Beta 2" + build = "171.4263559"; + sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w"; + + meta = stable.meta // { + description = "The Official IDE for Android (preview version)"; + homepage = https://developer.android.com/studio/preview/index.html; + maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; + }; + }; +} diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 15230a7a0000..9945fd53719b 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Animated sprite editor & pixel art tool"; - homepage = "http://www.aseprite.org/"; + homepage = https://www.aseprite.org/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 39fe8fcb77e6..e44d919ece6b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.18.0"; + version = "1.19.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6"; + sha256 = "0cms0zgxlzrm0sdqm97qdvrmvjcdcrbqi3bw66xabgx365pkry7z"; name = "${name}.deb"; }; @@ -32,7 +32,13 @@ stdenv.mkDerivation rec { --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node + rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git + find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; + + paxmark m $out/share/atom/atom + paxmark m $out/share/atom/resources/app/apm/bin/node ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 0f6d00ab40c5..a3b4193edc6f 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,16 +106,16 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.6.0.201511291145"; + version = "2.7.0.201705171641"; srcFeature = fetchurl { url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b"; + sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9"; }; srcPlugin = fetchurl { - url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4"; + url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h"; }; meta = with stdenv.lib; { @@ -129,16 +129,16 @@ rec { autodetect-encoding = buildEclipsePlugin rec { name = "autodetect-encoding-${version}"; - version = "1.8.3.201610171338"; + version = "1.8.4.201708052053"; srcFeature = fetchurl { url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar"; - sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f"; + sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c"; }; srcPlugin = fetchurl { url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar"; - sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y"; + sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im"; }; meta = with stdenv.lib; { @@ -194,12 +194,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "7.3.0.201612142232"; + version = "8.0.0.201707161819"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2"; }; meta = with stdenv.lib; { @@ -416,7 +416,7 @@ rec { }; meta = with stdenv.lib; { - homepage = "http://scala-ide.org/"; + homepage = http://scala-ide.org/; description = "The Scala IDE for Eclipse"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix index 556bf83fab72..44116fbac0c1 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://savannah.nongnu.org/projects/bbdb/"; + homepage = http://savannah.nongnu.org/projects/bbdb/; description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3"; license = "GPL"; }; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index ed96e6892833..0ab11b5bf204 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://bbdb.sourceforge.net/"; + homepage = http://bbdb.sourceforge.net/; description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs"; license = "GPL"; }; diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 56ba5ba9710b..673b590f56eb 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { building, packaging and more. Cask can also be used to manage dependencies for your local Emacs configuration. ''; - homepage = "https://github.com/cask/cask"; + homepage = https://github.com/cask/cask; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.jgeerds ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 98b8282b999d..e605801fa802 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar"; - sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34"; + url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar"; + sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.90.2"; + version = "11.91.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar"; - sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6"; + url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar"; + sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3"; }; packageRequires = []; meta = { @@ -319,14 +319,15 @@ license = lib.licenses.free; }; }) {}; - cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "cobol-mode"; version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; license = lib.licenses.free; @@ -360,10 +361,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.3.tar"; - sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap"; + url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; + sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; }; packageRequires = [ emacs ]; meta = { @@ -371,6 +372,20 @@ license = lib.licenses.free; }; }) {}; + company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "company-ebdb"; + version = "1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-ebdb-1.el"; + sha256 = "1awriwvjpf9k2r6hzawai5kxz28j40zk9fvpb946kd5yj0hxr9nc"; + }; + packageRequires = [ company ebdb ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company-ebdb.html"; + license = lib.licenses.free; + }; + }) {}; company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }: elpaBuild { pname = "company-math"; @@ -413,6 +428,20 @@ license = lib.licenses.free; }; }) {}; + counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }: + elpaBuild { + pname = "counsel-ebdb"; + version = "1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el"; + sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis"; + }; + packageRequires = [ ebdb ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; version = "1.3.4"; @@ -523,10 +552,10 @@ dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; - version = "0.12.8"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dict-tree-0.12.8.el"; - sha256 = "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5"; + url = "https://elpa.gnu.org/packages/dict-tree-0.14.el"; + sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq"; }; packageRequires = [ heap tNFA trie ]; meta = { @@ -642,6 +671,48 @@ license = lib.licenses.free; }; }) {}; + ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "ebdb"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-0.2.tar"; + sha256 = "177qrjpdg14dpip2cn18csnlidv5f8cj3xpayz6jlpbfqzyfx8bi"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb.html"; + license = lib.licenses.free; + }; + }) {}; + ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: + elpaBuild { + pname = "ebdb-gnorb"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; + sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i"; + }; + packageRequires = [ ebdb gnorb ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; + license = lib.licenses.free; + }; + }) {}; + ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: + elpaBuild { + pname = "ebdb-i18n-chn"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.0.1.el"; + sha256 = "1g84xllw2dz6lhzschkyflqpsh3xx167161y6vjzq6yqkfy3gh1r"; + }; + packageRequires = [ ebdb pyim ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; + license = lib.licenses.free; + }; + }) {}; ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ediprolog"; version = "1.2"; @@ -751,10 +822,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.14.tar"; - sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx"; + url = "https://elpa.gnu.org/packages/exwm-0.15.tar"; + sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg"; }; packageRequires = [ xelb ]; meta = { @@ -821,10 +892,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.3.1.tar"; - sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8"; + url = "https://elpa.gnu.org/packages/gited-0.3.3.tar"; + sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -875,10 +946,10 @@ }) {}; heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "heap"; - version = "0.3"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/heap-0.3.el"; - sha256 = "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6"; + url = "https://elpa.gnu.org/packages/heap-0.5.el"; + sha256 = "13qv0w3fi87c85jcy7lv359r6rpsgnp5zzs2f2zq4dl3540wzrxg"; }; packageRequires = []; meta = { @@ -886,6 +957,20 @@ license = lib.licenses.free; }; }) {}; + helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }: + elpaBuild { + pname = "helm-ebdb"; + version = "1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/helm-ebdb-1.el"; + sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63"; + }; + packageRequires = [ ebdb helm ]; + meta = { + homepage = "https://elpa.gnu.org/packages/helm-ebdb.html"; + license = lib.licenses.free; + }; + }) {}; highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "highlight-escape-sequences"; @@ -929,10 +1014,10 @@ hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "hydra"; - version = "0.13.5"; + version = "0.14.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar"; - sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668"; + url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar"; + sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb"; }; packageRequires = [ cl-lib ]; meta = { @@ -1022,10 +1107,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20170116"; + version = "20170721"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar"; - sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk"; + url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar"; + sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1445,10 +1530,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170703"; + version = "20170821"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170703.tar"; - sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s"; + url = "https://elpa.gnu.org/packages/org-20170821.tar"; + sha256 = "13214dfm6ixypsl0mj1wrdcs42w1qn5ig8m5sb6ih697i2kbxkgg"; }; packageRequires = []; meta = { @@ -1472,10 +1557,10 @@ other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el"; - sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv"; + url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el"; + sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i"; }; packageRequires = [ emacs ]; meta = { @@ -1578,10 +1663,10 @@ }) {}; queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "queue"; - version = "0.1.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/queue-0.1.1.el"; - sha256 = "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391"; + url = "https://elpa.gnu.org/packages/queue-0.2.el"; + sha256 = "0cx2848sqnnkkr4zisvqadzxngjyhmb36mh0q3if7q19yjjhmrkb"; }; packageRequires = []; meta = { @@ -1602,6 +1687,32 @@ license = lib.licenses.free; }; }) {}; + rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "rcirc-color"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el"; + sha256 = "1ya4agh63x60lv8qzrjrng02dnrc70ci0s05b800iq71k71ss3dl"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rcirc-color.html"; + license = lib.licenses.free; + }; + }) {}; + rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "rcirc-menu"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el"; + sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rcirc-menu.html"; + license = lib.licenses.free; + }; + }) {}; realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: elpaBuild { pname = "realgud"; @@ -1784,10 +1895,10 @@ }) {}; sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sokoban"; - version = "1.4"; + version = "1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.tar"; - sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar"; + sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip"; }; packageRequires = []; meta = { @@ -1957,10 +2068,10 @@ }) {}; trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild { pname = "trie"; - version = "0.2.6"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/trie-0.2.6.el"; - sha256 = "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii"; + url = "https://elpa.gnu.org/packages/trie-0.4.el"; + sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw"; }; packageRequires = [ heap tNFA ]; meta = { @@ -1997,10 +2108,10 @@ url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }: elpaBuild { pname = "url-http-ntlm"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.3.el"; - sha256 = "01ivfcxrxiqs8dlqg4s3q17y4mxx0kpin60fkwrs18pca4hni203"; + url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el"; + sha256 = "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98"; }; packageRequires = [ cl-lib ntlm ]; meta = { @@ -2114,6 +2225,19 @@ license = lib.licenses.free; }; }) {}; + which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "which-key"; + version = "3.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar"; + sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/which-key.html"; + license = lib.licenses.free; + }; + }) {}; windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "windresize"; version = "0.1"; @@ -2130,10 +2254,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar"; - sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r"; + url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar"; + sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2197,10 +2321,10 @@ yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; - version = "0.11.0"; + version = "0.12.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar"; - sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y"; + url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar"; + sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9849b65c8c52..9585f3278211 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -23,7 +23,7 @@ clangStdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/Golevka/emacs-clang-complete-async"; + homepage = https://github.com/Golevka/emacs-clang-complete-async; description = "An emacs plugin to complete C and C++ code using libclang"; license = clangStdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix index 84a52d169a3b..463d7fc7e159 100644 --- a/pkgs/applications/editors/emacs-modes/erlang/default.nix +++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { # emacs highlighting */ meta = with stdenv.lib; { - homepage = "http://github.com/erlang/otp"; + homepage = https://github.com/erlang/otp; description = "Erlang mode for Emacs"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix index a2c73907115c..ce335a5d4827 100644 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs Speaks Statistics"; - homepage = "http://ess.r-project.org/"; + homepage = http://ess.r-project.org/; license = stdenv.lib.licenses.gpl2Plus; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix index c1291126a1e9..ce5522571339 100644 --- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix +++ b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.graphviz.org/"; + homepage = http://www.graphviz.org/; description = "An emacs mode for the DOT Language, used by graphviz"; }; } diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index df34a47a6b3c..6f998300290a 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { installCheckTarget = "check"; meta = { - homepage = "http://github.com/haskell/haskell-mode"; + homepage = https://github.com/haskell/haskell-mode; description = "Haskell mode for Emacs"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index d70b9955c982..11ccff3df016 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; meta = { - homepage = "http://www.emacswiki.org/emacs/Icicles"; + homepage = http://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix index e90d6cf210d7..05ddfbf6c16d 100644 --- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix +++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://elpa.gnu.org/packages/let-alist.html"; + homepage = http://elpa.gnu.org/packages/let-alist.html; description = "Easily let-bind values of an assoc-list by their names"; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 708713e81812..694013823c30 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -82,6 +82,27 @@ license = lib.licenses.free; }; }) {}; + a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "a"; + version = "20170720.553"; + src = fetchFromGitHub { + owner = "plexus"; + repo = "a.el"; + rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361"; + sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a"; + sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886"; + name = "a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/a"; + license = lib.licenses.free; + }; + }) {}; aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: melpaBuild { pname = "aa-edit-mode"; @@ -148,12 +169,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "20160420.512"; + version = "20170808.645"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -738,8 +759,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; - sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; + rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575"; + sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -755,12 +776,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170612.2134"; + version = "20170814.2227"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; - sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; + rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575"; + sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -801,8 +822,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -860,12 +881,12 @@ ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "ac-sly"; - version = "20150421.1322"; + version = "20170728.327"; src = fetchFromGitHub { owner = "qoocku"; repo = "ac-sly"; - rev = "b37a1ecfaab10a6d81c6d894417176d3bb4c5285"; - sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a"; + rev = "bf69c687c4ecf1994349d20c182e9b567399912e"; + sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly"; @@ -923,12 +944,12 @@ ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-buffer"; - version = "20160229.1458"; + version = "20170717.1148"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-buffer"; - rev = "9224e279a53fba06ed5561e22bf89ab94f74b9e7"; - sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4"; + rev = "9b1bb1a817c97cfa3853cc24474bd13e641f560d"; + sha256 = "1qlm025jhxqsb5xcp1mcpm4djlah9xnsw3m26cfrk686b17x8l4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer"; @@ -986,12 +1007,12 @@ ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-zap"; - version = "20150330.1342"; + version = "20170717.1149"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-zap"; - rev = "c60af83a857955b68c568c274a3c80cbe93f3150"; - sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4"; + rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8"; + sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap"; @@ -1074,8 +1095,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; - sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; + rev = "15ee28a9dcf025f30626313ebd376c0586013c8e"; + sha256 = "187j3ixxrxkbja8xy7xgxpsx0ngwmn55gw0rnvlpj2pyz8vl192q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1091,12 +1112,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20170421.428"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c"; - sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw"; + rev = "6aaf1e634414e7485b47ff94aac6c34588f2a371"; + sha256 = "1dmb4q1xgf5mk4riihk2mmn7k182y9j1amcr8m2dmdw0hrgvsfcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1109,26 +1130,6 @@ license = lib.licenses.free; }; }) {}; - achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }: - melpaBuild { - pname = "achievements"; - version = "20150530.1126"; - src = fetchhg { - url = "https://bitbucket.com/gvol/emacs-achievements"; - rev = "5b4b7b6816aa"; - sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/achievements"; - sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr"; - name = "achievements"; - }; - packageRequires = [ keyfreq ]; - meta = { - homepage = "https://melpa.org/#/achievements"; - license = lib.licenses.free; - }; - }) {}; ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }: melpaBuild { pname = "ack-menu"; @@ -1178,8 +1179,8 @@ src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; - sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; + rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e"; + sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1300,12 +1301,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170420.1424"; + version = "20170712.1549"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "2718190a0202aa4ab02b1f1f3d6ba7b996b69d6d"; - sha256 = "1j3l7p3rnlax82jrdrjld1a26gk7cg002jcaj7677fhy261vxmib"; + rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5"; + sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1428,8 +1429,8 @@ src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be"; - sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7"; + rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e"; + sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1466,12 +1467,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170614.218"; + version = "20170803.414"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; - sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; + rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57"; + sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1487,12 +1488,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170629.2153"; + version = "20170803.1852"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "24f2495ab209f8f00b7883285637e207b6f07201"; - sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; + rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f"; + sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1592,12 +1593,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170703.112"; + version = "20170817.642"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "f155ce7e6984d8fe11831cd8a9f89828f5c5be43"; - sha256 = "1860ia7ld566f2z2pskvyi0cnfl20frszi4w5281px6y2c8g4zxw"; + rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704"; + sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1631,6 +1632,27 @@ license = lib.licenses.free; }; }) {}; + all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons-gnus"; + version = "20170726.619"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "all-the-icons-gnus"; + rev = "45560293e42d02c17c332894f3764dd624d25444"; + sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; + sha256 = "0vdqhpa49p8vzbad426gl0dvniapyk73kbscvjv7mdl4bwhcr309"; + name = "all-the-icons-gnus"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons-gnus"; + license = lib.licenses.free; + }; + }) {}; all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-ivy"; @@ -1745,6 +1767,27 @@ license = lib.licenses.free; }; }) {}; + amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "amx"; + version = "20170810.1842"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "amx"; + rev = "04ac50cb85d27d885b083258a43533d4ae78c08b"; + sha256 = "1lwx5230if67a3ixpvc1951wciwmk68fnq7c0j66qfpgmggzymbs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; + sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; + name = "amx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/amx"; + license = lib.licenses.free; + }; + }) {}; anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; @@ -1752,8 +1795,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077"; - sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p"; + rev = "0f9576791b86e0b315447e6823b3a7db131cd826"; + sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2247,27 +2290,6 @@ license = lib.licenses.free; }; }) {}; - anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }: - melpaBuild { - pname = "anything-project"; - version = "20141024.227"; - src = fetchFromGitHub { - owner = "imakado"; - repo = "anything-project"; - rev = "9f6f04bc1911474e97e99faf52e204cf159add83"; - sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e842d55882ec4d689d279fb80490db60a1f32fd6/recipes/anything-project"; - sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr"; - name = "anything-project"; - }; - packageRequires = [ anything imakado ]; - meta = { - homepage = "https://melpa.org/#/anything-project"; - license = lib.licenses.free; - }; - }) {}; anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: melpaBuild { pname = "anything-prosjekt"; @@ -2334,12 +2356,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20170419.152"; + version = "20170708.1834"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "5af52ef940493d3d5acb56fc6372004ca48f75ca"; - sha256 = "1n96n45ajx12ksnn8ij44b2jbcyvcki9k834ix96cwm1fcr553vg"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -2416,12 +2438,12 @@ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apache-mode"; - version = "20170407.1140"; + version = "20170711.913"; src = fetchFromGitHub { owner = "zonuexe"; repo = "apache-mode"; - rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf"; - sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; @@ -2479,12 +2501,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20170506.2356"; + version = "20170814.1842"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "8b60f9e9082583aa537369499506c70f192467ab"; - sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk"; + rev = "1a3fff7a0265d1d13d6854b45e0c5ebe68a802de"; + sha256 = "0pg67nlmdpfqlhljggm5id5pmddh8p6slgpwsqh1pmfqs328j5hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2583,12 +2605,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170418.1352"; + version = "20170726.1123"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "0d918da74a7a225fe5a586e26f5d834e579c5323"; - sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw"; + rev = "4137ad1eed3fc2fe48c122e636f83580d1d04dd9"; + sha256 = "1ydxwlv3v2whl4k77shlyjk0yyrm4cr6src9rsbzvw6in5cm483f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2620,22 +2642,22 @@ license = lib.licenses.free; }; }) {}; - arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; - version = "20170506.1005"; + version = "20170730.621"; src = fetchFromGitHub { owner = "brotzeitmacher"; repo = "arch-packer"; - rev = "e195c4f30da2a756f6e14715f436ff22826b5e82"; - sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl"; + rev = "940e96f7d357c6570b675a0f942181c787f1bfd7"; + sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer"; sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72"; name = "arch-packer"; }; - packageRequires = [ async emacs s ]; + packageRequires = [ async dash emacs s ]; meta = { homepage = "https://melpa.org/#/arch-packer"; license = lib.licenses.free; @@ -2831,12 +2853,12 @@ asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "asn1-mode"; - version = "20160626.2240"; + version = "20170728.1926"; src = fetchFromGitHub { owner = "kawabata"; repo = "asn1-mode"; - rev = "c244717529229d7ecc2b2c160992f28dcb755d2c"; - sha256 = "0r004sli3ggkhsdi61m8p32l227h5wligzph0mfhsy39fkhmva34"; + rev = "d5d4a8259daf708411699bcea85d322f18beb972"; + sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode"; @@ -2873,12 +2895,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170610.2241"; + version = "20170804.2158"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "d6222c2959caaca5c4980038756097da8a51e505"; - sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; + rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5"; + sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2936,12 +2958,12 @@ atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-dark-theme"; - version = "20151119.2335"; + version = "20170710.1612"; src = fetchFromGitHub { owner = "whitlockjc"; repo = "atom-dark-theme-emacs"; - rev = "b6963e486d27eae7cd472736c106c7079c2a3d3c"; - sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464"; + rev = "7fb37fd953e417acbcf7dd3f36e3167bed9bc887"; + sha256 = "040xp0nqa9akjv30kgnw6l1248g2cl5yzihhfwbr8cgywqfir1lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1f565871559d6ea4ca4bb2fbaebce58f2f383eb/recipes/atom-dark-theme"; @@ -2957,12 +2979,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170117.1905"; + version = "20170803.916"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "44903ab7c349ef225499d642f249b6dfef5c5161"; - sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp"; + rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1"; + sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3080,27 +3102,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "20140520.203"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -3108,8 +3109,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9"; - sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw"; + rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9"; + sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3183,22 +3184,22 @@ license = lib.licenses.free; }; }) {}; - auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: + auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170130.1017"; + version = "20170817.1437"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; - rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; - sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; + rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; + sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; - packageRequires = [ dash emacs packed ]; + packageRequires = [ emacs packed ]; meta = { homepage = "https://melpa.org/#/auto-compile"; license = lib.licenses.free; @@ -3562,12 +3563,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170620.1001"; + version = "20170716.717"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43"; - sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif"; + rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; + sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3604,12 +3605,12 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20151025.2311"; + version = "20170803.1005"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410"; - sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2"; + rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d"; + sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; @@ -3999,36 +4000,15 @@ license = lib.licenses.free; }; }) {}; - avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "avk-emacs-themes"; - version = "20170110.1046"; - src = fetchFromGitHub { - owner = "avkoval"; - repo = "avk-emacs-themes"; - rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7"; - sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; - sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; - name = "avk-emacs-themes"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/avk-emacs-themes"; - license = lib.licenses.free; - }; - }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170702.237"; + version = "20170819.1039"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; - sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; + rev = "245b5d62feb6f276971be53e63311de4a243bfbc"; + sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4069,8 +4049,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "71b71e64900d0637e17013781042e086e9bf56e7"; - sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; + rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; + sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4403,12 +4383,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170626.1114"; + version = "20170806.1329"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "eeb0fbbc0115d87eeae4392d4d51f35346798bc0"; - sha256 = "1v5wxb9ji4my99mgk5zivwjp57nz3ydjbsjmmanfjwdig98djak9"; + rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e"; + sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4424,12 +4404,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20150514.728"; + version = "20170813.624"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "1659c7ca38e2cf591525a3d0b9d97461de33916d"; - sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg"; + rev = "318e32979fab4e1fcb4fdf400af0e30148544951"; + sha256 = "0kdh87rvrvb2dgqkhaqv2wj6m2z0g13va1vk6p8d6q2x4a2mp9y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4547,11 +4527,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20170129.2224"; + version = "20170725.300"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "8998b3416b36873f4e49454879f2eed20c31b384"; - sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn"; + rev = "c951e15cd01d84193937ae5e347143321c3a2da9"; + sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4585,48 +4565,6 @@ license = lib.licenses.free; }; }) {}; - bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "bbdb-android"; - version = "20150705.2224"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "bbdb-android"; - rev = "60641acf8b90e34b70f783b3d6e7789a4272f2b4"; - sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1296e9ffe3a49022a9480b398fbfa311121a1020/recipes/bbdb-android"; - sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3"; - name = "bbdb-android"; - }; - packageRequires = [ bbdb-vcard ]; - meta = { - homepage = "https://melpa.org/#/bbdb-android"; - license = lib.licenses.free; - }; - }) {}; - bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "bbdb-china"; - version = "20150615.1856"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "bbdb-china"; - rev = "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c"; - sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china"; - sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py"; - name = "bbdb-china"; - }; - packageRequires = [ bbdb-vcard chinese-pyim ]; - meta = { - homepage = "https://melpa.org/#/bbdb-china"; - license = lib.licenses.free; - }; - }) {}; bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }: melpaBuild { pname = "bbdb-csv-import"; @@ -4669,27 +4607,6 @@ license = lib.licenses.free; }; }) {}; - bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "bbdb-handy"; - version = "20150707.1752"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "bbdb-handy"; - rev = "67936204488b539fac9b4a7bfbf11546f3b13de2"; - sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy"; - sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8"; - name = "bbdb-handy"; - }; - packageRequires = [ bbdb ]; - meta = { - homepage = "https://melpa.org/#/bbdb-handy"; - license = lib.licenses.free; - }; - }) {}; bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-vcard"; @@ -4735,16 +4652,16 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20170127.516"; + version = "20170815.28"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a"; - sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy"; + rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb"; + sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac"; - sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; + sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897"; name = "bbyac"; }; packageRequires = [ browse-kill-ring cl-lib ]; @@ -4819,12 +4736,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170625.850"; + version = "20170810.624"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "c99bb0b2674ab704ba537fb46e5bf5d60376ea55"; - sha256 = "1l20x3any7mrkm27ifl5xhq8xxacm2gq2cx9m644l8v4yji4835c"; + rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b"; + sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -5027,12 +4944,12 @@ bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20170417.620"; + version = "20170709.1150"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "813730a8967e003ca67342cc45b62c17cda77a7c"; - sha256 = "0wy2013azglz095w4w3g693hr6f68z2fbwpc6gixr85rd0pk9hh9"; + rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215"; + sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; @@ -5069,12 +4986,12 @@ bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibtex-utils"; - version = "20170221.1757"; + version = "20170817.1219"; src = fetchFromGitHub { owner = "plantarum"; repo = "bibtex-utils"; - rev = "36953c6bd1e14eac553834720f383d4114585f55"; - sha256 = "0z21p9j4wsbiygwk8lz9awwy1c2w2mnfyq501bvvd7r99k7hhy2k"; + rev = "ed5ccce46c2088a28a2f0c49caa679d2f20567f0"; + sha256 = "0cy0w4986lngzhzmfvk9r5xf0qa9bdz2ybzgv3nkwl48pjqvvi15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils"; @@ -5111,12 +5028,12 @@ binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; - version = "20170418.812"; + version = "20170802.416"; src = fetchFromGitHub { owner = "davep"; repo = "binclock.el"; - rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac"; - sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d"; + rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad"; + sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; @@ -5132,12 +5049,12 @@ bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "bind-chord"; - version = "20160530.1042"; + version = "20170717.1152"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "e8551ce8a514d865831d3a889acece79103fc627"; - sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; + rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; + sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord"; @@ -5157,8 +5074,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; - sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; + rev = "360df30683a711c443f87e495ba14cdd125a505d"; + sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5403,12 +5320,12 @@ bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bliss-theme"; - version = "20141115.2301"; + version = "20170808.607"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-bliss-theme"; - rev = "2c6922cb24118722819bea79a981f066039d34a3"; - sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr"; + rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf"; + sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme"; @@ -5508,12 +5425,12 @@ bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bm"; - version = "20170103.1424"; + version = "20170815.1609"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f"; - sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h"; + rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c"; + sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5633,7 +5550,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170703.1431"; + version = "20170731.1658"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; @@ -5674,12 +5591,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170528.2317"; + version = "20170802.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "4b76f0a86c84b0e4032cdee787c3ee55372e6c31"; - sha256 = "1rr52dwwxq26v0h7apgr6nqpvfahrzm3j6p3zpbyp3lhb4sc2rjw"; + rev = "d5c4e762fcfad605b95125d8422f0071494ddd91"; + sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5716,12 +5633,12 @@ boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boron-theme"; - version = "20150117.952"; + version = "20170808.608"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-boron-theme"; - rev = "ea5873139424d6ca013b915876daf0399432015b"; - sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb"; + rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a"; + sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme"; @@ -5737,12 +5654,12 @@ boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20170418.835"; + version = "20170802.417"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; - sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; + rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5"; + sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; @@ -5779,15 +5696,15 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20160514.458"; + version = "20170820.354"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "8efa52363ae8f86ff06f2677e2e0fb963aa4c186"; - sha256 = "10178l56ryfxsrxysy9qb6vg71q1xavfw1sbchh0mrb90x12vilz"; + rev = "9f4fac3f9cc9a44518d5c0f000b9a2c2b26d6b85"; + sha256 = "0sn5xx3d461xm60hnj8jkr9rxnbs17kv8aq3br1qjy61yrg98gh7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/410d9d7d9de4d53f1b760081ff46764f121e8f1d/recipes/bpr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2"; name = "bpr"; }; @@ -5863,12 +5780,12 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20170624.309"; + version = "20170720.1518"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32"; - sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb"; + rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215"; + sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; @@ -5965,12 +5882,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "20170116.1117"; + version = "20170806.1446"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -6112,12 +6029,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170109.1220"; + version = "20170818.738"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; - sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + rev = "badab811809da6c1c05daa8dda7b464a6002cbf5"; + sha256 = "1qjfykpli0qcv769gwas9j3rcsqp08ryqbyymadnmkbssvqhkg9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6154,15 +6071,15 @@ buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20170505.829"; + version = "20170717.2040"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; - rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353"; - sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw"; + rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e"; + sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets"; - sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets"; + sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin"; name = "buffer-sets"; }; packageRequires = [ cl-lib ]; @@ -6403,12 +6320,12 @@ busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "busybee-theme"; - version = "20130920.942"; + version = "20170719.228"; src = fetchFromGitHub { owner = "mswift42"; repo = "busybee-theme"; - rev = "70850d1781ff91c4ce125a31ed451d080f8da643"; - sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx"; + rev = "66b2315b030582d0ebee605cf455d386d8c30fcd"; + sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme"; @@ -6445,12 +6362,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170701.429"; + version = "20170812.128"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "b6deeffe032527696e32623b69bdf07b538a315e"; - sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; + rev = "6ad9565cd7adc195f81bdbbc1115a6bd96802a72"; + sha256 = "1qlfr09k39wmhr6lngsq1c7gdw4c8smvmn2vj6r2jlhnfav54ig5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6718,16 +6635,16 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20170703.1704"; + version = "20170714.840"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce"; - sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; - sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; + sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; name = "calfw"; }; packageRequires = []; @@ -6736,6 +6653,27 @@ license = lib.licenses.free; }; }) {}; + calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-cal"; + version = "20170320.506"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; + sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; + name = "calfw-cal"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-cal"; + license = lib.licenses.free; + }; + }) {}; calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw-gcal"; @@ -6757,6 +6695,69 @@ license = lib.licenses.free; }; }) {}; + calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-howm"; + version = "20170703.1704"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; + sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; + name = "calfw-howm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-howm"; + license = lib.licenses.free; + }; + }) {}; + calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-ical"; + version = "20150703.119"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; + sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; + name = "calfw-ical"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-ical"; + license = lib.licenses.free; + }; + }) {}; + calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-org"; + version = "20160302.1858"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; + sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; + name = "calfw-org"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-org"; + license = lib.licenses.free; + }; + }) {}; calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; @@ -6842,12 +6843,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170621.1316"; + version = "20170807.607"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; - sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; + rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97"; + sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6909,8 +6910,8 @@ src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "0a2e8436e02af6ca688b25ba90a19505a6113296"; - sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v"; + rev = "07d8c963a4d349d856c51a471c60689734ebeda0"; + sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -7014,8 +7015,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; - sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7056,8 +7057,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; - sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7240,12 +7241,12 @@ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "20170626.1403"; + version = "20170806.919"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6"; - sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h"; + rev = "1267447a38648502627005bfad0a3aef3572ef7d"; + sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; @@ -7265,8 +7266,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "e33115d8a7516c49ea6ac7c570e9c63d34650672"; - sha256 = "02j3sc1cj6pawsg2i9xw03xyzsa0irnxf0m0adcw2rylyz7bmwpa"; + rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e"; + sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7300,12 +7301,54 @@ license = lib.licenses.free; }; }) {}; + cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "cfml-mode"; + version = "20170811.2240"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807"; + sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode"; + sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp"; + name = "cfml-mode"; + }; + packageRequires = [ cftag-mode emacs mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/cfml-mode"; + license = lib.licenses.free; + }; + }) {}; + cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cftag-mode"; + version = "20170811.2240"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807"; + sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode"; + sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c"; + name = "cftag-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cftag-mode"; + license = lib.licenses.free; + }; + }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12267"; + rev = "12312"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7389,8 +7432,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; - sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; + rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; + sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7448,12 +7491,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "20170627.422"; + version = "20170802.418"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2"; - sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m"; + rev = "e90445124f3f145a047779e42d070a3c5e150f70"; + sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -7616,12 +7659,12 @@ chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-conv"; - version = "20160218.1315"; + version = "20170807.1428"; src = fetchFromGitHub { owner = "gucong"; repo = "emacs-chinese-conv"; - rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb"; - sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1"; + rev = "b56815bbb163d642e97fa73093b5a7e87cc32574"; + sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv"; @@ -7634,22 +7677,22 @@ license = lib.licenses.free; }; }) {}; - chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20170512.1"; + version = "20170726.1517"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-fonts-setup"; - rev = "a88f45239ca73e95eb6bac923590f1d108b822ca"; - sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah"; + repo = "cnfonts"; + rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182"; + sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; - sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup"; + sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1"; name = "chinese-fonts-setup"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cnfonts emacs ]; meta = { homepage = "https://melpa.org/#/chinese-fonts-setup"; license = lib.licenses.free; @@ -7676,111 +7719,27 @@ license = lib.licenses.free; }; }) {}; - chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: + chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-pyim"; - version = "20170512.735"; + version = "20170728.2242"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-pyim"; - rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae"; - sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx"; + repo = "pyim"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; - sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; + sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn"; name = "chinese-pyim"; }; - packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ]; + packageRequires = [ pyim ]; meta = { homepage = "https://melpa.org/#/chinese-pyim"; license = lib.licenses.free; }; }) {}; - chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-basedict"; - version = "20160723.438"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-basedict"; - rev = "3bca2760d78fd1195dbd4c2d570db955023a5623"; - sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; - sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv"; - name = "chinese-pyim-basedict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-basedict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-greatdict"; - version = "20170513.1833"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-greatdict"; - rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991"; - sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; - sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc"; - name = "chinese-pyim-greatdict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-greatdict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-wbdict"; - version = "20170217.15"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-wbdict"; - rev = "59856a7199dde278c33f6f8d8e21df4944ba996a"; - sha256 = "1aahff6r0liil7nx1pprmkmb5c39kwywblj3n6zs80ikwy4759xb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict"; - sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c"; - name = "chinese-pyim-wbdict"; - }; - packageRequires = [ chinese-pyim ]; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-wbdict"; - license = lib.licenses.free; - }; - }) {}; - chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-remote-input"; - version = "20150110.2103"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-remote-input"; - rev = "d05d0bd116421e6fd19f52e9e576431ee5de0858"; - sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b639a9d3b258afe6637055e75a2939f2df18366a/recipes/chinese-remote-input"; - sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag"; - name = "chinese-remote-input"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-remote-input"; - license = lib.licenses.free; - }; - }) {}; chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-wbim"; @@ -7805,12 +7764,12 @@ chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-word-at-point"; - version = "20150618.1838"; + version = "20170811.241"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "chinese-word-at-point.el"; - rev = "36a03cce32fe059d2b581cb2e029715c0be81074"; - sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j"; + rev = "8223d7439e005555b86995a005b225ae042f0538"; + sha256 = "13gva1ld4f9wwb2m4fpk6bd9342qvvmaf5i1r3x3h84czmk0nq1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point"; @@ -7929,12 +7888,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170705.951"; + version = "20170729.133"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "4a7b5ffc245be2b4285bed07f66ca88c5b4420a8"; - sha256 = "1k5zdw3cag9918kv51ph0jlg0wa0m4fbzl7yf3cvsfb78xf4apmd"; + rev = "a1eee8c71237c98809c4852d9b1c799da903cd4f"; + sha256 = "02nvrb40zk1wyw9v6wh0rnasv88phd3cn5kp1hmsspaa3sbyln1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8118,12 +8077,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170528.731"; + version = "20170728.638"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "47bbcf4268602688f90c08ce64ec93226fc3f894"; + sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8204,13 +8163,13 @@ pname = "clang-format"; version = "20170120.137"; src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "307254"; - sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; + url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; + rev = "311383"; + sha256 = "135p8ag315sh9zwssb6f9widiqh6xrcnry1r1v0ij8r94n7bw6la"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; - sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; + sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7"; name = "clang-format"; }; packageRequires = [ cl-lib ]; @@ -8411,12 +8370,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20170608.320"; + version = "20170720.712"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f"; - sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w"; + rev = "f5295df68955c23fffd60718039fd386d13c77f5"; + sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8507,12 +8466,12 @@ cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cloc"; - version = "20151007.201"; + version = "20170728.1124"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "cloc-emacs"; - rev = "15e63b83dd6261f543d25aac4c72e764e3274d53"; - sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v"; + rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491"; + sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc"; @@ -8591,12 +8550,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170622.2345"; + version = "20170819.2159"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "197298e93af19f755cc2c54049dc5aeb04ce6553"; - sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787"; + rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; + sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8616,8 +8575,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "197298e93af19f755cc2c54049dc5aeb04ce6553"; - sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787"; + rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; + sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8654,12 +8613,12 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20170508.42"; + version = "20170713.2310"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; - rev = "1c6b37578c38d538ae017b23d4cd8697963b077e"; - sha256 = "1pnxxzjbf0irbxapj7f4rqfv9j1x3qdgyq6pzi566c1qld3bkwn6"; + rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68"; + sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; @@ -8675,12 +8634,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20170705.719"; + version = "20170726.436"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "7af6fa717f08fda930641a27f3a07743c2042514"; - sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; + rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; + sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8696,12 +8655,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20161130.925"; + version = "20170629.921"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; - sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; + rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770"; + sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8822,12 +8781,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170626.509"; + version = "20170818.907"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "0d05b0d4cf7252a381a28bd19577fb0d4ce6067b"; - sha256 = "1gb5zjjjwsiz3lrm004qdki0ag8s5isczp1af2mgdgmc2626kqpd"; + rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0"; + sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8847,8 +8806,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "8bc93cdd797e6396040bd00eee877734af0d3759"; - sha256 = "1b92ba67dkihyixd1p2pkaqcgr39gf64vka1sbbx2fcwczyv3q32"; + rev = "9a0a6f91ae5c8e25197d50e7045b6c4418f607b2"; + sha256 = "1l4x4xz1r1m8vf1klbpq98mzwkgxmpajwxl04vd8fxwv33pkyyxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8864,12 +8823,12 @@ cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-project"; - version = "20150720.1359"; + version = "20170725.912"; src = fetchFromGitHub { owner = "alamaison"; repo = "emacs-cmake-project"; - rev = "5212063b6276f8b9af8b48b4052e5ec97721c08b"; - sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6"; + rev = "ae763397663fbd35de0541a5d9f2de18a5de3305"; + sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project"; @@ -8964,6 +8923,27 @@ license = lib.licenses.free; }; }) {}; + cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cnfonts"; + version = "20170731.1611"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "cnfonts"; + rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182"; + sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; + sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; + name = "cnfonts"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cnfonts"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -9176,12 +9156,12 @@ colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colonoscopy-theme"; - version = "20141115.2301"; + version = "20170808.609"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-colonoscopy-theme"; - rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936"; - sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6"; + rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead"; + sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme"; @@ -9197,12 +9177,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20170615.1338"; + version = "20170814.1121"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8"; - sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17"; + rev = "5750ee9e1ab8a6890381bb461982113b1eb98879"; + sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9343,12 +9323,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170626.1417"; + version = "20170813.237"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8"; - sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh"; + rev = "8faa5d0153166e44416d59324dc39e43469d684c"; + sha256 = "137rn1k1hlaz4k47mrh358k5kpc29n87281sq3sd8gq3rdm8hs7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9513,8 +9493,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "commander.el"; - rev = "2a4f1fd6cf9aa1798559dbdd5fbd9dcd327cd859"; - sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1"; + rev = "c93985dc318fe89e5a29abc21d19fb41e2fd14d2"; + sha256 = "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander"; @@ -9530,12 +9510,12 @@ comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "comment-dwim-2"; - version = "20150825.1549"; + version = "20170809.1354"; src = fetchFromGitHub { owner = "remyferre"; repo = "comment-dwim-2"; - rev = "8cedecde018b5872195bfead6511af822776a430"; - sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps"; + rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4"; + sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2"; @@ -9614,12 +9594,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170617.1502"; + version = "20170818.340"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "9dbabd146c5884c1a1940eef010bcf834510a8e2"; - sha256 = "03nrim8r28d6zj7c6vgf5wldyfq7yfpc6yw37cmamkiqi0rhnc40"; + rev = "ab2937a862541a66c149e1f95ca32eb2bd31b16b"; + sha256 = "17mk0yfq2mdlhsxxsliy1qcmjl9fzqddrp6sw4p886v0f6w59br5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -10091,12 +10071,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20170612.1308"; + version = "20170821.1306"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "b8001ffc4da7403172835d47bc740cfbac35364d"; - sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi"; + rev = "aa84766a4c878d0748d9d9734e312309bf2758dc"; + sha256 = "0fcxxy7a3364qwpib3yjq6ps3z5q7gr0njf6jzwjvnrrn4m6dbga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -10175,12 +10155,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170221.751"; + version = "20170804.1202"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8"; - sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -10263,8 +10243,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; - sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; + rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575"; + sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10395,8 +10375,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10493,6 +10473,27 @@ license = lib.licenses.free; }; }) {}; + company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: + melpaBuild { + pname = "company-terraform"; + version = "20170812.722"; + src = fetchFromGitHub { + owner = "rafalcieslak"; + repo = "emacs-company-terraform"; + rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4"; + sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; + sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh"; + name = "company-terraform"; + }; + packageRequires = [ company emacs terraform-mode ]; + meta = { + homepage = "https://melpa.org/#/company-terraform"; + license = lib.licenses.free; + }; + }) {}; company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-try-hard"; @@ -10563,8 +10564,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; - sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10580,12 +10581,12 @@ composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "composable"; - version = "20170426.459"; + version = "20170723.2347"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; - rev = "09020605ee7f4e52ff2fa2f6d68d826db1ee7565"; - sha256 = "0vhvgn0ybdnh8c71sbjxh6bb05w5ivm3rmkj4f255zqfkjyddl7q"; + rev = "ac981974f89607393cc61314aaa19672d45b0650"; + sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; @@ -10647,8 +10648,8 @@ src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53"; - sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s"; + rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799"; + sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10661,6 +10662,27 @@ license = lib.licenses.free; }; }) {}; + config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "config-general-mode"; + version = "20170719.446"; + src = fetchFromGitHub { + owner = "tlinden"; + repo = "config-general-mode"; + rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed"; + sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode"; + sha256 = "1408xyzmb5aj1yrlgkymwy5x6rb1a9ynkx2m6hgj38qj6dz44cyy"; + name = "config-general-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/config-general-mode"; + license = lib.licenses.free; + }; + }) {}; config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-parser"; @@ -10828,6 +10850,27 @@ license = lib.licenses.free; }; }) {}; + copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "copy-file-on-save"; + version = "20170817.2319"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "emacs-auto-deployment"; + rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; + sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save"; + sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3"; + name = "copy-file-on-save"; + }; + packageRequires = [ cl-lib emacs f s ]; + meta = { + homepage = "https://melpa.org/#/copy-file-on-save"; + license = lib.licenses.free; + }; + }) {}; copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copyit"; @@ -10870,27 +10913,6 @@ license = lib.licenses.free; }; }) {}; - coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { - pname = "coq-commenter"; - version = "20170607.1355"; - src = fetchFromGitHub { - owner = "ailrun"; - repo = "coq-commenter"; - rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe"; - sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter"; - sha256 = "07svxfh6wx78lg2r7jssdlipmcwzk8w14vry9fr5wxxi24y37nvg"; - name = "coq-commenter"; - }; - packageRequires = [ cl-lib dash s ]; - meta = { - homepage = "https://melpa.org/#/coq-commenter"; - license = lib.licenses.free; - }; - }) {}; corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "corral"; @@ -10915,12 +10937,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170705.417"; + version = "20170817.1000"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; - sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; + rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f"; + sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11020,12 +11042,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20170216.1426"; + version = "20170816.200"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "aefd25c74718e66f180127c0d273eade887325b0"; - sha256 = "10d29mpvsav19m9x51w8bjv0r9agxdwsvhk1ql62lj7rcy4256jq"; + rev = "363c875df6ea658e543df59c11497f79bfa36b54"; + sha256 = "1l6gd4ir5xh8ldw028i4s28jymd62926a7yzd0a52y5b2z7f4knr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11167,12 +11189,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20170507.629"; + version = "20170819.259"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389"; - sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7"; + rev = "4fa37dd075c716f98b67b96f3b6e022730df1c1b"; + sha256 = "194vayk2hvqm2nv1rr3myiadrfvk8fpch1qlbic9bzbgfrl74i41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -11206,27 +11228,6 @@ license = lib.licenses.free; }; }) {}; - crab = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }: - melpaBuild { - pname = "crab"; - version = "20150126.2137"; - src = fetchFromGitHub { - owner = "puffnfresh"; - repo = "crab-emacs"; - rev = "6d66844856c1864157cef3dea9332c319b05d7d5"; - sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/25f80586fb88ab5f0eb71d657d602d9faa1169ec/recipes/crab"; - sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj"; - name = "crab"; - }; - packageRequires = [ json websocket ]; - meta = { - homepage = "https://melpa.org/#/crab"; - license = lib.licenses.free; - }; - }) {}; crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crappy-jsp-mode"; @@ -11335,12 +11336,12 @@ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20161130.2036"; + version = "20170726.504"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; - sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; + rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; + sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -11374,27 +11375,6 @@ license = lib.licenses.free; }; }) {}; - crontab-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "crontab-mode"; - version = "20090510.1355"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "crontab-mode"; - rev = "68341c82b26462a6af4a5e2b624b1c2165243b8e"; - sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/crontab-mode"; - sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci"; - name = "crontab-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/crontab-mode"; - license = lib.licenses.free; - }; - }) {}; crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: melpaBuild { pname = "crosshairs"; @@ -11418,12 +11398,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170626.632"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51"; - sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5"; + rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; + sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11520,6 +11500,27 @@ license = lib.licenses.free; }; }) {}; + csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: + melpaBuild { + pname = "csound-mode"; + version = "20170731.1504"; + src = fetchFromGitHub { + owner = "hlolli"; + repo = "csound-mode"; + rev = "34d9499e8da475c491eac1158bd429bf0e10e7de"; + sha256 = "1j7gykp16im5rlrlhrxk5svz9w543350q6lz41754ah0f7i8gc6m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; + sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; + name = "csound-mode"; + }; + packageRequires = [ emacs multi shut-up ]; + meta = { + homepage = "https://melpa.org/#/csound-mode"; + license = lib.licenses.free; + }; + }) {}; css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "css-comb"; @@ -11647,12 +11648,12 @@ ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20170120.2313"; + version = "20170728.58"; src = fetchFromGitHub { owner = "jixiuf"; repo = "ctags-update"; - rev = "9c58084395bd5c62c3fe500cd56d62bfc1dcee51"; - sha256 = "0cgq31ivhhr32pz17yfy7sja81bhxjh7fn502fa8mc9c3msgflwn"; + rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6"; + sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; @@ -11714,8 +11715,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "3c024a91109657088eda0f858be639c8d40c451c"; - sha256 = "03ppp20d98g824nnc4mnii3yzc58b5x3cbcifznr0pb0i4w5h42f"; + rev = "a331f1d355c5d2fc608a59c1cbbf016ea09d6deb"; + sha256 = "1anwj210gini3p98wy3fj1gbn5ijkbd5vnfc3526h4vppsb4vili"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11832,12 +11833,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "20170524.803"; + version = "20170724.924"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "8c3cc39bcff5def0d476c080b5248436da7f990f"; - sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi"; + rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019"; + sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -11939,8 +11940,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "d7842388a1872b165489624a1a68f536de97e28d"; - sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; + rev = "2d421507afead407f9daae694df254b160c4ff65"; + sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -11977,12 +11978,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20140705.1229"; + version = "20170723.1342"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "749d07b9c1eee8751c690967dc48bdd11c0cfc06"; - sha256 = "0h51h7c19ncb3a6q4mgkq06fdc4q64s71z4a9rwwxk7kqs842hwg"; + rev = "f4faa0ee50916d5e042493827062a47ae6b1d988"; + sha256 = "0l4p5sakw9mi15zss5b05m0ghix7vq3c4j5adbcg5hl8464gzvpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12061,12 +12062,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "20170626.252"; + version = "20170814.824"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; - sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + rev = "92641503c7e93309db12380d5228f99dbe64a53c"; + sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -12082,12 +12083,12 @@ dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-light-theme"; - version = "20170501.654"; + version = "20170808.1440"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-light-theme"; - rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965"; - sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69"; + rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4"; + sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme"; @@ -12103,12 +12104,12 @@ dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-theme"; - version = "20140211.2045"; + version = "20170801.1233"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-theme"; - rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235"; - sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy"; + rev = "232ad1be5f3572dcbdf528f1655109aa355a6937"; + sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme"; @@ -12142,22 +12143,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170622.34"; + version = "20170821.708"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "b4e8e2b735408087a338813fc56979a5f2556d59"; - sha256 = "002m6mpq6kk0dqa3vlpr5dj9fxmyzphzxqgf1zzwrfrig4bipzsp"; + rev = "dbfc2b8aad1ad0d3f01f58365de380d4fecf260b"; + sha256 = "07wkrqlw3051qn3ycr2ianrm9q4kg0rcm3iy76adq9hxmnljc4zx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs f flycheck s ]; + packageRequires = [ dash emacs f flycheck haskell-mode s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12187,12 +12188,12 @@ dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-krystal-theme"; - version = "20141115.2301"; + version = "20170808.600"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-dark-krystal-theme"; - rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664"; - sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx"; + rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc"; + sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme"; @@ -12247,27 +12248,6 @@ license = lib.licenses.free; }; }) {}; - darkane-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "darkane-theme"; - version = "20161111.1304"; - src = fetchFromGitHub { - owner = "FelixFortis"; - repo = "emacs-darkane-theme"; - rev = "afa346c793b74645392677b276c56b87c354b8ef"; - sha256 = "1mi2k7llbk4n05mcy80lswv5vqlfca2izslds7z0sihik8fys4m6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/826bd40f9da54e263dbad4bd861bd8227ea76656/recipes/darkane-theme"; - sha256 = "1lnjjhy70bizqlpih9aqvv6hsx8lj4qa5klbd7mrldqywab8cpib"; - name = "darkane-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/darkane-theme"; - license = lib.licenses.free; - }; - }) {}; darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkburn-theme"; @@ -12313,12 +12293,12 @@ darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkokai-theme"; - version = "20160803.2058"; + version = "20170728.339"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "5c5cee814c370f99db486ad11165f2023a22f7be"; - sha256 = "0by1c73hbc1y32ylb2pbfin6ydzxh2597rrm8xj8lc5g0ilch67n"; + rev = "d881d51acf0a7f806ae68d48305e30941a741a0e"; + sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; @@ -12334,12 +12314,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170629.1848"; + version = "20170715.1624"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "475fd1b583958d40b1cba6cfaf4ccfd7d5ca8f18"; - sha256 = "1w2jsg5nyms6iz02digwj96dry926hs0d2c9pi7y252zifhldkdp"; + rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf"; + sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12376,12 +12356,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170613.151"; + version = "20170810.137"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f"; - sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a"; + rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; + sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12422,8 +12402,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f"; - sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a"; + rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; + sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12439,12 +12419,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170419.2358"; + version = "20170810.1025"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "27c559952483301cc92539f68a89a047a0cc69ad"; - sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x"; + rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58"; + sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12628,12 +12608,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170705.533"; + version = "20170709.839"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; - sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; + rev = "16d156562aef72f02ced58087335ed72d520d878"; + sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12896,17 +12876,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "20160610.1739"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; - rev = "59173ba0c048ead287dd1171a5a52ce53fd9a0cb"; - sha256 = "12h6miqn3nmyhf7r5cm57fh9japv79mm6gyvlb3p0qw1zzlwnlcg"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; + rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; + sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -13044,12 +13026,12 @@ devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "devdocs"; - version = "20160607.540"; + version = "20170731.150"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "devdocs.el"; - rev = "1bff4bd406fc71199d9dcac503269f7aa8fcebe6"; - sha256 = "0qxy4i9438jmbxbj980civ8csh507gri3q3bszg3s1wv966k69rz"; + rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611"; + sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs"; @@ -13065,12 +13047,12 @@ dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dfmt"; - version = "20160911.228"; + version = "20170728.323"; src = fetchFromGitHub { owner = "qsimpleq"; repo = "elisp-dfmt"; - rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf"; - sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4"; + rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434"; + sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; @@ -13086,11 +13068,11 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20170427.732"; + version = "20170803.354"; src = fetchsvn { url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "97"; - sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg"; + rev = "99"; + sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; @@ -13148,12 +13130,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170617.1540"; + version = "20170709.2000"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "09b9354a8e703d24c132ee08d6c92eee1421fbd9"; - sha256 = "03pk4d1l2vqhvp00z06kbgp4jyfw4nlqia6036kgwg2bp5pnc4aj"; + rev = "bec9889de7bf48d28826039880cec9bfad24a628"; + sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13382,8 +13364,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13396,6 +13378,27 @@ license = lib.licenses.free; }; }) {}; + dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-collapse"; + version = "20170806.1203"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "dired-hacks"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; + sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1"; + name = "dired-collapse"; + }; + packageRequires = [ dash f ]; + meta = { + homepage = "https://melpa.org/#/dired-collapse"; + license = lib.licenses.free; + }; + }) {}; dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details"; version = "20130824.458"; @@ -13543,12 +13546,12 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20161009.530"; + version = "20170718.1145"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13568,8 +13571,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13673,8 +13676,8 @@ src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "9dea31574dcf006d5247b488a1942faaac434362"; - sha256 = "03dim1ca332882i08r19k4vjzw3hwwg132n2mrxhniyzgkk7g891"; + rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8"; + sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13694,8 +13697,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13715,8 +13718,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13731,10 +13734,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170630.752"; + version = "20170818.1411"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y"; + sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs"; name = "dired+.el"; }; recipeFile = fetchurl { @@ -13776,8 +13779,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13797,8 +13800,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13814,12 +13817,12 @@ dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-single"; - version = "20151230.1758"; + version = "20170804.544"; src = fetchFromGitHub { owner = "crocket"; repo = "dired-single"; - rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934"; - sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2"; + rev = "0dcc645de6397bf12c33229de67a503e4490c618"; + sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single"; @@ -13897,8 +13900,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; + sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13977,12 +13980,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20170622.1128"; + version = "20170717.1049"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; - sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; + rev = "d181475192138b256e124a42660ac60ae62d11d0"; + sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14604,12 +14607,12 @@ dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dna-mode"; - version = "20130821.1105"; + version = "20170804.114"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "dna-mode-el"; - rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a"; - sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n"; + rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a"; + sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode"; @@ -14667,12 +14670,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20170601.1345"; + version = "20170718.303"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e"; - sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7"; + rev = "8070936871e0fbb20fb04c28630288ebe314b8b9"; + sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14714,6 +14717,27 @@ license = lib.licenses.free; }; }) {}; + docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "docker-compose-mode"; + version = "20170820.327"; + src = fetchFromGitHub { + owner = "meqif"; + repo = "docker-compose-mode"; + rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14"; + sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; + name = "docker-compose-mode"; + }; + packageRequires = [ dash emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/docker-compose-mode"; + license = lib.licenses.free; + }; + }) {}; docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "docker-tramp"; @@ -14843,12 +14867,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170630.922"; + version = "20170809.1218"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "dc9c0b938ea0bc7a30a79fb74f2e66f1fb2128be"; - sha256 = "04wwv3pps4kwld590x5gwif69izcbapp0y4w3i4nsc88ld08sp96"; + rev = "af5f703b6b63a7823fe5eec9864222c794a05566"; + sha256 = "0c6sr2n795cjbvvlgiqb6a6lixbwdag5p4l3iw4knikdp31gk55w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14960,6 +14984,27 @@ license = lib.licenses.free; }; }) {}; + dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dotnet"; + version = "20170819.642"; + src = fetchFromGitHub { + owner = "julienXX"; + repo = "dotnet.el"; + rev = "e02b68a6823937023d8a2778e7e17d13ea2d9f1c"; + sha256 = "1vmywfija3ip7q84zixnq4ax6j2n3qrvxy8r6gsj0yzfxv3915wl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet"; + sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki"; + name = "dotnet"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dotnet"; + license = lib.licenses.free; + }; + }) {}; download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; @@ -15114,8 +15159,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "drag-stuff.el"; - rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db"; - sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"; + rev = "6d06d846cd37c052d79acd0f372c13006aa7e7c8"; + sha256 = "1fsj88n1j50cxjzx62khzxrajsvf33si8iwgbaz6z7z8pwh91qcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff"; @@ -15278,7 +15323,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1801041"; + rev = "1805686"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15379,12 +15424,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170627.1309"; + version = "20170821.13"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3"; - sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7"; + rev = "497f5e68e01f71612f1d2d4040ed55e501c6ed03"; + sha256 = "1b8gi0swzrsmb9x47xdsf7yjl0075vs7h34ifdks7izzr28n1pi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15439,6 +15484,27 @@ license = lib.licenses.free; }; }) {}; + dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dut-mode"; + version = "20170729.1411"; + src = fetchFromGitHub { + owner = "dut-lang"; + repo = "dut-mode"; + rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1"; + sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode"; + sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai"; + name = "dut-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dut-mode"; + license = lib.licenses.free; + }; + }) {}; dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; @@ -15714,15 +15780,15 @@ easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-after-load"; - version = "20121224.1849"; + version = "20170817.531"; src = fetchFromGitHub { owner = "pd"; repo = "easy-after-load"; - rev = "f8e6e10725d80d3b7e8b1ca966de6190089d8f12"; - sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4"; + rev = "29e20145da49ac9ea40463c552130777408040de"; + sha256 = "00xgd39qc760lmxpbggzn98aks5nad08b5ry54pkszjlmh37yqj7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2086675f58453a597c8bc904b2f6d56f4f4ca702/recipes/easy-after-load"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/easy-after-load"; sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys"; name = "easy-after-load"; }; @@ -15756,12 +15822,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170531.216"; + version = "20170819.347"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; - sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; + rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2"; + sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15816,27 +15882,6 @@ license = lib.licenses.free; }; }) {}; - easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: - melpaBuild { - pname = "easy-lentic"; - version = "20170309.2143"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "easy-lentic"; - rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148"; - sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; - sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg"; - name = "easy-lentic"; - }; - packageRequires = [ cl-lib lentic ]; - meta = { - homepage = "https://melpa.org/#/easy-lentic"; - license = lib.licenses.free; - }; - }) {}; easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-repeat"; @@ -15858,22 +15903,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170520.130"; + version = "20170810.631"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c"; + sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -15903,12 +15948,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170705.2343"; + version = "20170711.1234"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "a6356007a58dc72636ab94c89536c621f089bb0c"; - sha256 = "00qcq1bs8wyxj9cf2jy691ddddz0v5czwn92x40nc43a7qi0a9h1"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15924,12 +15969,12 @@ ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ecb"; - version = "20160101.933"; + version = "20170728.1221"; src = fetchFromGitHub { owner = "ecb-home"; repo = "ecb"; - rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f"; - sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny"; + rev = "1330a44cf3c171781083b0b926ab7622f64e6e81"; + sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb"; @@ -16006,12 +16051,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20170104.1041"; + version = "20170810.305"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "277d25cf8fc9548239599244ab15a2268a55b31b"; - sha256 = "0jh7l4lhbjd7qxqdi8d8mk5j3qxx70x3jdzpw2xw6szcx67lvd3s"; + rev = "65f29ff764c3742cc1190371b1ac91f0812535f3"; + sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -16245,8 +16290,8 @@ sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1737276c05491b53bf0c71e3aefe1480b3b99535/recipes/edit-at-point"; - sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/edit-at-point"; + sha256 = "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df"; name = "edit-at-point"; }; packageRequires = []; @@ -16342,12 +16387,12 @@ edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-server"; - version = "20141231.1358"; + version = "20170725.859"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d"; - sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419"; + rev = "462c57be72b3a8652f705bde0d3b7cd2f79644fa"; + sha256 = "0s4s90sbk82yp08my8jdmn4kn5cx8xc9cf02asrq4b4jvljynwvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16384,12 +16429,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170607.713"; + version = "20170802.238"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; - sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; + rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915"; + sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16405,12 +16450,12 @@ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-charset-extras"; - version = "20170508.112"; + version = "20170712.108"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-charset-extras-el"; - rev = "1b8248de9e85bc846af8dfb53b70fdae8900cc69"; - sha256 = "0gqnx5dwy9qxl1npvp8858i0lwjv1znpqr08h129vaycyyq1n69r"; + rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; + sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; @@ -16489,12 +16534,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170421.55"; + version = "20170804.343"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5"; - sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4"; + rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac"; + sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16536,6 +16581,27 @@ license = lib.licenses.free; }; }) {}; + eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eg"; + version = "20170816.235"; + src = fetchFromGitHub { + owner = "davep"; + repo = "eg.el"; + rev = "0791452498719afb7409d1f723dbea2ec26d56f1"; + sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; + sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; + name = "eg"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/eg"; + license = lib.licenses.free; + }; + }) {}; egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egg"; @@ -16564,8 +16630,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396"; - sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy"; + rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52"; + sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16639,15 +16705,15 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }: + ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170616.1117"; + version = "20170810.1253"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "d3a40af5743c865e71b165600e8f1d0d2b72df53"; - sha256 = "1jsdj0ll6m80xjxgy20ngkdfhak7scx1d474w3s46vvgcjl6z7p2"; + rev = "606d4b32140414cf9ced2683f3532aad9ab0859a"; + sha256 = "19idga81cl70cir6v55cqpkman4dhkjx1rvmmby7517phnpfnjpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16660,6 +16726,7 @@ dash deferred request + request-deferred skewer-mode websocket ]; @@ -16692,12 +16759,12 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20161207.410"; + version = "20170717.807"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "40e7a7d31ee160175aa89583609d3f953fb066c6"; - sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j"; + rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0"; + sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -16713,12 +16780,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170621.348"; + version = "20170810.221"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "438e4f5995285d28fe7dddceacac212c2250dfe2"; - sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq"; + rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f"; + sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16763,12 +16830,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20170701.1607"; + version = "20170813.1436"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "3925f0189d99c6cddbe19831c2020f97adcc4933"; - sha256 = "1lzmhfhwfnkpcbkvkl5vzfjv3h7wb85y9j98wrb3vlydbc9735dw"; + rev = "fe5c35f065c9ae0a1fcd13d866cd38038775cd95"; + sha256 = "1whl866bz7cs07hixx1m4cvi8snrbi3cgv7f2k6wvxhwhxnrjkhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16847,12 +16914,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170705.1739"; + version = "20170729.1712"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; - sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; + rev = "f598a7537710f929c6f7592d8c543768361ba0de"; + sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16865,27 +16932,6 @@ license = lib.licenses.free; }; }) {}; - el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: - melpaBuild { - pname = "el-pocket"; - version = "20160528.951"; - src = fetchFromGitHub { - owner = "pterygota"; - repo = "el-pocket"; - rev = "eb356e013c71903f2e946631ff58a1d0c2372389"; - sha256 = "01dqksnz0nbfmp10sd3wwv1gffs60rk5v9rf2j3q2z13qsh8l2yy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c3b8857bc84888a3f8566fab6288966e07d4201f/recipes/el-pocket"; - sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw"; - name = "el-pocket"; - }; - packageRequires = [ emacs web ]; - meta = { - homepage = "https://melpa.org/#/el-pocket"; - license = lib.licenses.free; - }; - }) {}; el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spec"; @@ -17034,12 +17080,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170502.550"; + version = "20170804.2142"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; - sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; + sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -17221,12 +17267,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170703.1849"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; - sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; + rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff"; + sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17291,12 +17337,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20170402.1842"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; - sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; + rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff"; + sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17522,12 +17568,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170603.2006"; + version = "20170807.1924"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "b15af913435023fb6ce91e4ed79f8e9a1f936f6f"; - sha256 = "15sga6fr6k29cncasfx5n71wspwshag8wcrmwa5py74ba31y98q5"; + rev = "4d44a51603b4004192d62fe58beb12c029709d89"; + sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17732,12 +17778,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20160917.10"; + version = "20170722.422"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "dcadffd331ac70c59e1960d34b7f998302c616d6"; - sha256 = "08dz6zy9fqj7qd1g1igvr28q2znrd5pwxxqjlrkzs994ypfj1vzq"; + rev = "5c793f6df944b7f1a68893438696c12240f0b930"; + sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17823,12 +17869,12 @@ elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-buffer-group"; - version = "20160105.803"; + version = "20170808.1825"; src = fetchFromGitHub { owner = "jeffgran"; repo = "elscreen-buffer-group"; - rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e"; - sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz"; + rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06"; + sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group"; @@ -17869,8 +17915,8 @@ src = fetchFromGitHub { owner = "masutaka"; repo = "elscreen-mew"; - rev = "89871fad690ae161dc076e16ef481b1965612077"; - sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c"; + rev = "c90a23441d836da14a1cb12788432308ba58e2b6"; + sha256 = "167kgbnh5q3pqirv0f7wpjn7yc76k8mz9qx45i7d4scmx8952d2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew"; @@ -17904,27 +17950,6 @@ license = lib.licenses.free; }; }) {}; - elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }: - melpaBuild { - pname = "elscreen-persist"; - version = "20160505.1829"; - src = fetchFromGitHub { - owner = "robario"; - repo = "elscreen-persist"; - rev = "79cb33909a9c66bb183432b956edffbc6b12ace3"; - sha256 = "0p0zphl3ylrbs3mz12y40hphslxd1hlszk1pqi151xrfgc2r0pp8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist"; - sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k"; - name = "elscreen-persist"; - }; - packageRequires = [ elscreen revive ]; - meta = { - homepage = "https://melpa.org/#/elscreen-persist"; - license = lib.licenses.free; - }; - }) {}; elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; @@ -17946,6 +17971,27 @@ license = lib.licenses.free; }; }) {}; + elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elvish-mode"; + version = "20170815.625"; + src = fetchFromGitHub { + owner = "ALSchwalm"; + repo = "elvish-mode"; + rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d"; + sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; + sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34"; + name = "elvish-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elvish-mode"; + license = lib.licenses.free; + }; + }) {}; elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elwm"; @@ -17970,16 +18016,16 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20161104.1831"; + version = "20170805.449"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; - rev = "84c9cd5721be9594de743330e7abcec092d2838c"; - sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; + rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; + sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -17995,8 +18041,8 @@ src = fetchFromGitHub { owner = "echosa"; repo = "emacs-setup"; - rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"; - sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8"; + rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375"; + sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup"; @@ -18075,12 +18121,12 @@ emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170410.1218"; + version = "20170807.1901"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18100,8 +18146,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18121,8 +18167,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18138,12 +18184,12 @@ emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20170410.1218"; + version = "20170806.1551"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -18345,20 +18391,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "emms"; - version = "20170619.1156"; + version = "20170715.907"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "a4ec6697e45a006753bfd79c22f14524748df493"; - sha256 = "07czram3jjhkc3ahjz86qq0fsh8ysdgvlpfyyvj3jmfah1sfk5d7"; + rev = "e790730a4e258440184bc8ce5d3015efe09f8984"; + sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/emms"; license = lib.licenses.free; @@ -18619,12 +18666,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170617.931"; + version = "20170709.207"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "a93f3d424a2ca07d81debbb024053d0e207e999a"; - sha256 = "09vmn8ya3zbmwycaxw5kvlmfmqk0jn07zzajlrwds65p3k8ddcrl"; + rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90"; + sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18661,12 +18708,12 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20170109.1526"; + version = "20170811.1057"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "07e0b41fe080536e8a69301ff1c692f2871bee2f"; - sha256 = "1ckbc2ziw31cqal9hmc6n6gmncwficzw5rwwdcy4wj7f7w3xkr5z"; + rev = "d7009b30be810af6bb33c7d99a9b320e2aaeb698"; + sha256 = "1hx5bv1banrnsb9wrnn57b4wj981qpvnx66px7h304yr95x8bls4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -18733,22 +18780,22 @@ license = lib.licenses.free; }; }) {}; - engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20170508.828"; + version = "20170812.2007"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "59f1d463fada670895b00bab406160570fb8bc35"; - sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl"; + rev = "408932727bb723017eaf6338e50cb6d1266b8df8"; + sha256 = "1wl172ldmdw6gcdzbbf7dln7m55112kq42jzs42xbihm0v1x8xlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c"; name = "engine-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/engine-mode"; license = lib.licenses.free; @@ -18757,12 +18804,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20170417.2356"; + version = "20170816.1713"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "71ba417baea4c4e1ac814854638cbeb4b0b383fd"; - sha256 = "1hbmjbk6xs1r0kqh5ci7jfr6905ipa7xz0kgypqrlg0zap52gayz"; + rev = "e0ea0270d34806cdbbdc442279ec9b94e6fef68d"; + sha256 = "02aaj7zw0383ynm5ikvhxj8h1rq1qg05ri1y7w1k48ia9w5057m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -18778,12 +18825,12 @@ enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enlive"; - version = "20150824.549"; + version = "20170725.717"; src = fetchFromGitHub { owner = "zweifisch"; repo = "enlive"; - rev = "0f6646adda3974e7fe9a42339a4ec3daa532eda5"; - sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh"; + rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86"; + sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive"; @@ -18807,8 +18854,8 @@ sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb55fa7c9bf6a7004011cb809b65bd430d83b31/recipes/eno"; - sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/eno"; + sha256 = "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q"; name = "eno"; }; packageRequires = [ dash edit-at-point ]; @@ -18841,12 +18888,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170703.505"; + version = "20170817.2325"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "4a253e1c24bfb993ca115dac7c9c03189fa0f7cc"; - sha256 = "1vkihm7m5zpcyyr418661gfpdwixqzyrbp2vlhf6vd7i26ik3i8c"; + rev = "fe816d36bce96151f90b76887a69f44100bd12da"; + sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18954,12 +19001,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170702.59"; + version = "20170819.1411"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92"; - sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm"; + rev = "7528d95ca296997ddc98427ff4ea547208848bef"; + sha256 = "1b3xkbivwdzg9ndjwc3q1zq6swny0bd78b3f4ahplqqsrfgzksh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -18979,8 +19026,8 @@ src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "a5ad061d0a5eb42f66c384e55d102da7d52c96b0"; - sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4"; + rev = "83797835f729f39b80acba4c7e83d73a2e410e26"; + sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -19163,12 +19210,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20150914.314"; + version = "20170713.1438"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "270a60706e3e0669350bb7aaea465570ef5074cf"; - sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f"; + rev = "a7e6c6d766f8c2589abf6fd79c5211f970fcbed3"; + sha256 = "044cbz8r788j80f88d2irijpfvh22m9zjvd9ffj201fck428nakh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19373,12 +19420,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20170529.1408"; + version = "20170809.2201"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288"; - sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z"; + rev = "f3bbd3f13195f8fba3e3c880aab0e4c60430dcf3"; + sha256 = "18yqqqxsivnq2m8mxz7ifp0bfmn3q9m11w3abryxg2snh4vb5sy6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader"; @@ -19436,12 +19483,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170509.1202"; + version = "20170723.1921"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "3e6fea941af18415b520f2fabc45349c4a148a8f"; - sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y"; + rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b"; + sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19482,8 +19529,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "9e9ad191ce49eb410c7a95a8410122eed8049755"; - sha256 = "06iyy74hpnc9aqrgbwndx1shvdq05z8hys9siv4ng13725cfpj0k"; + rev = "770454f0a32fbc0714c6762ed3e4d761b799814f"; + sha256 = "1prg6xhj8dyvbhwwkjvnpmcwc0w145im6n0w5fx9kw9har9ch8cj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19603,12 +19650,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20161027.159"; + version = "20170816.1112"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "10628b8b90294077174f78e7b75e548f2a4b6f78"; - sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw"; + rev = "edc21c0d473a16f0130e43962052db2123bb584b"; + sha256 = "0ihvdcys73l16z180602k6nw9hyirn874li6fd9dp81zqmd9his4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -19645,16 +19692,16 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170705.1947"; + version = "20170803.1433"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87"; - sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6"; + rev = "2e00707f42276b59fff2a32c64703e9586b22ae6"; + sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; - sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; + sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; name = "es-mode"; }; packageRequires = [ cl-lib dash request s spark ]; @@ -19750,12 +19797,12 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20170702.1912"; + version = "20170730.2157"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; - rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695"; - sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m"; + rev = "fdd62fb873e2a9a664314a45f91529cac00b8c47"; + sha256 = "1z8gl8mwnr1g7n9jn9iw5a6c9jsr1gjbx3004k07rlw8dld59qd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; @@ -19813,12 +19860,12 @@ eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "eshell-fixed-prompt"; - version = "20170108.1301"; + version = "20170804.635"; src = fetchFromGitHub { owner = "mallt"; repo = "eshell-fixed-prompt-mode"; - rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af"; - sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; + rev = "4351b214de6d4e8e45279930448e2f93b491848e"; + sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; @@ -19876,12 +19923,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20160926.1723"; + version = "20170713.11"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "9825db1b9326e106f821364ae01ec9c7dbdf6d18"; - sha256 = "1zijgwqm9j25ayiy4p5gl3xsrgv10l85j2p317i8bx9hn3v9rk5a"; + rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd"; + sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -19901,8 +19948,8 @@ src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "2216e149ffdd5cd8eb49d6661187d676b6a22d19"; - sha256 = "1czl7gab46n9lxp91v1l9rgnz72h9x1im20yq4hw8w0x71a45ss7"; + rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519"; + sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; @@ -19960,12 +20007,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170313.1943"; + version = "20170711.552"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "afa5cd1c1fb644a918e410ef396392b841146632"; - sha256 = "04ixmv1y7zi32xwywn4dz0nvsvpmdk2m80y9fbaxi5skkx9r30g0"; + rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c"; + sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -19981,12 +20028,12 @@ espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "espresso-theme"; - version = "20130228.2348"; + version = "20170716.813"; src = fetchFromGitHub { owner = "dgutov"; repo = "espresso-theme"; - rev = "c3a524e873f33923fe511791197a66dea5156687"; - sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq"; + rev = "e79c5c14732b7e34aab75dbcc968839536536c59"; + sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme"; @@ -20006,8 +20053,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "7fc312184348df55d19d06914605356885674354"; - sha256 = "1vx1b1pyi2xpfl822mskzvh943rxp9pyr915fnx5pjp58hjwwf3h"; + rev = "8caef13020527956a56b53171057ca1d0e2fb48b"; + sha256 = "0nj5llf9s59dagwqj4s87ccwaky9pan3dyw1dcf8m8f41s5zia62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -20065,12 +20112,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170603.817"; + version = "20170728.238"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "f2643cd3ae6727535ce76ed00a91bf96c09e280f"; - sha256 = "1fyr963y2mnp8wk9jf0fpfp1k74ayhbcdyg1xknvd5jd5lyjgbkb"; + rev = "1f40b23d5b9d9b87cda741bd483e1dfb7fefd035"; + sha256 = "0irwysn402spv5035dj6rngma4q5kx11zm5c9cas42v3wahpr9m8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20104,27 +20151,6 @@ license = lib.licenses.free; }; }) {}; - ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { - pname = "ess-R-object-popup"; - version = "20130302.336"; - src = fetchFromGitHub { - owner = "myuhe"; - repo = "ess-R-object-popup.el"; - rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948"; - sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup"; - sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj"; - name = "ess-R-object-popup"; - }; - packageRequires = [ ess popup ]; - meta = { - homepage = "https://melpa.org/#/ess-R-object-popup"; - license = lib.licenses.free; - }; - }) {}; ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ess-smart-equals"; @@ -20191,12 +20217,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170508.1536"; + version = "20170729.1742"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "efaf44d0739391aed48c77b5cd3013b50027ed36"; - sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732"; + rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3"; + sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20212,12 +20238,12 @@ esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esxml"; - version = "20160703.1417"; + version = "20170723.1503"; src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93"; - sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb"; + rev = "c4646d3a5a274e21efe125ae9f87b9934014e6ad"; + sha256 = "05r2jhcrzrjna5dnq95gnagjn11bx0ysgbcnn4rffwms09avbwvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml"; @@ -20310,27 +20336,6 @@ license = lib.licenses.free; }; }) {}; - euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "euslisp-mode"; - version = "20170621.945"; - src = fetchFromGitHub { - owner = "iory"; - repo = "euslisp-mode"; - rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b"; - sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; - sha256 = "0m04a8k2z7inhfpqz68hv56h352ikcd39fg65dqvj79md05yila9"; - name = "euslisp-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/euslisp-mode"; - license = lib.licenses.free; - }; - }) {}; eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eval-expr"; @@ -20355,12 +20360,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "20170217.1432"; + version = "20170730.1445"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "d96a134abe65c736bfaf0a78d1f899ea7cf0fee5"; - sha256 = "00ilv46ybpw5arfqi3pk7gjabkac76siqpgj3ca47s6vlmz41anv"; + rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60"; + sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -20436,19 +20441,40 @@ license = lib.licenses.free; }; }) {}; + eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }: + melpaBuild { + pname = "eve-mode"; + version = "20170724.1408"; + src = fetchFromGitHub { + owner = "witheve"; + repo = "emacs-eve-mode"; + rev = "16de9c42393f687446dd9ffd36fcc7428437bf7f"; + sha256 = "0xpga18zw78v7wqxmfsv00s2r5rwil0khqjjkm867gk20954j7zh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode"; + sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh"; + name = "eve-mode"; + }; + packageRequires = [ emacs markdown-mode polymode ]; + meta = { + homepage = "https://melpa.org/#/eve-mode"; + license = lib.licenses.free; + }; + }) {}; evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170704.1409"; + version = "20170815.1422"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "a375ac8aea43980dfa60525c7585be64896e42d1"; - sha256 = "1b3j29d4ppbgfg15vfyxz7rpjppqma9am3hk57qxq08n5y3skaxf"; + rev = "744685cb55a4eb461430e91e287279812190ae7c"; + sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; - sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; + sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; packageRequires = [ cl-lib emacs goto-chg undo-tree ]; @@ -20523,12 +20549,12 @@ evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }: melpaBuild { pname = "evil-cleverparens"; - version = "20160611.904"; + version = "20170717.2113"; src = fetchFromGitHub { owner = "luxbock"; repo = "evil-cleverparens"; - rev = "82c920ba04accfd31fa292e11c454d5112b4fd51"; - sha256 = "0ajy5kp2asrg070vzyzgyqs9jnzglm7lvx8fqvgdhpmhzzfckhbi"; + rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869"; + sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens"; @@ -20649,12 +20675,12 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20170623.707"; + version = "20170724.1223"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-ediff"; - rev = "862310e244d406751cdc7eae8e8c0d88414a48c7"; - sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0"; + rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74"; + sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff"; @@ -20796,12 +20822,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170529.2251"; + version = "20170808.404"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "d2dfe823d5b1b70e4ed47518db98b238ff67b81a"; - sha256 = "08hffzamrg3d8fqq94z7p9pywkzckhv6a58x7s1x7z8qvg2irlkz"; + rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f"; + sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20901,12 +20927,12 @@ evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-lion"; - version = "20170523.450"; + version = "20170810.2314"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-lion"; - rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4"; - sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1"; + rev = "aaa3874ad54c31b4322ac5bbc63e331498b11d61"; + sha256 = "1aq3ip93sxk05gfgh2zw6zckmkir0viqaqz674fcmsd2rc2051zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; @@ -21006,12 +21032,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20170119.125"; + version = "20170727.1741"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "277623d8be7bd6ade8f301b9397b88575a0d01b9"; - sha256 = "0bkc90ix8nivqkjkgb6iaq1a0g8dcp91im119dx98l6lxga57qli"; + rev = "dbaae2b7537aadb2e44a8915745ee190768b4b2a"; + sha256 = "1y386wjz23kqfqbbgrwg4fnv2ma21dzk5ppnqd0y5245v388q69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21027,12 +21053,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170526.1158"; + version = "20170716.1806"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "506f92dc610906fc279e50c598efe2068161edaa"; - sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra"; + rev = "8127c3161a6d990635684a020f708b7914445593"; + sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -21111,12 +21137,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170309.49"; + version = "20170814.1947"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03"; - sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m"; + rev = "684f558931a8129bcc58bf9d31a6b2be1be56ec0"; + sha256 = "12xly3kdm4p64bk46mj4cf67r65aznyj27v3zdm6ca1cfxvkm6ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -21174,12 +21200,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170622.1310"; + version = "20170802.1428"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "975109dc665f53cef221b3c668612664340b7940"; - sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q"; + rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de"; + sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21258,12 +21284,12 @@ evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-register"; - version = "20170616.813"; + version = "20170713.225"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-ReplaceWithRegister"; - rev = "0d8a67b578849c00a7a50540daf809dd2ee2b476"; - sha256 = "1azxhb41f8ar3p5grdknpdljx85v2i6zjsp2qd7y8ij69kdw2z0b"; + rev = "91cc7bf21a94703c441cc9212214075b226b7f67"; + sha256 = "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; @@ -21304,8 +21330,8 @@ src = fetchFromGitHub { owner = "naclander"; repo = "evil-search-highlight-persist"; - rev = "6e04a8c075f5fd62526d222447048faab8bfa187"; - sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6"; + rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e"; + sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; @@ -21342,12 +21368,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170702.302"; + version = "20170806.1150"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c50372d152b123fbf7bc26b49504505a22e82635"; - sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; + rev = "e247d6980093633f04431967819bf10b0d23c59c"; + sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21402,22 +21428,22 @@ license = lib.licenses.free; }; }) {}; - evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20170221.444"; + version = "20170726.1120"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8"; - sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k"; + rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; + sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; name = "evil-swap-keys"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-swap-keys"; license = lib.licenses.free; @@ -21465,6 +21491,27 @@ license = lib.licenses.free; }; }) {}; + evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-test-helpers"; + version = "20170719.1445"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "744685cb55a4eb461430e91e287279812190ae7c"; + sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; + sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; + name = "evil-test-helpers"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-test-helpers"; + license = lib.licenses.free; + }; + }) {}; evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-text-object-python"; @@ -21758,6 +21805,27 @@ license = lib.licenses.free; }; }) {}; + exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exotica-theme"; + version = "20170821.459"; + src = fetchFromGitHub { + owner = "jbharat"; + repo = "exotica-theme"; + rev = "016e44ff8c812ca6e8c34e40beaaf6fa4cdc0c37"; + sha256 = "0208ky004yhznhcwcn07v5l72w7g5kkjgpl98grwvqracp07glg9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; + sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs"; + name = "exotica-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/exotica-theme"; + license = lib.licenses.free; + }; + }) {}; expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-line"; @@ -21887,12 +21955,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170706.408"; + version = "20170809.413"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "c73155257a3248d30a9f602de8247ac3e32ba400"; - sha256 = "1bcmrmyx12g11laz9f994vhmqyv1g0qvmp0sbh07nl1q42xy86m6"; + rev = "6adaee93a4f84806cf197dae872f00039a3ca87e"; + sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -21947,22 +22015,22 @@ license = lib.licenses.free; }; }) {}; - ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ez-query-replace"; - version = "20170311.139"; + version = "20170814.621"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; - rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7"; - sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc"; + rev = "f5dbd2d3e5e62e6b7e7cc1a98fc4d0cd411e5afa"; + sha256 = "14mikpxrsmjwdpya45cf47v2gjwxmql10xjk907x27iqqxmfif74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx"; name = "ez-query-replace"; }; - packageRequires = [ dash ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/ez-query-replace"; license = lib.licenses.free; @@ -22013,12 +22081,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20160628.1601"; + version = "20170728.1120"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "114fec094c4ea063724c05404a2ece53f510b3e3"; - sha256 = "0fh69qhvdks1hclwhr9nv6bgbsjwdk0mwqhw3dmlv2jb5yip308m"; + rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6"; + sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -22052,6 +22120,27 @@ license = lib.licenses.free; }; }) {}; + face-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "face-explorer"; + version = "20170710.1201"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "face-explorer"; + rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c"; + sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer"; + sha256 = "1jfidkkizgwhkkrgvrmq5vrx5ir4zjw4zzc2alw9gkjn1ddq22q7"; + name = "face-explorer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/face-explorer"; + license = lib.licenses.free; + }; + }) {}; face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "face-remap-plus"; version = "20170222.1742"; @@ -22364,12 +22453,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170615.1143"; + version = "20170812.1131"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37"; - sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl"; + rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f"; + sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22593,8 +22682,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; - sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; + rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a"; + sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; @@ -22650,12 +22739,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20170531.2054"; + version = "20170725.133"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "a6e59891973f3e40ca2e414ca66799cc686d8626"; - sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng"; + rev = "584ebd41f51e86567375848f64b7c9d337125801"; + sha256 = "1fwifcknkc6sxcn76c2qg8zz0ric5ppdqqxsdd28qicgjqnqrhkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22813,36 +22902,15 @@ license = lib.licenses.free; }; }) {}; - firebelly-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "firebelly-theme"; - version = "20140410.155"; - src = fetchFromGitHub { - owner = "startling"; - repo = "firebelly"; - rev = "5fd621102c676196319579b168da1476e8552d00"; - sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8f2b5ab0e75dccb9efb998cdc240303dc4a279/recipes/firebelly-theme"; - sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr"; - name = "firebelly-theme"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/firebelly-theme"; - license = lib.licenses.free; - }; - }) {}; firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firecode-theme"; - version = "20141115.2302"; + version = "20170808.611"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-firecode-theme"; - rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626"; - sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm"; + rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4"; + sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme"; @@ -22965,8 +23033,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; - sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; + rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; + sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23007,8 +23075,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; - sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; + rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; + sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -23060,8 +23128,8 @@ sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flappymacs"; - sha256 = "0id3bz4h9wi4943kp2sab7240fw8hsnkpng02gij9ssyvjiii5cg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs"; + sha256 = "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404"; name = "flappymacs"; }; packageRequires = []; @@ -23094,12 +23162,12 @@ flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-black-theme"; - version = "20141115.2230"; + version = "20170808.612"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-flatland-black-theme"; - rev = "75fc4f1815feb23563a60477c02d70326b45c59e"; - sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1"; + rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07"; + sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme"; @@ -23280,12 +23348,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20170416.1718"; + version = "20170802.1500"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "fdac635ecc57ac7743f74678147aca2e956561de"; - sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -23301,12 +23369,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20170418.1253"; + version = "20170729.1008"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "b05d59f387133249e03004b79bf16d6fe6c38217"; - sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5"; + rev = "75067baceed7d699dda43944da49dc58d22baeff"; + sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23406,12 +23474,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170626.1707"; + version = "20170817.57"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "4d9e16c03e935e926b61cf8446e43423cd93f577"; - sha256 = "02b6cmrkacr7r34n1s9facdf0dvbv2084wn59xh4hbafpk9zcvhi"; + rev = "24534988d115754cda5f19943d2b4075e2b5c581"; + sha256 = "0mb2rzqbi6a4wcn13kbwhff0z94z6n70lbx567i8lb484kf2kfaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23742,12 +23810,12 @@ flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cython"; - version = "20160327.1228"; + version = "20170724.258"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-cython"; - rev = "45097658a16eeabf2bd5e0464355f8f37a1aeffc"; - sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01"; + rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76"; + sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython"; @@ -23809,8 +23877,8 @@ src = fetchFromGitHub { owner = "z4139jq"; repo = "flycheck-demjsonlint"; - rev = "1c433150fdf628dda4c9fad938bf7c79610b4460"; - sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6"; + rev = "a3dfe1df8ecdea76c076c0849901427567356228"; + sha256 = "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint"; @@ -23868,12 +23936,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170403.1116"; + version = "20170816.648"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "879c52116989f6041ccd20f5db210f5552d5c649"; - sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2"; + rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973"; + sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24036,12 +24104,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170622.1248"; + version = "20170815.44"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c"; - sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5"; + rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2"; + sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24075,6 +24143,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-inline"; + version = "20170728.2328"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "flycheck-inline"; + rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545"; + sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline"; + sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg"; + name = "flycheck-inline"; + }; + packageRequires = [ cl-lib emacs flycheck inline-docs ]; + meta = { + homepage = "https://melpa.org/#/flycheck-inline"; + license = lib.licenses.free; + }; + }) {}; flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }: melpaBuild { pname = "flycheck-irony"; @@ -24120,12 +24209,12 @@ flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-julia"; - version = "20170627.1310"; + version = "20170729.1441"; src = fetchFromGitHub { owner = "gdkrmr"; repo = "flycheck-julia"; - rev = "3aa2c26ed59310643a2f431e522dfc3c5daac085"; - sha256 = "1nvqnwj94qya5s7zxxiwj20k49vmnhaiam72sfiannnpxawkj1q8"; + rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; + sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; @@ -24309,12 +24398,12 @@ flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: melpaBuild { pname = "flycheck-ocaml"; - version = "20151103.212"; + version = "20170730.1453"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-ocaml"; - rev = "e4412025f27850918762237fa80b33e285a63e7c"; - sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94"; + rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9"; + sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml"; @@ -24432,6 +24521,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "20170812.1651"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "ef86aad907f27ca076859d8d9416f4f7727619c6"; + sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -24474,6 +24584,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-pycheckers"; + version = "20170810.1143"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "flycheck-pycheckers"; + rev = "220c551df591792d08fc9d149ab3329171743cb9"; + sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; + sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; + name = "flycheck-pycheckers"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-pycheckers"; + license = lib.licenses.free; + }; + }) {}; flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; @@ -24523,8 +24654,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24645,12 +24776,12 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20160908.1953"; + version = "20170729.1411"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91"; - sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8"; + rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934"; + sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -24733,8 +24864,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; - sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -24750,12 +24881,12 @@ flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-coffee"; - version = "20140809.324"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-coffee"; - rev = "325ab379592fdf9017d7c19625c7a978f6f3af3b"; - sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7"; + rev = "dee295acf30820ed15fe0de17137d50bc27fc80c"; + sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee"; @@ -24792,12 +24923,12 @@ flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-css"; - version = "20121104.1104"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-css"; - rev = "4649fc209836498d709bb627e8aa6e50189a06ec"; - sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy"; + rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8"; + sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css"; @@ -24939,12 +25070,12 @@ flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-haml"; - version = "20130324.351"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-haml"; - rev = "3117d94ecad908710502e8def42dbae5748e9c1d"; - sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l"; + rev = "22a81e8484734552d461e7ae7305664dc244447e"; + sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml"; @@ -24960,12 +25091,12 @@ flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-haskell-multi"; - version = "20130620.422"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-haskell-multi"; - rev = "6183620ffee429b33c886fffd6106b876245ea47"; - sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd"; + rev = "b564a94312259885b1380272eb867bf52a164020"; + sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi"; @@ -24981,12 +25112,12 @@ flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-hlint"; - version = "20130309.145"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-hlint"; - rev = "fae0c16f938129fb933e4c4625287816e8e160f0"; - sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp"; + rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38"; + sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint"; @@ -25023,12 +25154,12 @@ flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-jslint"; - version = "20130613.202"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-jslint"; - rev = "68ca28a88cffdd317f50c712b09abd2ccda8d7bc"; - sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls"; + rev = "8edb82be605542b0ef62d38d818adcdde335eecb"; + sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint"; @@ -25044,12 +25175,12 @@ flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-json"; - version = "20130423.2357"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-json"; - rev = "36084b67830bdc6c226115ea8287ea88d14b05dd"; - sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534"; + rev = "d43e62fab69c4c39f54f1057c9801a3e645de619"; + sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json"; @@ -25128,12 +25259,12 @@ flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-php"; - version = "20121104.1102"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-php"; - rev = "93abe12d62b13f1d035a0df01e53e4bacdac2c66"; - sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4"; + rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc"; + sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php"; @@ -25170,12 +25301,12 @@ flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-puppet"; - version = "20141006.1855"; + version = "20170731.2254"; src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; - rev = "fc4cd25aeac37ed5722bc586d5350fd06ee3067c"; - sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m"; + rev = "9579e5c736cb890195464fabf51df113313de88d"; + sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet"; @@ -25191,12 +25322,12 @@ flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-python-pyflakes"; - version = "20131127.6"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-python-pyflakes"; - rev = "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a"; - sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp"; + rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d"; + sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes"; @@ -25212,12 +25343,12 @@ flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-ruby"; - version = "20121104.1059"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-ruby"; - rev = "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2"; - sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109"; + rev = "6c320c6fb686c5223bf975cc35178ad6b195e073"; + sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby"; @@ -25233,12 +25364,12 @@ flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-rust"; - version = "20141004.1552"; + version = "20170729.1439"; src = fetchFromGitHub { owner = "jxs"; repo = "flymake-rust"; - rev = "72ec92c261670b7384ee2593d0f1946ea29f429a"; - sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv"; + rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0"; + sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust"; @@ -25254,12 +25385,12 @@ flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-sass"; - version = "20140308.325"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-sass"; - rev = "748f13caa399c27c41ba797da9e214b814f5a30f"; - sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1"; + rev = "2de28148e92deb93bff3d55fe14e7c67ac476056"; + sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass"; @@ -25275,12 +25406,12 @@ flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-shell"; - version = "20121104.1100"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-shell"; - rev = "ec097bd77db5523a04ceb15a128e01689d36fb90"; - sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc"; + rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab"; + sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell"; @@ -25296,12 +25427,12 @@ flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-solidity"; - version = "20160424.720"; + version = "20170804.2344"; src = fetchFromGitHub { owner = "kootenpv"; repo = "flymake-solidity"; - rev = "07f33ed52aac5d958fc0f50026a9bf111e1a5308"; - sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn"; + rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8"; + sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity"; @@ -25882,12 +26013,12 @@ foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "foreman-mode"; - version = "20160520.737"; + version = "20170725.722"; src = fetchFromGitHub { owner = "zweifisch"; repo = "foreman-mode"; - rev = "bc6e2aca5a66847b13200b85172f7d7a36807d32"; - sha256 = "0pp68kqg2impar6rhlpifixx0lqgkcrj6ncjn5jlids6vfhq23nd"; + rev = "22b3bb13134b617870ed1e888af739f4818be929"; + sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode"; @@ -26029,12 +26160,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20161207.141"; + version = "20170728.507"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "37289bb68f01dd49b1192032ade6b0741d024a54"; - sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5"; + rev = "be10ce90ede2d76b67abb5eff9c09294fe189f1e"; + sha256 = "17zipwazcqqbbsb7p9j2jcid2m0knlah56vbw71yxqb3qbpq7fcz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -26071,10 +26202,10 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20170506.945"; + version = "20170819.1358"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93"; - sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj"; + url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95"; + sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w"; name = "frame-cmds.el"; }; recipeFile = fetchurl { @@ -26168,22 +26299,22 @@ license = lib.licenses.free; }; }) {}; - frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20170129.120"; + version = "20170802.455"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; - sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661"; + sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; name = "frames-only-mode"; }; - packageRequires = [ emacs seq ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/frames-only-mode"; license = lib.licenses.free; @@ -26326,12 +26457,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170531.1958"; + version = "20170821.831"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e"; - sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06"; + rev = "85e32ccf204fb8bc35954d6ca288c7b8a74531ac"; + sha256 = "13m5axbwbxidhawma1wszfzfgdr2lhbi56y3l305csa4vaxq5cbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26352,18 +26483,19 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: + fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170705.1534"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "1eff2b3dbcbe6d8518a5ec42207b5578dbe93530"; - sha256 = "1nr5s98xss68scmbzrfmdn1ri4hfny6317j6bhksxqnd6dr6za8q"; + version = "20170805.2030"; + src = fetchFromGitHub { + owner = "factor"; + repo = "factor"; + rev = "f8ce34b1dbe1780de135e2b7ba2250bde8fc604f"; + sha256 = "0cv7mrbpks89qk7ivrc0m7kjfayqhnj1db8dh62sv7np2qh49cvv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; + sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z"; name = "fuel"; }; packageRequires = [ cl-lib emacs ]; @@ -26417,12 +26549,12 @@ fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fullframe"; - version = "20160504.749"; + version = "20170816.303"; src = fetchFromGitHub { owner = "tomterl"; repo = "fullframe"; - rev = "b91b0b128c08692c147394842a5e4eeb21ebe0b6"; - sha256 = "0nhw708b5jjymbw3b7np11jlkzdrzq7qnnxdyl8nndsn1c3qcr0l"; + rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd"; + sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe"; @@ -26435,22 +26567,22 @@ license = lib.licenses.free; }; }) {}; - function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: + function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "20170303.515"; + version = "20170821.946"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "a559041e5fed851c889bcfed7553a4dcd855ffae"; - sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk"; + rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d"; + sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak"; name = "function-args"; }; - packageRequires = [ swiper ]; + packageRequires = [ ivy ]; meta = { homepage = "https://melpa.org/#/function-args"; license = lib.licenses.free; @@ -26480,12 +26612,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170705.1240"; + version = "20170714.1430"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "8e3b72bcf26b992546d794b10b96d05ed01f0a73"; - sha256 = "1y2y701ks3fd6khls4i30b906akxqj3l1c15nbblp6xl07bznxw9"; + rev = "2cf02a412a445933f96b43283d38b6f61addbb0a"; + sha256 = "1a4k2394ccz3c25kav3pl7g9s9b19w15pkvrm4svf3hsdxypaky1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26602,12 +26734,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "20170125.228"; + version = "20170728.1101"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; - sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; + rev = "18a603474abb5a786a8d9f20c283d5f7beed3540"; + sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -26704,25 +26836,6 @@ license = lib.licenses.free; }; }) {}; - gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "gap-mode"; - version = "20160204.736"; - src = fetchhg { - url = "https://bitbucket.com/gvol/gap-mode"; - rev = "1de32f2ff384"; - sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/gap-mode"; - sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2"; - name = "gap-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gap-mode"; - license = lib.licenses.free; - }; - }) {}; gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gather"; @@ -26747,12 +26860,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170620.2012"; + version = "20170801.551"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; - sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; + rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b"; + sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -26814,8 +26927,8 @@ src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; - sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; + rev = "dd08e3d83d070eb8d041d66217b4591a55729024"; + sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26831,12 +26944,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170528.336"; + version = "20170708.104"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "a8470934373b2bdd67f38e46e1dd4fb963cee31b"; - sha256 = "17hg6iw3dz1ssxvz1zm8c90927a2sf22yv31g2y7n98jnpq622bs"; + rev = "00efad765a3ace42a2833c65a169d96c7925623b"; + sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26936,12 +27049,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170510.744"; + version = "20170711.1806"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "c7948943155eb712eb5aa1eeae8b50c8bb2eca13"; - sha256 = "0qcwykjpa5424jpkw6s895827ym2cq5rv6j773wksnlbsg0v429v"; + rev = "8579025b9b89c53221c6c608b92a85734ffb0116"; + sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -26999,12 +27112,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20170526.44"; + version = "20170613.1212"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4"; - sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c"; + rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b"; + sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -27066,8 +27179,8 @@ src = fetchFromGitHub { owner = "candera"; repo = "gherkin-mode"; - rev = "d84a2977a536f2f8bf4836aebc33a4e86925673d"; - sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8"; + rev = "ff9e47350c5ba319feb6b87fe20695519681fa64"; + sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode"; @@ -27080,27 +27193,6 @@ license = lib.licenses.free; }; }) {}; - ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: - melpaBuild { - pname = "ghost-blog"; - version = "20160526.257"; - src = fetchFromGitHub { - owner = "javaguirre"; - repo = "ghost-blog-emacs"; - rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3"; - sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog"; - sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj"; - name = "ghost-blog"; - }; - packageRequires = [ markdown-mode ]; - meta = { - homepage = "https://melpa.org/#/ghost-blog"; - license = lib.licenses.free; - }; - }) {}; ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghq"; @@ -27125,16 +27217,16 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170702.512"; + version = "20170803.601"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "magit"; repo = "ghub"; - rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011"; - sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd"; + rev = "887ba91d724c656c35fed3eecd2e7d826553ff91"; + sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; - sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; + sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -27146,12 +27238,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20170517.1445"; + version = "20170819.1806"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423"; - sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn"; + rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085"; + sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27167,12 +27259,12 @@ gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20170603.906"; + version = "20170809.130"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d"; - sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc"; + rev = "573e4a8001e9585d347a99323a1649c2055ae5ff"; + sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -27234,8 +27326,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "git.el"; - rev = "2b523c1975d4f258effaf826656c4b7120b2a19f"; - sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d"; + rev = "a3396a7027a7d986598c6a2d6d5599bac918f3da"; + sha256 = "10siqf21ay6vl1r1v2c93rajzyjc67m4wq9q88pbij0z18vkq2f0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git"; @@ -27335,12 +27427,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170609.2310"; + version = "20170821.1159"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b8d558678821e35450c19e415656e366ebe44c38"; - sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; + rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2"; + sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27881,12 +27973,12 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20170120.22"; + version = "20170710.724"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -27920,6 +28012,27 @@ license = lib.licenses.free; }; }) {}; + gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitpatch"; + version = "20170721.2110"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "gitpatch"; + rev = "577d5adf65c8133caa325c10e89e1e2fc323c907"; + sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch"; + sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1"; + name = "gitpatch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitpatch"; + license = lib.licenses.free; + }; + }) {}; gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; @@ -27941,6 +28054,27 @@ license = lib.licenses.free; }; }) {}; + gl-conf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gl-conf-mode"; + version = "20170714.610"; + src = fetchFromGitHub { + owner = "llloret"; + repo = "gitolite-emacs"; + rev = "9136a9b737e0a5b6471a91571d104c487c43f35b"; + sha256 = "0wls3sfplrf7wkg7g7fxx4s87cvm3p7myxw6k91np6pbfh8p0s9q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; + sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; + name = "gl-conf-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gl-conf-mode"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -28116,8 +28250,8 @@ src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16"; - sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb"; + rev = "d79e519308727dec897f2574c938c6425b9a30c2"; + sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -28154,12 +28288,12 @@ gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot-mode"; - version = "20151122.2339"; + version = "20170727.1339"; src = fetchFromGitHub { owner = "mkmcc"; repo = "gnuplot-mode"; - rev = "296ff8d263513cdfb8e85b06e2441c751565b793"; - sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq"; + rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5"; + sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode"; @@ -28214,6 +28348,27 @@ license = lib.licenses.free; }; }) {}; + gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gnus-select-account"; + version = "20170721.2211"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "gnus-select-account"; + rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce"; + sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account"; + sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx"; + name = "gnus-select-account"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gnus-select-account"; + license = lib.licenses.free; + }; + }) {}; gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-spotlight"; version = "20130901.735"; @@ -28467,12 +28622,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20170501.1058"; + version = "20170718.1046"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; - sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -28509,12 +28664,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170308.1512"; + version = "20170726.555"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; - sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -28597,8 +28752,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; - sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; + rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; + sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -28870,8 +29025,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; - sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; + rev = "62385582b8479bd523a21ffd414acdeaa1a98efb"; + sha256 = "17nlq8jcdlrv1zi0hpmfgakw9g12m7gsnj9p13rg0vx063qfpvfq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28929,12 +29084,12 @@ google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-this"; - version = "20160710.1720"; + version = "20170810.515"; src = fetchFromGitHub { owner = "Malabarba"; repo = "emacs-google-this"; - rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b"; - sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz"; + rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84"; + sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; @@ -28950,12 +29105,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20161206.1408"; + version = "20170713.119"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "52d34c96b400b1b933c727933279f79256951b19"; - sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088"; + rev = "d8b84a8359fcc697114d1298840e9a45b111c974"; + sha256 = "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -29034,12 +29189,12 @@ gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; - version = "20170522.53"; + version = "20170811.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; - rev = "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78"; - sha256 = "0pzzcjc41k3by534ii11jxfind4fq1cv3pqa3scisv4pvyj6lha6"; + rev = "22f54d6c00c48f38a04a74990db501946405c1a8"; + sha256 = "1p69i0w7gbc3fmgwx5mhb30qp7zfgh7sfk7jdvd7270k0nixs7qr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; @@ -29137,12 +29292,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170629.1129"; + version = "20170801.942"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "eecdf6b7aaed40a71eff13c44456d63127e494bc"; - sha256 = "1y7dxd40w5zkp59m0n1ybf128zhpi2wkjbw5v5w0ps7nx782dnzp"; + rev = "d7e841db6909ae5e9eb7493f7b1ea7d7b15101e3"; + sha256 = "00mi0fscfcgw540b1lfq5xlv1cw7zxxr78q5vzfvhdgg3c2d2z7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29158,12 +29313,12 @@ govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "govet"; - version = "20150428.1159"; + version = "20170808.1024"; src = fetchFromGitHub { owner = "meshelton"; repo = "govet"; - rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70"; - sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb"; + rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf"; + sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet"; @@ -29267,8 +29422,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; - sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; + rev = "60e71008db67407de8abf897dbe36cdb66c16e72"; + sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29323,15 +29478,15 @@ license = lib.licenses.free; }; }) {}; - graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: + graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "20161120.938"; + version = "20170810.640"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "bf77248e49b116a241bd5856df918ed63f89e195"; - sha256 = "1rn498l25vjy1wg45iskry8hh2afvd09cmg8dxppphjislw9pwch"; + rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe"; + sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -29344,7 +29499,7 @@ exec-path-from-shell flycheck graphene-meta-theme - ido-ubiquitous + ido-completing-read-plus ppd-sr-speedbar smartparens smex @@ -29405,8 +29560,8 @@ src = fetchFromGitHub { owner = "ppareit"; repo = "graphviz-dot-mode"; - rev = "ca0f15158c3bbd516549532be1dd35bc51462c84"; - sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf"; + rev = "fdaabbcc95d9156e3dadc84f81a4750c5b692580"; + sha256 = "1s1qh5r0xp6hs0rl5yz5mkmjhpg04bh449c7vgjbb1pjsl1dl714"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode"; @@ -29627,12 +29782,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170705.815"; + version = "20170818.241"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; - sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; + rev = "60e71008db67407de8abf897dbe36cdb66c16e72"; + sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29648,12 +29803,12 @@ gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruber-darker-theme"; - version = "20170330.1211"; + version = "20170719.2229"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; - rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa"; - sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a"; + rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e"; + sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; @@ -29690,12 +29845,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170705.1636"; + version = "20170821.1241"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "fff195715b537ac6f13b89034c232a8f33bca45e"; - sha256 = "0l5iwxj0ahn3r2sha4045lwlqi4s8070p1rbiw5fmad3v66i3m3j"; + rev = "d6b8d37f34e0be49b452d6017698afc48b8d61fb"; + sha256 = "0ay8cv4n27rbkcfqxwf20cva6bjzwnf3yvdqg1q6b3cqmvak4mni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29732,12 +29887,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20170509.1134"; + version = "20170713.1934"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "ba505ea5043092444afb4284ae268d37e1c51e54"; - sha256 = "199jf65px1bbybyag5980fa99vjflrfp9s6dcxq1ascszrram0pl"; + rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; + sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -29837,12 +29992,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170702.724"; + version = "20170819.1015"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; - sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; + rev = "2a1c00f81a2fe702e205f99ec4d235dfe468b426"; + sha256 = "069n9226ndgadrdfv64wphnhp0g96q2wcnmwsqfw6iq1xyy08ckl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29858,12 +30013,12 @@ gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; - version = "20161103.1523"; + version = "20170718.1341"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gulp-task-runner"; - rev = "f13da9e619c1838571df0a0462c273ed6e76defc"; - sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r"; + rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb"; + sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; @@ -29879,12 +30034,12 @@ guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; - version = "20160415.1921"; + version = "20170730.31"; src = fetchFromGitHub { owner = "bbatsov"; repo = "guru-mode"; - rev = "81db5611dd29f2c3d9ea91fb7f086a2cf9847553"; - sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs"; + rev = "c180e05ebc1484764aad245c85b69de779826e4e"; + sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode"; @@ -30254,27 +30409,6 @@ license = lib.licenses.free; }; }) {}; - harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: - melpaBuild { - pname = "harvest"; - version = "20160811.1810"; - src = fetchFromGitHub { - owner = "kostajh"; - repo = "harvest.el"; - rev = "384e1ae10dcbdec4a1e2097094a8160507ea46a6"; - sha256 = "1bvgca35gl2daccpmhaa4q166iyaqachyd2k8n9vd6hlbbn4rrgl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest"; - sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd"; - name = "harvest"; - }; - packageRequires = [ hydra s swiper ]; - meta = { - homepage = "https://melpa.org/#/harvest"; - license = lib.licenses.free; - }; - }) {}; haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; @@ -30341,12 +30475,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170704.1445"; + version = "20170810.1519"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; - sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; + rev = "783ea06cab61e16b86bb434d3c8a61076f564bb7"; + sha256 = "0ypb3qilcnphxhsaskib5h8n4m2ivwka116jnjpdjrgwh838aakp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30383,11 +30517,11 @@ haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-tab-indent"; - version = "20151205.1159"; + version = "20170701.258"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; - rev = "93ea6a3a707fc34a97ce94e0285e9569e01062c4"; - sha256 = "04698q2c75bbbcib94zdjkmm2k0zlxxzhnd34fflhzzxljcr02cj"; + rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853"; + sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent"; @@ -30407,8 +30541,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d"; - sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n"; + rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785"; + sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30421,6 +30555,27 @@ license = lib.licenses.free; }; }) {}; + hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "hasky-stack"; + version = "20170818.2201"; + src = fetchFromGitHub { + owner = "hasky-mode"; + repo = "hasky-stack"; + rev = "e256e50fce9a65cad1754d863d9ed969b159cefe"; + sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; + sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8"; + name = "hasky-stack"; + }; + packageRequires = [ emacs f magit-popup ]; + meta = { + homepage = "https://melpa.org/#/hasky-stack"; + license = lib.licenses.free; + }; + }) {}; haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "haste"; @@ -30610,12 +30765,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170705.2232"; + version = "20170821.954"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; - sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; + rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3"; + sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30778,12 +30933,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20170625.328"; + version = "20170807.1239"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -30820,12 +30975,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170321.1306"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; - sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30929,8 +31084,8 @@ src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-bundle-show"; - rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"; - sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30"; + rev = "850fecb36f609f1dfd5d20ca0170c9a6b7f90ab9"; + sha256 = "06xi91dy88qnqwqsknhf695324vsiz1vn2fmwl6llywa03k0xnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show"; @@ -30988,12 +31143,12 @@ helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-charinfo"; - version = "20170611.1746"; + version = "20170810.531"; src = fetchFromGitHub { owner = "mandoku"; repo = "helm-charinfo"; - rev = "a4902a90bd9f012468ad8186e2548c7814847613"; - sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp"; + rev = "91798a49dc115342a7e01e48b264e9a0bf5ea414"; + sha256 = "1ifj6zz5k7qjalg06fvfc7rdmlha0n9hll2hiq7mrcj7lfac6jga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo"; @@ -31051,12 +31206,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20170617.2254"; + version = "20170708.1525"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "7dafd5ba9c961ef22fd3ba617f13a411034f68be"; - sha256 = "01wabgaka3mjllmqm117rv28jxmcp1znaxbgrabgcndhgyd7ycyb"; + rev = "9480e969d5387efdd5e66c6db089e02a296b2025"; + sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -31219,12 +31374,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170701.629"; + version = "20170821.1152"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; - sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; + rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3"; + sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31279,27 +31434,6 @@ license = lib.licenses.free; }; }) {}; - helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }: - melpaBuild { - pname = "helm-ctest"; - version = "20150823.408"; - src = fetchFromGitHub { - owner = "danlamanna"; - repo = "helm-ctest"; - rev = "973a138aa8ff4c6a1cd798779e8d0dd80522354d"; - sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03e17f3700cc531133990bc78ade09132f439664/recipes/helm-ctest"; - sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm"; - name = "helm-ctest"; - }; - packageRequires = [ dash helm-core s ]; - meta = { - homepage = "https://melpa.org/#/helm-ctest"; - license = lib.licenses.free; - }; - }) {}; helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; @@ -31384,6 +31518,27 @@ license = lib.licenses.free; }; }) {}; + helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-directory"; + version = "20170705.2102"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-directory"; + rev = "29f05c87046f9a04329f817e9d7489a290a2592a"; + sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; + sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; + name = "helm-directory"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-directory"; + license = lib.licenses.free; + }; + }) {}; helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; @@ -31447,6 +31602,27 @@ license = lib.licenses.free; }; }) {}; + helm-elscreen = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-elscreen"; + version = "20170709.214"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-elscreen"; + rev = "b8212866939dc4a1e1dc23ad572407b688e130e3"; + sha256 = "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb/recipes/helm-elscreen"; + sha256 = "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd"; + name = "helm-elscreen"; + }; + packageRequires = [ cl-lib elscreen emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-elscreen"; + license = lib.licenses.free; + }; + }) {}; helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emmet"; @@ -31748,8 +31924,8 @@ src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-ghq"; - rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56"; - sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn"; + rev = "49481685adbb25b3f766aabfdb7472becc673a94"; + sha256 = "1gxb4cqfzkdag8v6id7bvlv0bvqbfl8mdxphll4pkf1nqj9fk69j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq"; @@ -31762,6 +31938,27 @@ license = lib.licenses.free; }; }) {}; + helm-ghs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-ghs"; + version = "20170714.2241"; + src = fetchFromGitHub { + owner = "iory"; + repo = "emacs-helm-ghs"; + rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f"; + sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs"; + sha256 = "0bzy2vr2h9c886cm4gd161n7laym952bzy5fhcibafhzm4abl4sh"; + name = "helm-ghs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-ghs"; + license = lib.licenses.free; + }; + }) {}; helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-git"; @@ -31874,8 +32071,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -31912,12 +32109,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20170509.244"; + version = "20170722.710"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b"; - sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg"; + rev = "4530a375a46880d53e5d7e906028f71c040de946"; + sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -31996,12 +32193,12 @@ helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hatena-bookmark"; - version = "20160528.614"; + version = "20170821.646"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; - rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb"; - sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2"; + rev = "ee0d2554f573779210b0e2595e539b3e28461f1d"; + sha256 = "12qb9jnqa2nl3asfa178ijjrrxkrwddlxf6y6m0d79j2fnqrgbr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; @@ -32245,6 +32442,48 @@ license = lib.licenses.free; }; }) {}; + helm-kythe = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-kythe"; + version = "20170709.26"; + src = fetchFromGitHub { + owner = "MaskRay"; + repo = "emacs-helm-kythe"; + rev = "eabbef4948f8ec7c7b2fac498e9145dfdb10ca82"; + sha256 = "1ws7vl0pvznmxb7yj77kfv4l52xkzblhsl68lfkf9cdxcj9g6177"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1a6d0b08ad750a0e44ebdf76109d29ab226bd3/recipes/helm-kythe"; + sha256 = "1yybpic3jzp3yy8xlfdn2jj12h087vn0lj3mqx6xxj2nxd9q4949"; + name = "helm-kythe"; + }; + packageRequires = [ dash emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-kythe"; + license = lib.licenses.free; + }; + }) {}; + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + melpaBuild { + pname = "helm-lastpass"; + version = "20170808.511"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "helm-lastpass"; + rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2"; + sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; + sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; + name = "helm-lastpass"; + }; + packageRequires = [ csv emacs helm-core ]; + meta = { + homepage = "https://melpa.org/#/helm-lastpass"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -32269,12 +32508,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170601.2200"; + version = "20170727.1238"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "1253c7615da055a95548b4f92a8a503fe249884e"; - sha256 = "1zyix2whj9j19ica9pff1hh7vgyg1h009vx5xhcqw5sligrh2dwr"; + rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; + sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -32520,12 +32759,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170518.312"; + version = "20170807.611"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed"; - sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif"; + rev = "1db8ee9b6c1f8341612216e715b048ab225dedec"; + sha256 = "0z9pcrb4xazv2a2m2kxy26kw0ai1lfnj53y967y40mrkbmsrsa6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32835,12 +33074,12 @@ helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-qiita"; - version = "20160528.611"; + version = "20170821.609"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; - rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a"; - sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq"; + rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895"; + sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; @@ -33024,12 +33263,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "20170522.2154"; + version = "20170812.2111"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33318,12 +33557,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170616.1725"; + version = "20170708.320"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "a4c267aef5a3344bd4d76b6b6cf13e120cbe002e"; - sha256 = "13r4s6k0yxp3z68756sni27l7lmlfhdz3hx021w7lhn4np69i299"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33381,12 +33620,12 @@ helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: melpaBuild { pname = "helm-w3m"; - version = "20150722.824"; + version = "20170710.1238"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-w3m"; - rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a"; - sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz"; + rev = "0af89108183ac11dcf75be06fe23a60ae072463f"; + sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; @@ -33465,12 +33704,12 @@ helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xref"; - version = "20170425.1440"; + version = "20170725.546"; src = fetchFromGitHub { owner = "brotzeitmacher"; repo = "helm-xref"; - rev = "cd458044be2cec95f31f0ac318b0f80f4b92785b"; - sha256 = "0lx2xrkwrbzkbs26gwksdqpywcsfsi3d4g2mw1h8aabd12hnr4my"; + rev = "3197a66a605afa42957781cc7f97f6c614ecf02a"; + sha256 = "0nr4yg44qqr5ga8h1hc143953iyyswp2l9bfb5b5wwwzz42iz5cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref"; @@ -33585,12 +33824,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170625.1441"; + version = "20170722.522"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "da7d479c89090155996bf568bd89fa8a8859eac7"; - sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2"; + rev = "d167ee6fd4fbaadc46aa50a96529dc234a4c37c2"; + sha256 = "04r090757jcaljr0bfvxjm45wf201cn04cr467ryh9k92gravlfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33896,8 +34135,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; - sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; + rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc"; + sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -34071,6 +34310,27 @@ license = lib.licenses.free; }; }) {}; + highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight-function-calls"; + version = "20170819.2025"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "highlight-function-calls"; + rev = "ab017fe1f6576c7183fe297cf4a77d370d0db426"; + sha256 = "1jf7gln3fxfz3d0crr5jawlpi0ccazlahdmm5s1jb90b53rx40nx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls"; + sha256 = "0wmxijkhx74da3ygnvzsdvbh2iii4f7424wmm01b5skbr7qva690"; + name = "highlight-function-calls"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/highlight-function-calls"; + license = lib.licenses.free; + }; + }) {}; highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; @@ -34137,12 +34397,12 @@ highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "highlight-numbers"; - version = "20160717.1228"; + version = "20170815.1412"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-numbers"; - rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa"; - sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8"; + rev = "444614973a4af7c9ad2431bdaa2005d95db41ee7"; + sha256 = "0f8sczh4vm18qq9w350jzd5gigqai3m00khw4b9j85v85czx4p7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; @@ -34178,12 +34438,12 @@ highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-parentheses"; - version = "20151107.2316"; + version = "20170809.1151"; src = fetchFromGitHub { owner = "tsdh"; repo = "highlight-parentheses.el"; - rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f"; - sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r"; + rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1"; + sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses"; @@ -34362,6 +34622,27 @@ license = lib.licenses.free; }; }) {}; + himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: + melpaBuild { + pname = "himp"; + version = "20170814.1215"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "himp"; + rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec"; + sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp"; + sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla"; + name = "himp"; + }; + packageRequires = [ emacs vimish-fold ]; + meta = { + homepage = "https://melpa.org/#/himp"; + license = lib.licenses.free; + }; + }) {}; hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; @@ -34369,8 +34650,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "f4c463b99433d191b496055206552878e861f402"; - sha256 = "1dq93rk33p35slkcpsw6lyyd18hd7zdll288riwkh7y4wdcbp5l8"; + rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b"; + sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34407,12 +34688,12 @@ hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-expand-slime"; - version = "20170317.0"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; - rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4"; - sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl"; + rev = "39bbae94896a62854d31754debdfae71d35fec62"; + sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; @@ -34449,12 +34730,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170630.1054"; + version = "20170722.1714"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; - sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; + rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; + sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34634,12 +34915,12 @@ hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20140802.920"; + version = "20170812.646"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; - rev = "45e3cc525ba636c0f22baa6d0938d9808622bc89"; - sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs"; + rev = "1235ec94af083c3e43559ce0cac6db485aa938e0"; + sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; @@ -34716,12 +34997,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170705.1355"; + version = "20170807.1130"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "67d52175fbc5a194367e421a33ff4359a0ee016d"; - sha256 = "11l13j9j3bh7p1hprlpvjc8ir8643d7px4a89rpwa2m70z9v0skp"; + rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e"; + sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34737,15 +35018,15 @@ hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hlint-refactor"; - version = "20151124.1241"; + version = "20170817.2148"; src = fetchFromGitHub { owner = "mpickering"; repo = "hlint-refactor-mode"; - rev = "695d39b3434a5e35fab70aa5251f824ffaa30d6b"; - sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp"; + rev = "92c69aa01c65968e86c15db087bb1ea785e4736c"; + sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/79363587b07f68e30a98698fd33ab39153bcb06c/recipes/hlint-refactor"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor"; sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq"; name = "hlint-refactor"; }; @@ -35134,12 +35415,12 @@ http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "http-post-simple"; - version = "20131010.2058"; + version = "20170715.240"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "http-post-simple"; - rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f"; - sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns"; + rev = "f53697fca278c741051aeb668b00466b5e0fd3fe"; + sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple"; @@ -35365,12 +35646,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170325.815"; + version = "20170813.1058"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "38ce88a9c3be11b0431080078095159b2211ca7a"; - sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj"; + rev = "b4fb3298cd071d56aa9a5fc6be51ae9871ad451e"; + sha256 = "127l60rm1dhq1l5cwsnc5i2vh7xfzdagwlhy4wmjm22xs1ms6kn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -35468,12 +35749,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20170410.1452"; + version = "20170721.1823"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "a004cd0121ab15a00311631289fc6a8c7a86a897"; - sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az"; + rev = "d99fb0d918f13664856178402efe64b4b237648b"; + sha256 = "1rlicnrjs8nmha90i9d4z4ps5dskry08rj5sa3ax2igxwbq1z4w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -35551,10 +35832,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170704.1507"; + version = "20170811.1012"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087"; - sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; + url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089"; + sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; name = "icicles.el"; }; recipeFile = fetchurl { @@ -35755,22 +36036,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170705.1656"; + version = "20170819.1045"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "e8c2716cb38067d23f35666be83323267e692618"; - sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; + repo = "ido-completing-read-plus"; + rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; + sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs memoize s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -35800,12 +36081,12 @@ ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-exit-target"; - version = "20150904.737"; + version = "20170717.1151"; src = fetchFromGitHub { owner = "waymondo"; repo = "ido-exit-target"; - rev = "322520c665284ce6547eb9dcd3aa888a02a51489"; - sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x"; + rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73"; + sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target"; @@ -36031,12 +36312,12 @@ ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-sort-mtime"; - version = "20131117.530"; + version = "20170705.712"; src = fetchFromGitHub { owner = "pkkm"; repo = "ido-sort-mtime"; - rev = "7b7c77f6856125a59aff99ba0ff8d2b369896b5e"; - sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd"; + rev = "5f4ec2c562f79b7fb2d1480c88db1fa8a812d814"; + sha256 = "1fqqkpz0x3q7fqmax90vxkpn14valkb0lprqs0w641cbq8a4wqm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime"; @@ -36073,16 +36354,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170705.1656"; + version = "20170819.1045"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "e8c2716cb38067d23f35666be83323267e692618"; - sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; + repo = "ido-completing-read-plus"; + rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; + sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -36157,12 +36438,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170703.2038"; + version = "20170722.1339"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3"; - sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8"; + rev = "5c01039112a8c52a0275560575f1f542f3966cf5"; + sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36178,16 +36459,16 @@ ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ids-edit"; - version = "20170628.810"; + version = "20170818.802"; src = fetchFromGitHub { owner = "kawabata"; repo = "ids-edit"; - rev = "3c133ce0074274bb6cf70566ba68a14047cdd61e"; - sha256 = "00rrxdlr6wrkdwwl2ivsydblar6vhawvrf8f7cb62396z70xhrpi"; + rev = "8562a6cbfb3f2d44bc6f62ab15081a80f8fee502"; + sha256 = "10h64c5n9piq9ly7ipqq33ji8x8vwh9j1h7r05yab8a2sn0h8587"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit"; - sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ids-edit"; + sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1"; name = "ids-edit"; }; packageRequires = [ emacs ]; @@ -36426,12 +36707,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "20160831.356"; + version = "20170805.1155"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -36447,12 +36728,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "20170215.125"; + version = "20170728.632"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f"; - sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7"; + rev = "27170d27c9594989587c03c23f753a809f6a0e10"; + sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -36505,27 +36786,6 @@ license = lib.licenses.free; }; }) {}; - imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }: - melpaBuild { - pname = "imgix"; - version = "20141226.1332"; - src = fetchFromGitHub { - owner = "imgix"; - repo = "imgix-emacs"; - rev = "4906ff0b4f7c9e84a5beb81630fe6d522ec91eaa"; - sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix"; - sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg"; - name = "imgix"; - }; - packageRequires = [ cl-lib dash ht json s ]; - meta = { - homepage = "https://melpa.org/#/imgix"; - license = lib.licenses.free; - }; - }) {}; imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imgur"; @@ -36658,8 +36918,8 @@ src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; - sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -36696,12 +36956,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170608.647"; + version = "20170803.418"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7"; - sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8"; + rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a"; + sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -36735,22 +36995,30 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170626.312"; + version = "20170818.1523"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "4747a94cf823deb5623368f71f2012f8c5fdc156"; - sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5"; + rev = "0bb43ddcf0e206d5144ce412c63a106556224fd0"; + sha256 = "1g23y9j3inzl7fdyzcpn02r7fva0x6g4j8pcjjimpwi3z8h6aswm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ company emacs js2-mode seq websocket ]; + packageRequires = [ + company + emacs + js2-mode + memoize + seq + sourcemap + websocket + ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -36780,12 +37048,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170705.305"; + version = "20170809.114"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "9fa8f37a7be33337ab0e865b1718bbb81eea295a"; - sha256 = "1h6637sa83jckswp81682yis5srhaj02r6ycxzcc1ngfap3mkks7"; + rev = "21d3e978652bcbb995954bf95e80c0ee4669701a"; + sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36819,27 +37087,6 @@ license = lib.licenses.free; }; }) {}; - inf-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: - melpaBuild { - pname = "inf-php"; - version = "20130414.21"; - src = fetchFromGitHub { - owner = "taksatou"; - repo = "inf-php"; - rev = "4396022d6e169f0cf30cd9f68ca575d8b30c418a"; - sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da48d14bd46f25976f7109306f335bd57b237ee5/recipes/inf-php"; - sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d"; - name = "inf-php"; - }; - packageRequires = [ php-mode ]; - meta = { - homepage = "https://melpa.org/#/inf-php"; - license = lib.licenses.free; - }; - }) {}; inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; @@ -36847,8 +37094,8 @@ src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "c14a68d1643ac3f439234da6a8275b48cae970d3"; - sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk"; + rev = "674a2a837fccea88ada6634e981a656b41d16d8e"; + sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -36926,10 +37173,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170303.1500"; + version = "20170810.1125"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz"; + sha256 = "0nr9d2rqipbz2p30f1bmg10mbnndxqx9k6jj1qkmijhzzbk5w36l"; name = "info+.el"; }; recipeFile = fetchurl { @@ -36943,27 +37190,6 @@ license = lib.licenses.free; }; }) {}; - inform7-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: - melpaBuild { - pname = "inform7-mode"; - version = "20131009.2354"; - src = fetchFromGitHub { - owner = "fred-o"; - repo = "inform7-mode"; - rev = "42458733947f2fbd44bc78f7264be247a5d8980b"; - sha256 = "19kc6a8jkx22rg9xp862pqfhv0an7q6fs7v7i2kxp3ji55aq001w"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/inform7-mode"; - sha256 = "0fpnf9rgizsfz9pn06k87v4s0dr7z1pn0gdxfi6hnnv68qni8hg3"; - name = "inform7-mode"; - }; - packageRequires = [ sws-mode ]; - meta = { - homepage = "https://melpa.org/#/inform7-mode"; - license = lib.licenses.free; - }; - }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -37013,8 +37239,8 @@ src = fetchFromGitHub { owner = "emacs-jp"; repo = "init-loader"; - rev = "287da99eadfa3dd85492506db43d68324069b593"; - sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj"; + rev = "5d3cea1004c11ff96b33020e337b03b925c67c42"; + sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader"; @@ -37093,12 +37319,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20170602.1000"; + version = "20170709.1858"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "d9e97a2b95a7740c8eb72fa795fface8b1500fd0"; - sha256 = "1c8zl512c5mw126p43l6prdimfn2mi58msb0sw4csf9r1krkv8if"; + rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5"; + sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -37111,27 +37337,6 @@ license = lib.licenses.free; }; }) {}; - inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "inline-crypt"; - version = "20130409.507"; - src = fetchFromGitHub { - owner = "Sodel-the-Vociferous"; - repo = "inline-crypt-el"; - rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282"; - sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt"; - sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n"; - name = "inline-crypt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/inline-crypt"; - license = lib.licenses.free; - }; - }) {}; inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inline-docs"; @@ -37302,12 +37507,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170615.104"; + version = "20170812.1029"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "fe791fbefa4689c944a00a356b331ed0516c5cfe"; - sha256 = "10d9w4hp5hhbvbhbd605vpvzw0vhg862ikwjchq6jyly80kf3a60"; + rev = "1c34f8e858eb11493078ca222fd0f598cf9f1e26"; + sha256 = "115pqqyhinjpcjh1sigwcbqinwcslk19qmqxwxpwfka62j8c22x1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37362,6 +37567,27 @@ license = lib.licenses.free; }; }) {}; + inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inverse-acme-theme"; + version = "20170716.1100"; + src = fetchFromGitHub { + owner = "dcjohnson"; + repo = "inverse-acme-theme"; + rev = "361a8840469648a9b98f16cc996df5f151d3c75f"; + sha256 = "1dvaz36037wvh00m3ddqfp9w86pna3k058xw22i4xcdhp1518i03"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; + sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; + name = "inverse-acme-theme"; + }; + packageRequires = [ autothemer cl-lib ]; + meta = { + homepage = "https://melpa.org/#/inverse-acme-theme"; + license = lib.licenses.free; + }; + }) {}; io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "io-mode"; @@ -37509,6 +37735,27 @@ license = lib.licenses.free; }; }) {}; + iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "iqa"; + version = "20170722.834"; + src = fetchFromGitHub { + owner = "a13"; + repo = "iqa.el"; + rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a"; + sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa"; + sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4"; + name = "iqa"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/iqa"; + license = lib.licenses.free; + }; + }) {}; ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ir-black-theme"; @@ -37573,12 +37820,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170627.1045"; + version = "20170821.1300"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f"; - sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i"; + rev = "f58f36253b697d2b3183f1a0b73a8a3af89360ef"; + sha256 = "0509np04cw6sqlwgn837fjb4q0n48s481nv4mc2rngix5pjfpx3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37635,10 +37882,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170614.928"; + version = "20170723.1826"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl"; + sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr"; name = "isearch+.el"; }; recipeFile = fetchurl { @@ -37734,6 +37981,27 @@ license = lib.licenses.free; }; }) {}; + isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "isortify"; + version = "20170726.1254"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "isortify"; + rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f"; + sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; + sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs"; + name = "isortify"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/isortify"; + license = lib.licenses.free; + }; + }) {}; iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iss-mode"; @@ -37758,12 +38026,12 @@ itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itail"; - version = "20161022.1431"; + version = "20170709.1543"; src = fetchFromGitHub { owner = "re5et"; repo = "itail"; - rev = "129d7089fcf712c296706841afc5918955a83f19"; - sha256 = "0jllp27syd533raj7lqfj5ismm7g7f4av9ikgqar8048m3xkvy2q"; + rev = "a8c98583cbc4e2b761df95fd738efebb116fe6e6"; + sha256 = "001i7xn6v8j3ls50cnsazjfkpzdnr01rb98a6h0nibkj8hi21myb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail"; @@ -37821,15 +38089,15 @@ ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }: melpaBuild { pname = "ivariants"; - version = "20140720.2127"; + version = "20170818.739"; src = fetchFromGitHub { owner = "kawabata"; repo = "emacs-ivariants"; - rev = "f9deff2e6fba5647f69771546fb2283136d0fb0d"; - sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si"; + rev = "c056850745fcfa1e20aed9f6a7378869c623b5c7"; + sha256 = "19dw5gg8zb27m5j7iwqzzbbbqy5nl6zysx0a1mv8fp68psapl0ln"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4caff7dc7c8b328c21a3c3cb51c505c21f044ee7/recipes/ivariants"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants"; sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw"; name = "ivariants"; }; @@ -37842,15 +38110,15 @@ ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivs-edit"; - version = "20140720.346"; + version = "20170818.741"; src = fetchFromGitHub { owner = "kawabata"; repo = "ivs-edit"; - rev = "c496e85f93f6f00e723d9df0ea0703f6c672826b"; - sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva"; + rev = "5db39c234aa7393b591168a4fd0a9a4cbbca347d"; + sha256 = "1sdl83cf87zbv0ynvb6qlgbpm4d3dqhdn84jhhs5j247r5qzhmz6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fd59ccf003a7fc4165dc7e34c1648e85abe378f/recipes/ivs-edit"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivs-edit"; sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2"; name = "ivs-edit"; }; @@ -37863,12 +38131,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170703.2350"; + version = "20170817.1000"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; - sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; + rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f"; + sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37884,12 +38152,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170321.1306"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; - sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37926,12 +38194,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170704.1238"; + version = "20170709.2151"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "b0407466a1e6dc23150663757f6b48e14cc5290a"; - sha256 = "0wapfnz7l32qc93xbx64bd42v4b4dav3288ij3pc7r03r4by02m4"; + rev = "acd6322571cb0820868a6febdc5326782a29b729"; + sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37951,8 +38219,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -37968,12 +38236,12 @@ ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-historian"; - version = "20170416.2154"; + version = "20170715.2120"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; - sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; + rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; + sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -37993,8 +38261,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; - sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; + rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f"; + sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38028,6 +38296,27 @@ license = lib.licenses.free; }; }) {}; + ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }: + melpaBuild { + pname = "ivy-pass"; + version = "20170812.1255"; + src = fetchFromGitHub { + owner = "ecraven"; + repo = "ivy-pass"; + rev = "5b523de1151f2109fdd6a8114d0af12eef83d3c5"; + sha256 = "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass"; + sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci"; + name = "ivy-pass"; + }; + packageRequires = [ emacs ivy password-store ]; + meta = { + homepage = "https://melpa.org/#/ivy-pass"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -38052,12 +38341,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20170517.554"; + version = "20170716.1924"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "9c36765a941b88c3aa0f4739ad2cb7207c453575"; - sha256 = "09m2m6nrgcpzyam50y3snir3dya1mif8c0miv77hkqa2w2ijxiq9"; + rev = "84964443f9a3ded1676190e9e0f91dac4557cc21"; + sha256 = "1gsf3klcrmabalfywxv5pffpbgw9nw90plc5xxq6a01f7b46rp7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -38077,8 +38366,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38136,12 +38425,12 @@ ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: melpaBuild { pname = "ivy-youtube"; - version = "20170217.404"; + version = "20170818.1432"; src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "7e916dd531c52a2809188a99716aeff8446056cc"; - sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q"; + rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d"; + sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; @@ -38446,27 +38735,6 @@ license = lib.licenses.free; }; }) {}; - jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "jaunte"; - version = "20130413.219"; - src = fetchFromGitHub { - owner = "kawaguchi"; - repo = "jaunte.el"; - rev = "b719c2d4d5d70640d70978b661863d10d6be06fc"; - sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/jaunte"; - sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf"; - name = "jaunte"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/jaunte"; - license = lib.licenses.free; - }; - }) {}; java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "java-imports"; @@ -38596,12 +38864,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20170413.901"; + version = "20170816.754"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "ee3c3b95e4a8697438d48757c604f9491b395417"; - sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav"; + rev = "19a09bebc20fc981e77950e8495162de49c824ae"; + sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -38764,12 +39032,12 @@ jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "jenkins"; - version = "20160903.1556"; + version = "20170721.236"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "jenkins.el"; - rev = "8a3c1849fcbac379ea88ba1c14f3a63bb9dd3244"; - sha256 = "1dd7qmkdarrfm0gf115c2m2913jn7yv2ns0ic1ywq7b9v547i9cz"; + rev = "1ec967973db685c9d84133ec6a5e06489ce06b62"; + sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins"; @@ -38806,12 +39074,12 @@ jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; - version = "20160216.2035"; + version = "20170808.1830"; src = fetchFromGitHub { owner = "jeffgran"; repo = "jg-quicknav"; - rev = "1b598ee3d691b68dc64f1727a959eab538893d07"; - sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4"; + rev = "c8d53e774d63e68a944092c08a026b57da741038"; + sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav"; @@ -39035,12 +39303,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20170627.1952"; + version = "20170808.527"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; - sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; + rev = "eb4744122724b24e492c2171fff438e3ee2045a8"; + sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -39119,12 +39387,12 @@ js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-closure"; - version = "20160715.1536"; + version = "20170816.1218"; src = fetchFromGitHub { owner = "jart"; repo = "js2-closure"; - rev = "2b99540f43ddae123014d0fe20c66f5b536312cd"; - sha256 = "0f280vk7mhslra793183jmi72hlhiq5mgjd0f0b6hr0gyj3iszb0"; + rev = "f59db386d7d0693935d0bf52babcd2c203c06d04"; + sha256 = "09zfmxi9m883lzsafnws06ifpq92b2i9q05pxk085vgkdpq35nss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; @@ -39161,12 +39429,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170624.1249"; + version = "20170815.1415"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "558f53f6b6749b09b03b858b0b1dfaeffbba4042"; - sha256 = "1wr6hbd02raccvwqvy02va4hanjhqxpg418a7zxzjqj5mf1lj5nn"; + rev = "df51992a648c7fb3e441106defdbffa2ef2f020d"; + sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39186,8 +39454,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "01a8d98958b8c546a6a9eb3b339a1dee864684fa"; - sha256 = "09pap1r9aiif8rmmzpw01154iravsmqw8msbdrxgbqlpndcaqnmi"; + rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf"; + sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -39266,12 +39534,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20170619.1701"; + version = "20170719.2205"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966"; - sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3"; + rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4"; + sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -39453,12 +39721,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170607.537"; + version = "20170710.538"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "f591c6d42e493d51f1522fd0449d6a62881adfad"; - sha256 = "1wjbvwfdish673y5qjr3r8w935dv1cz8j0sv8dmd2i6w5wf5d1qb"; + rev = "edaaff2e971a527460f838bebc0ef679f9a571b0"; + sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -39471,6 +39739,27 @@ license = lib.licenses.free; }; }) {}; + julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "julia-repl"; + version = "20170708.2324"; + src = fetchFromGitHub { + owner = "tpapp"; + repo = "julia-repl"; + rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0"; + sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; + sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn"; + name = "julia-repl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/julia-repl"; + license = lib.licenses.free; + }; + }) {}; julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "julia-shell"; @@ -39495,12 +39784,12 @@ jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jumblr"; - version = "20140908.1352"; + version = "20170727.1343"; src = fetchFromGitHub { owner = "mkmcc"; repo = "jumblr"; - rev = "705c7286e09a307b2b7f60072a12ed45325657c0"; - sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j"; + rev = "34533dfb9db8538c005f4eaffafeff7ed193729f"; + sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr"; @@ -39576,6 +39865,27 @@ license = lib.licenses.free; }; }) {}; + jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jump-tree"; + version = "20170819.2137"; + src = fetchFromGitHub { + owner = "yangwen0228"; + repo = "jump-tree"; + rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7"; + sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; + sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj"; + name = "jump-tree"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/jump-tree"; + license = lib.licenses.free; + }; + }) {}; jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jumplist"; @@ -39702,6 +40012,48 @@ license = lib.licenses.free; }; }) {}; + kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope"; + version = "20170808.117"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope"; + sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp"; + name = "kaleidoscope"; + }; + packageRequires = [ s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope"; + license = lib.licenses.free; + }; + }) {}; + kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope-evil-state-flash"; + version = "20170728.320"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash"; + sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq"; + name = "kaleidoscope-evil-state-flash"; + }; + packageRequires = [ evil kaleidoscope s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope-evil-state-flash"; + license = lib.licenses.free; + }; + }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; version = "20170418.110"; @@ -39745,12 +40097,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170618.919"; + version = "20170802.1135"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "06ab7e6c00d6a176712f27b583fea3823c6c360e"; - sha256 = "141hjj56vax24mjkr0y0h51fc8wk7gjzknljwibaiwbmx9fyfm7f"; + rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3"; + sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -40148,8 +40500,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; - sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; + rev = "415de48695efd30163a015063873b03f4ca5b743"; + sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40253,8 +40605,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "ae8f3a2dfccdf4495c137163e5e68b9130fee34e"; - sha256 = "04nik71cd3cnx41rz0nhwkk41nx7r0x63ldf4rihz6q1h43zxpzv"; + rev = "5b9a1c94e36e38500d72379b50e091e5aca522a6"; + sha256 = "0si4xbqz5pcwrikawwjp9yjcrfi1fpiarfnym0c9pbrdr77a8mv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40333,12 +40685,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170512.950"; + version = "20170818.2206"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "fe750b9f71e9970e2f1331aabc31d7b6dc8a41d2"; - sha256 = "1w05yp3qwrpdb43h4iz4mkn92bsqbx137a83qyz6vgl95rpj7b9j"; + rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab"; + sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -40501,12 +40853,12 @@ ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ksp-cfg-mode"; - version = "20160521.1333"; + version = "20170724.1127"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "07a957512e66030e1b9f8ac0f259051386acb5b5"; - sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr"; + rev = "713a22ee28688e581ec3ad60228c853b516a14b6"; + sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; @@ -40564,12 +40916,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20161016.1827"; + version = "20170808.602"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a"; - sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7"; + rev = "3e8b63e89e294179e42a14a4a357c29a72669a22"; + sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -40751,12 +41103,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170418.1102"; + version = "20170801.1214"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "ff05ae82b1073759989616caf362c85575fdfc58"; - sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs"; + rev = "a2c94ff358db43a977d02032ba84ee1008579522"; + sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -40772,12 +41124,12 @@ latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; - version = "20160328.1721"; + version = "20170816.1847"; src = fetchFromGitHub { owner = "Malabarba"; repo = "latex-extra"; - rev = "9e89c5548298394aa47a5087a8e79655105a6f3d"; - sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9"; + rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5"; + sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; @@ -40939,12 +41291,12 @@ lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lavender-theme"; - version = "20141115.2302"; + version = "20170808.613"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-lavender-theme"; - rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee"; - sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k"; + rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c"; + sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme"; @@ -41023,12 +41375,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170702.200"; + version = "20170714.1529"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "9dca096255f7ca92ff887d70b6c4c67ce3374ff1"; - sha256 = "0k63sad7w1gym3l5p0hfnwjhj8a0ic59z6g1zf3j10752439bsx3"; + rev = "f4abac98adfe747c93abd4398dac3aafa33a816c"; + sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41209,15 +41561,36 @@ license = lib.licenses.free; }; }) {}; + letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "letterbox-mode"; + version = "20170701.1825"; + src = fetchFromGitHub { + owner = "pacha64"; + repo = "letterbox-mode"; + rev = "88c67a51d67216d569a28e8423200883fde096dd"; + sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode"; + sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda"; + name = "letterbox-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/letterbox-mode"; + license = lib.licenses.free; + }; + }) {}; leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170508.1319"; + version = "20170818.250"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e"; - sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3"; + rev = "26fbd23d7417ae59e2d034d1873d97418d462268"; + sha256 = "184k26i3f69nas5iqzlmbd3b4414dvs3xshnj689w58p08qsqgcl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -41594,12 +41967,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170623.1046"; + version = "20170813.913"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "5aab7fa4fcd42d2f73d226843b4247d61ad917ba"; - sha256 = "1fkkp483bhk560h7jv1ppr5x39nghh8va7fnnr36br6fdn53c7ki"; + rev = "15017ccd229644a3b253937f2bb5e1420f197d6f"; + sha256 = "1lldyv3ixgy3rsxyp6rfz5427vd9bds90rzvjxf747hn5ws6m110"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41615,12 +41988,12 @@ lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lispyscript-mode"; - version = "20130828.719"; + version = "20170720.1217"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "lispyscript-mode"; - rev = "d0e67ee734919d7ff14c72712e909149cb9604bd"; - sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf"; + rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f"; + sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode"; @@ -41929,12 +42302,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170528.2030"; + version = "20170805.1249"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; - sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; + rev = "467285fa70dc5f349f2deb0d2950df037fb89f2d"; + sha256 = "0sm2k5988rf0q1zwqsnklx5p7wp4wrma0h11q7jd8j7v8vniqryz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41950,16 +42323,16 @@ lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lively"; - version = "20160208.1035"; + version = "20170820.407"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "purcell"; repo = "lively"; - rev = "12df5ccaec03670de87c01b0b4cd3e2b96e0738a"; - sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp"; + rev = "49cf43815c04f0b84d20b527f5d712544a13a4db"; + sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/lively"; - sha256 = "0qnyqlhqmmfq2f47zmy29hn6wqrx5yvsax8kn63nmxw380gw1z18"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; + sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g"; name = "lively"; }; packageRequires = []; @@ -42036,13 +42409,13 @@ pname = "llvm-mode"; version = "20150910.644"; src = fetchgit { - url = "http://llvm.org/git/llvm"; - rev = "45bbe61cd4d8950d8f91e2c9efd6d36c7e4245e2"; - sha256 = "0dzpdjg7yrbvkmx0nfn3wgs0bi5j38k6js75axxfpgk1jp4l8x8a"; + url = "https://llvm.org/git/llvm"; + rev = "854f9175285330ee09ccb5a3ff448bd6883111f3"; + sha256 = "0z1kvki59hl0flqhx1p2vsgnxhxyifphp840sgzs7v56dw8bdjb1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; - sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; + sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb"; name = "llvm-mode"; }; packageRequires = []; @@ -42051,6 +42424,26 @@ license = lib.licenses.free; }; }) {}; + lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lms"; + version = "20170804.922"; + src = fetchhg { + url = "https://bitbucket.com/inigoserna/lms.el"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; + sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; + name = "lms"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lms"; + license = lib.licenses.free; + }; + }) {}; load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; @@ -42410,12 +42803,12 @@ love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "love-minor-mode"; - version = "20130429.1459"; + version = "20170726.2236"; src = fetchFromGitHub { owner = "ejmr"; repo = "love-minor-mode"; - rev = "31c3fc1ecd31f72f0f736014a4ff905eb3742e74"; - sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl"; + rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; + sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; @@ -42431,12 +42824,12 @@ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20170419.605"; + version = "20170709.1021"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "3ef571cc8c534e305a3ad6831a0b244a30ca57fe"; - sha256 = "0aiyspr1wg3lwx0sy8c52h86zjs9ifycy02c2w8q2287kv61lqxk"; + rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf"; + sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; @@ -42452,12 +42845,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20170421.328"; + version = "20170814.1358"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4"; - sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz"; + rev = "a556e93fbe3068e0c374e261f1c4880c0812c434"; + sha256 = "0ns9b528rknw5j9dkswjd208rjd98qqvn4s6c8dyfqcx11gcf0hc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -42494,12 +42887,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170629.33"; + version = "20170816.1123"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "3e93b3fd754931cfd122855659afbd070d844bac"; - sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a"; + rev = "460334192ad6c96c0d7204d537561477dcd80586"; + sha256 = "1khwzn0z422is124pfl508c11v402ln4231bk2hq0dk9j6r1mrkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42519,8 +42912,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "5e032b39d74e63dee9157bf967f3902caa8524fa"; - sha256 = "1rhk6hlcvvg9yqy3x9fx8qdvhyf2aih2k6m4x5cr80mzvczmxl31"; + rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec"; + sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -42687,8 +43080,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57"; - sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik"; + rev = "8681342aaffa187e5c54945ab91b812965a96d19"; + sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; @@ -42701,6 +43094,27 @@ license = lib.licenses.free; }; }) {}; + mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mac-pseudo-daemon"; + version = "20170728.1240"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "mac-pseudo-daemon"; + rev = "d235680a72677f11925b912428ad1a57b664e3e8"; + sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; + name = "mac-pseudo-daemon"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/mac-pseudo-daemon"; + license = lib.licenses.free; + }; + }) {}; macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macro-math"; @@ -42849,12 +43263,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170705.2113"; + version = "20170808.1712"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b8d558678821e35450c19e415656e366ebe44c38"; - sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; + rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2"; + sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42881,8 +43295,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "85b860cb53d6f0088255013ef849af9a882110f9"; - sha256 = "1jj467kdvklb1sl0dyyb00jnl4xgz56mql1wnr4nmiqbxaqzqa46"; + rev = "2aa23cd169166e92be3e874c723ff224a9d42c15"; + sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -43000,6 +43414,27 @@ license = lib.licenses.free; }; }) {}; + magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-imerge"; + version = "20170805.819"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-imerge"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; + sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; + name = "magit-imerge"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-imerge"; + license = lib.licenses.free; + }; + }) {}; magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-lfs"; @@ -43045,12 +43480,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170701.1313"; + version = "20170810.917"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b8d558678821e35450c19e415656e366ebe44c38"; - sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; + rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2"; + sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43129,12 +43564,12 @@ magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-tbdiff"; - version = "20170627.2023"; + version = "20170725.1850"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "2e7d54d290260e5834cca06863d78fc563d7373c"; - sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr"; + rev = "1d1333af9d76b9e832212e9da152397df65f7205"; + sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; @@ -43171,12 +43606,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170516.612"; + version = "20170820.956"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4"; - sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im"; + rev = "cd3b194f8f7f3a7f75f755552d48dfae9e5ed5cd"; + sha256 = "08vgz3sg3c23cl20330zw19rd2vxnhx04b6k0rgyh95mv61lgy36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43238,8 +43673,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mainline"; - rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f"; - sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5"; + rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16"; + sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line"; @@ -43336,6 +43771,27 @@ license = lib.licenses.free; }; }) {}; + makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "makefile-executor"; + version = "20170721.13"; + src = fetchFromGitHub { + owner = "thiderman"; + repo = "makefile-executor.el"; + rev = "105f76bce212bfe511eda191366fef9ee45fd1ab"; + sha256 = "0p6vk0f3qpcpa7fa4q3r6w5a9d0v67gv4khf5jy9g2nc9bz9ai57"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; + sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi"; + name = "makefile-executor"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/makefile-executor"; + license = lib.licenses.free; + }; + }) {}; maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "maker-mode"; @@ -43381,12 +43837,12 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20170628.151"; + version = "20170723.1635"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "b8ec090cb57a78265650586f71f00c4c9e054e27"; - sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw"; + rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb"; + sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; @@ -43532,8 +43988,8 @@ src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "4463a734a9377d6c17a0cdba0f1e7ced0db7bbdc"; - sha256 = "1h99cgpw28gg9lqh53pzpp7qh350dbcran90387jrh5plyicsq3m"; + rev = "01255150a80ada47bf3708daa93069ac3011831f"; + sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43546,35 +44002,6 @@ license = lib.licenses.free; }; }) {}; - mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }: - melpaBuild { - pname = "mandoku-tls"; - version = "20170611.6"; - src = fetchFromGitHub { - owner = "mandoku"; - repo = "mandoku-tls"; - rev = "e21205ca9c1c053801190f291d6583ce057e8a65"; - sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls"; - sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz"; - name = "mandoku-tls"; - }; - packageRequires = [ - emacs - github-clone - helm - helm-charinfo - hydra - mandoku - org - ]; - meta = { - homepage = "https://melpa.org/#/mandoku-tls"; - license = lib.licenses.free; - }; - }) {}; map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "map-progress"; @@ -43704,12 +44131,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170702.738"; + version = "20170817.822"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "2c8d0e537ea7a2e823b7768b603f7194beebe565"; - sha256 = "1w8vm5inmrzxp790ynpdbh6wavc9jq0f0jafc5a277hsxhbl9i7z"; + rev = "737a4fd5bf555aff5cfc6a19e82a7af527846702"; + sha256 = "1y9nf7976x8c7d2m4pxsm6hlks3v5ra4cv8kqrcp1ly7wcjr4gm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43767,12 +44194,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20161211.1443"; + version = "20170820.459"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "50e5baed5ca3a1d2fed08f32802976a5ed358fed"; - sha256 = "1p1npnhlh99m9pxvd1jhbzn9dxhg5fjml1bw8yakrv7k1h6zwrd3"; + rev = "134fd336750b8b3165bc906f0a7161c25eb6f589"; + sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; @@ -43795,12 +44222,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20170224.2350"; + version = "20170711.1249"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "0edc303871517da67483119f2b1969055e6e0608"; - sha256 = "0fnb2qw7p5mmv9nbkjy2iw3whi40gxwxbdfwgadbypzk0yvh6a3v"; + rev = "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8"; + sha256 = "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -44005,12 +44432,12 @@ math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "math-symbols"; - version = "20151121.1642"; + version = "20170818.759"; src = fetchFromGitHub { owner = "kawabata"; repo = "math-symbols"; - rev = "666b1f00d9e106cf2a3a7d58c2262fe9a1404764"; - sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la"; + rev = "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d"; + sha256 = "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7b0799bddbbbecd12bc1589b56a6250acf76407/recipes/math-symbols"; @@ -44170,12 +44597,12 @@ mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbo70s-theme"; - version = "20141122.642"; + version = "20170808.615"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mbo70s-theme"; - rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2"; - sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z"; + rev = "bed3db8965708ed4e9482b224a9b084765c052f2"; + sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme"; @@ -44254,12 +44681,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20170418.1035"; + version = "20170812.2255"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "e1adf088e621c3446d04cb2222756edcb03eb363"; - sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n"; + rev = "8473e12d1839f5287a4227586bf117dad820f867"; + sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -44275,12 +44702,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170628.2045"; + version = "20170723.1724"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; - sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; + rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; + sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44317,12 +44744,12 @@ mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; - version = "20141115.2302"; + version = "20170808.617"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mellow-theme"; - rev = "ab72898824af6452d0cefea16e49491e42b660d1"; - sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld"; + rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891"; + sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme"; @@ -44356,36 +44783,15 @@ license = lib.licenses.free; }; }) {}; - memento = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "memento"; - version = "20150823.339"; - src = fetchFromGitHub { - owner = "ehartc"; - repo = "memento"; - rev = "35733b79101f694346792a57df686cbffe64bd79"; - sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3bee3cd6b491bf8813ec2332794b2548603014f4/recipes/memento"; - sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8"; - name = "memento"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/memento"; - license = lib.licenses.free; - }; - }) {}; memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "memoize"; - version = "20130421.1234"; + version = "20170720.1802"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-memoize"; - rev = "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75"; - sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw"; + rev = "636defefa9168f90bce6fc27431352ac7d01a890"; + sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize"; @@ -44442,10 +44848,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20170618.1417"; + version = "20170720.710"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw"; + sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf"; name = "menu-bar+.el"; }; recipeFile = fetchurl { @@ -44462,12 +44868,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20170204.628"; + version = "20170731.907"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "957e551140587f0cd83d9186a06fba10a38c6084"; - sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -44632,8 +45038,8 @@ src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "7ea2baefff668263bf011c72879c2aa88125f2de"; - sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv"; + rev = "36b36a154dab22e112cc19675cfd73478f2a5956"; + sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -44691,16 +45097,16 @@ mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mic-paren"; - version = "20150110.1816"; + version = "20170731.1207"; src = fetchFromGitHub { - owner = "emacsmirror"; + owner = "emacsattic"; repo = "mic-paren"; - rev = "d0332fae515af2fa461d19afa7f933588afc327f"; - sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii"; + rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4"; + sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren"; - sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren"; + sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07"; name = "mic-paren"; }; packageRequires = []; @@ -44733,12 +45139,12 @@ midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "midje-mode"; - version = "20150921.1750"; + version = "20170808.2103"; src = fetchFromGitHub { owner = "dnaumov"; repo = "midje-mode"; - rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b"; - sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg"; + rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f"; + sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode"; @@ -44988,8 +45394,8 @@ src = fetchFromGitHub { owner = "arthurnn"; repo = "minitest-emacs"; - rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15"; - sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa"; + rev = "1aadb7865c1dc69c201cecee275751ecec33a182"; + sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest"; @@ -45005,12 +45411,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20170605.2342"; + version = "20170708.358"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "c33a8e23817468c2a64dcfede6dea41485fb43df"; - sha256 = "1892s4cxzxdrwj2mjav1lqbisx20zsjgnw41m6a61ds7hg035c3w"; + rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5"; + sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -45122,6 +45528,27 @@ license = lib.licenses.free; }; }) {}; + mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mixed-pitch"; + version = "20170723.955"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "mixed-pitch"; + rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a"; + sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; + sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z"; + name = "mixed-pitch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mixed-pitch"; + license = lib.licenses.free; + }; + }) {}; mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "mkdown"; @@ -45187,12 +45614,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20170220.1548"; + version = "20170808.1814"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "631e7f12d1641cb40e650134f35f2680a1a310a1"; - sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb"; + rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f"; + sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -45212,8 +45639,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493"; - sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx"; + rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; + sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45292,12 +45719,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20170513.1501"; + version = "20170813.1957"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "dbda778badb8f33c9ed816b927710ef6d0123cf5"; - sha256 = "1jvczadgkq2b8gxjg2pllg3qjr1ymnc9kjjgvyi7v91vb7h51yii"; + rev = "ce9e42adf9333c68967597c17272b3a3c7564cea"; + sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -45359,8 +45786,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f"; - sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37"; + rev = "7ee76939b9269c652f93065a8fcc7da24434a167"; + sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -45460,8 +45887,8 @@ src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "0a5a4ae4d3115eb95ab6047faf8d1734a238ab70"; - sha256 = "1ax7kvxj8z6ldfxr9017ws1lligjaxxdrcxb651i10m7jdw3bjd4"; + rev = "b0a45dc1d7c49854988103c2570c783f46f44566"; + sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -45586,8 +46013,8 @@ src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; - rev = "190079ea4d22a4e875a3b2892e58737344cb2b26"; - sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g"; + rev = "62fc907cb541aef1c253d6bcd60447156e6f064c"; + sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; @@ -45607,12 +46034,12 @@ src = fetchFromGitHub { owner = "fxn"; repo = "monochrome-theme.el"; - rev = "58fb4cf28c407f059b78bfd72c4dbced07638dd6"; - sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf"; + rev = "bfca67fe7365310bc47ae9ca96c417caada54896"; + sha256 = "0jvsss38rgry37dnshxbqxcj7qh1q6iyza58kix47h5wbnrpvszn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bd753349134f4db6f80b6e86d4facd1704e87ccc/recipes/monochrome-theme"; - sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/monochrome-theme"; + sha256 = "0cq2clliwcwnn1spz1w6y5qw1lgqznw212rcc4q6f1kslq0jyk5x"; name = "monochrome-theme"; }; packageRequires = []; @@ -45645,12 +46072,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170705.1152"; + version = "20170731.504"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062"; - sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6"; + rev = "623083f05c381761a8cf2fd923e493bfa8762c28"; + sha256 = "02d759s4zh6a2yj2xq9cdfjyrsj3a3a5wngcwkl6bq0jgbjz5pvv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46079,27 +46506,6 @@ license = lib.licenses.free; }; }) {}; - mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mpg123"; - version = "20170313.715"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mpg123"; - rev = "d1dd8c56428ae55df9e23ba26f102588001d55be"; - sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123"; - sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8"; - name = "mpg123"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mpg123"; - license = lib.licenses.free; - }; - }) {}; mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; @@ -46145,12 +46551,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170506.1701"; + version = "20170808.1745"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07"; - sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm"; + rev = "316bd3a5916114e545d9ee26208cc82771cb7002"; + sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -46294,7 +46700,7 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656"; + rev = "ca151864e7ff7ade0e530e8eb2c26291d37a56b6"; sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc"; }; recipeFile = fetchurl { @@ -46415,12 +46821,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20170215.552"; + version = "20170813.38"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "ddbe3ae932b6564c7429c3b2507510093ed1f3aa"; - sha256 = "0icaz5md2jydsp8w9fdgxj7689g8v6yq123yi7bp17g6lfnw4v7y"; + rev = "18f992bff596609091afca128b51a7d2e919ac40"; + sha256 = "01xlbvnc74h450wm6falpj839nz04dmc2ll083zkndd3gfjk6g3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -46499,12 +46905,12 @@ mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustang-theme"; - version = "20141017.1623"; + version = "20170719.246"; src = fetchFromGitHub { owner = "mswift42"; repo = "mustang-theme"; - rev = "79c3381dd50601775402fe2fddd16fffa9218837"; - sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4"; + rev = "dda6d04803f1c9b196b620ef564e7768fee15de2"; + sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme"; @@ -46520,12 +46926,12 @@ mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustard-theme"; - version = "20141115.2302"; + version = "20170808.619"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mustard-theme"; - rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c"; - sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf"; + rev = "3b15d992c79590d7ea2503004e2a863b57e274b5"; + sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme"; @@ -46599,27 +47005,6 @@ license = lib.licenses.free; }; }) {}; - mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mwe-log-commands"; - version = "20100703.541"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mwe-log-commands"; - rev = "8253f2a311f35b03f72a035744f0cbdd776ea17e"; - sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands"; - sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx"; - name = "mwe-log-commands"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mwe-log-commands"; - license = lib.licenses.free; - }; - }) {}; mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; @@ -46728,12 +47113,12 @@ mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mysql2sqlite"; - version = "20151123.1339"; + version = "20170725.1516"; src = fetchFromGitHub { owner = "echosa"; repo = "emacs-mysql2sqlite"; - rev = "07415c5fcd895ebccf1b774d0eab175f2700652f"; - sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i"; + rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e"; + sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite"; @@ -46767,27 +47152,6 @@ license = lib.licenses.free; }; }) {}; - n3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "n3-mode"; - version = "20141027.1057"; - src = fetchFromGitHub { - owner = "doriantaylor"; - repo = "n3-mode-for-emacs"; - rev = "0145e7938c30183edb03a55a4f16390dabd191ec"; - sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a71e3a572cb2ff58c731df9ff6a65b69ebd8f6eb/recipes/n3-mode"; - sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh"; - name = "n3-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/n3-mode"; - license = lib.licenses.free; - }; - }) {}; n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "n4js"; @@ -47060,10 +47424,10 @@ }) {}; narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-indirect"; - version = "20170307.921"; + version = "20170820.1748"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13"; - sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh"; + url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14"; + sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq"; name = "narrow-indirect.el"; }; recipeFile = fetchurl { @@ -47308,6 +47672,27 @@ license = lib.licenses.free; }; }) {}; + neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "neato-graph-bar"; + version = "20170731.2341"; + src = fetchFromGitLab { + owner = "RobertCochran"; + repo = "neato-graph-bar"; + rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27"; + sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; + sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb"; + name = "neato-graph-bar"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/neato-graph-bar"; + license = lib.licenses.free; + }; + }) {}; nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nemerle"; @@ -47315,8 +47700,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "d0777b677c50714415174e407a321efc1e9bfdae"; - sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m"; + rev = "5809965fc8f4bc33133c10e49758cf60b069b82c"; + sha256 = "1fmvdndnr1i5rywjc7r40y0cxshs06qvw488lhg15n5kl2z4271l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; @@ -47332,12 +47717,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170630.245"; + version = "20170711.501"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; - sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; + rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; + sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -47560,56 +47945,15 @@ license = lib.licenses.free; }; }) {}; - niflheim-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "niflheim-theme"; - version = "20150630.821"; - src = fetchFromGitHub { - owner = "niflheim-theme"; - repo = "emacs"; - rev = "5265e89164132fbdbc13146a79f0abce78bd0c5e"; - sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/36d82e64af02289f759239f24dd6d921a6eb3f0f/recipes/niflheim-theme"; - sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36"; - name = "niflheim-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/niflheim-theme"; - license = lib.licenses.free; - }; - }) {}; - nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "nikola"; - version = "20170703.1321"; - src = fetchgit { - url = "https://git.daemons.cf/drymer/nikola.el/"; - rev = "964715ac30943c9d6976999cad208dc60d09def0"; - sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola"; - sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705"; - name = "nikola"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://melpa.org/#/nikola"; - license = lib.licenses.free; - }; - }) {}; nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170409.1737"; + version = "20170820.1810"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41"; - sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr"; + rev = "517f2682799bdead083e91de5eeac766dc8e34fa"; + sha256 = "1hfvrcj9bhl2xc3hsg9q4kqwaj7saybpiq8fv1q3wz4k2y948cdy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -47625,12 +47969,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20170412.758"; + version = "20170811.646"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "ce999b8d152b9b15d75f66fe22b84827167c8311"; - sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w"; + rev = "26a5bd7d31d9c203aa4e1cc4961fb6cdf0ddc0f9"; + sha256 = "1m326skvvirkf938ymch135p2gxxdyqx4plpvivp09qpfzrj0b1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -47667,12 +48011,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170520.553"; + version = "20170809.1128"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; + sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -47685,22 +48029,22 @@ license = lib.licenses.free; }; }) {}; - nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20160502.637"; + version = "20170811.1927"; src = fetchFromGitHub { owner = "NixOS"; - repo = "nix"; - rev = "a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed"; - sha256 = "0bliq5wnzp3n0pdf6c2271ngxxgphqimjm6qv8kxl83f1mpfpknc"; + repo = "nix-mode"; + rev = "42632ee471aed3e8a1a6ef385d1ee8bc43938a42"; + sha256 = "1ra37fszvhx8168c1vr0dpgjryz50mmwxm8yx2wqg9yggwwnyql3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; - sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; + sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; name = "nix-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/nix-mode"; license = lib.licenses.free; @@ -47814,15 +48158,15 @@ nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nnir-est"; - version = "20140301.602"; + version = "20170818.746"; src = fetchFromGitHub { owner = "kawabata"; repo = "nnir-est"; - rev = "ba263fbd872fe05cfa6b3d815c0d98cdbe24b687"; - sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1"; + rev = "dc1fee4757725b8171b755313d7bafbf1364f49a"; + sha256 = "054mzb1h7smvvpzkg59pb4fd5rnig9j937wwvdr9s9222akyvkma"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad5bcd7e5cc71bb40803b9b39c40310574f3450/recipes/nnir-est"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/nnir-est"; sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv"; name = "nnir-est"; }; @@ -47835,16 +48179,16 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170702.457"; + version = "20170815.119"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; - rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; - sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; + rev = "c9cd2fc9413a41a6c5240969cbe2ae9e47762b9d"; + sha256 = "05n2wnk7x814fzpcmndiydhafgszz5h66vpa051qk3xcp6zn9i7y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -47853,6 +48197,27 @@ license = lib.licenses.free; }; }) {}; + noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "noaa"; + version = "20170719.1136"; + src = fetchFromGitHub { + owner = "thomp"; + repo = "noaa"; + rev = "a4ec583275450d718334238d2813579420229f65"; + sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa"; + sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v"; + name = "noaa"; + }; + packageRequires = [ cl-lib emacs request ]; + meta = { + homepage = "https://melpa.org/#/noaa"; + license = lib.licenses.free; + }; + }) {}; noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noccur"; @@ -47940,12 +48305,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20170607.1303"; + version = "20170722.443"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4"; - sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx"; + rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0"; + sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -48021,11 +48386,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170704.432"; + version = "20170820.433"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "6a79229737198110c9ae1a3c3e9b86d09b78bd94"; - sha256 = "017cp7z9l97xszlz4v97943zn1k03hmwxx9hphjrl7015hr38zwc"; + rev = "49d4f52f270773f86c90eb1c50805d1d7429d39b"; + sha256 = "1f8jqkj5y2h95qz1zdzas0yrwjgxv3hdly6cscsm2qp0hkvzga0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48186,12 +48551,12 @@ nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }: melpaBuild { pname = "nu-mode"; - version = "20160520.614"; + version = "20170816.1316"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "347f6c958f20d6e8e46bc7122556405b3a434242"; - sha256 = "17nj8bkqw34hsbb8b51rl6221hlpxw265h2cwxqf64cswm22y313"; + rev = "afc23383f0e3c4240d8d18ab7dd87edf595655ea"; + sha256 = "0zp682b7w3ifni2x2x81xirg7f7kcx1jwqrxpx2j57lrvhszqg3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -48267,6 +48632,27 @@ license = lib.licenses.free; }; }) {}; + numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "numbers"; + version = "20170802.434"; + src = fetchFromGitHub { + owner = "davep"; + repo = "numbers.el"; + rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3"; + sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; + sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; + name = "numbers"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/numbers"; + license = lib.licenses.free; + }; + }) {}; nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nummm-mode"; @@ -48337,8 +48723,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; - sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; + rev = "3447aa114575230cb230862ac0ac9b065f789ecd"; + sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -48351,27 +48737,6 @@ license = lib.licenses.free; }; }) {}; - nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "nyan-prompt"; - version = "20140809.2208"; - src = fetchFromGitHub { - owner = "PuercoPop"; - repo = "nyan-prompt"; - rev = "b5137f2ee9afe640f59786eed17b308df6356c73"; - sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt"; - sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb"; - name = "nyan-prompt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/nyan-prompt"; - license = lib.licenses.free; - }; - }) {}; o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "o-blog"; @@ -48479,12 +48844,12 @@ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; - version = "20170524.1605"; + version = "20170727.1801"; src = fetchFromGitHub { owner = "corpix"; repo = "ob-blockdiag.el"; - rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4"; - sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l"; + rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; + sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; @@ -48500,12 +48865,12 @@ ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-browser"; - version = "20150101.710"; + version = "20170720.1218"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-browser"; - rev = "9271453d28d0912093ab5f91807745ada69ada0c"; - sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813"; + rev = "a347d9df1c87b7eb660be8723982c7ad2563631a"; + sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser"; @@ -48521,12 +48886,12 @@ ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; - version = "20160415.2036"; + version = "20170725.724"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-coffee"; - rev = "dbfa5827df91ed1cdc5b0f3247da6b93fa632507"; - sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm"; + rev = "7f0b330273e8af7777de87a75fe52a89798e4548"; + sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee"; @@ -48539,15 +48904,57 @@ license = lib.licenses.free; }; }) {}; + ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-coffeescript"; + version = "20170719.121"; + 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-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-crystal"; + version = "20170811.57"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-crystal"; + rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04"; + sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; + sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n"; + name = "ob-crystal"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-crystal"; + license = lib.licenses.free; + }; + }) {}; ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-cypher"; - version = "20150224.1837"; + version = "20170725.720"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-cypher"; - rev = "b3511df05f175c1947996802e9e199432ea9ced8"; - sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n"; + rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26"; + sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher"; @@ -48605,12 +49012,12 @@ ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-elixir"; - version = "20151021.447"; + version = "20170725.719"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-elixir"; - rev = "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210"; - sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk"; + rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32"; + sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir"; @@ -48647,12 +49054,12 @@ ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-go"; - version = "20170324.932"; + version = "20170731.1057"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "1f582d5c16ff032207a40d49be0727190a227912"; - sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf"; + rev = "28a0250cd969974936e44dfdccb0265632d25f84"; + sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -48710,12 +49117,12 @@ ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-kotlin"; - version = "20170624.2050"; + version = "20170725.718"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-kotlin"; - rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00"; - sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab"; + rev = "3b2f57e9944cfc36f2714dc550db42159904929a"; + sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin"; @@ -48731,12 +49138,12 @@ ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-lfe"; - version = "20150701.655"; + version = "20170725.720"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-lfe"; - rev = "d50a5d76e389501504e060a7005f20b96c895594"; - sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn"; + rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e"; + sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe"; @@ -48773,12 +49180,12 @@ ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-mongo"; - version = "20161130.152"; + version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-mongo"; - rev = "d64a507c2f9e2a1f8062acae50199541fc23be65"; - sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg"; + rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa"; + sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo"; @@ -48794,12 +49201,12 @@ ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-nim"; - version = "20160830.220"; + version = "20170809.1130"; src = fetchFromGitHub { owner = "lompik"; repo = "ob-nim"; - rev = "050b165817e62067b0d686d96e25bc12fb9c7d84"; - sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a"; + rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2"; + sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; @@ -48815,12 +49222,12 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20160505.219"; + version = "20170819.245"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; - rev = "fd30c5e945a08b605725cf51808b3512ca885777"; - sha256 = "02vmy3nnk4yyjbp3r7zzv9sb3frv7kbj4a2a855iqa0isp8nhyfi"; + rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69"; + sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; @@ -48899,12 +49306,12 @@ ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-rust"; - version = "20170619.802"; + version = "20170730.759"; src = fetchFromGitHub { owner = "micanzhang"; repo = "ob-rust"; - rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664"; - sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60"; + rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9"; + sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust"; @@ -48983,12 +49390,12 @@ ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: melpaBuild { pname = "ob-spice"; - version = "20160815.2249"; + version = "20170801.2222"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-spice"; - rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a"; - sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak"; + rev = "b296232e28f61366265084fafb2f47876d987069"; + sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; @@ -49046,12 +49453,12 @@ ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: melpaBuild { pname = "ob-translate"; - version = "20160411.124"; + version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-translate"; - rev = "bba3bd1e2dbb5c672543129460c2713f78b26120"; - sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k"; + rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169"; + sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate"; @@ -49130,12 +49537,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "20170325.802"; + version = "20170809.824"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb"; - sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -49172,12 +49579,12 @@ obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obsidian-theme"; - version = "20140420.943"; + version = "20170719.248"; src = fetchFromGitHub { owner = "mswift42"; repo = "obsidian-theme"; - rev = "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92"; - sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1"; + rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea"; + sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme"; @@ -49298,12 +49705,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20170412.12"; + version = "20170803.222"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c"; - sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -49361,12 +49768,12 @@ octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octopress"; - version = "20161222.343"; + version = "20170813.615"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; - rev = "85bab12adbd985767233eb1622c4b8f7c1fe7e1a"; - sha256 = "012g0mf8g602f53x3bc35ahy4bq31s3m7cv13hm46zj8syvdckvq"; + rev = "b4c25df9e3ccf49ac27c0a152daa4e27d1247d56"; + sha256 = "0zidh929sc1wi695ibzglbybfvxz2rj1365mij97088wwdk5dyz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; @@ -49400,6 +49807,27 @@ license = lib.licenses.free; }; }) {}; + old-norse-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "old-norse-input"; + version = "20170816.1142"; + src = fetchFromGitHub { + owner = "david-christiansen"; + repo = "emacs-old-norse-input"; + rev = "c2e21ee72c3768e9152aff6baf12a19cde1d0c53"; + sha256 = "0zybr1v91884p4ncrpr962pr02qsns6hf7kc4c5gyad8sg4pbvxh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a/recipes/old-norse-input"; + sha256 = "1g00h6ykf61ckr6f3r17j72w3h04p5q65aa3rhr5llk3jk1wv331"; + name = "old-norse-input"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/old-norse-input"; + license = lib.licenses.free; + }; + }) {}; oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "oldlace-theme"; @@ -49424,12 +49852,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160912.1758"; + version = "20170806.2121"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "21f8356ce025a66125954ed372c8ace83bd279c4"; + sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -49592,12 +50020,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 = "20170705.1133"; + version = "20170821.1113"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; - sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; + rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549"; + sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49787,15 +50215,36 @@ license = lib.licenses.free; }; }) {}; + opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "opencc"; + version = "20170722.116"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "emacs-opencc"; + rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9"; + sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc"; + sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r"; + name = "opencc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/opencc"; + license = lib.licenses.free; + }; + }) {}; opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "opencl-mode"; - version = "20160220.909"; + version = "20170816.549"; src = fetchFromGitHub { owner = "salmanebah"; repo = "opencl-mode"; - rev = "bb39190bb4fdffa188ce4e6849853a07c682b999"; - sha256 = "094r6fx1s76m8anqqg2qrddidn1dp08kmv8p8md27yy9mm49d91n"; + rev = "6e69434d0fa6e11a542acad370611bba18d3bc5c"; + sha256 = "00vhmbfh51mncx5xnzv96kbb5r6r27xw6xwvi7gf454zbvcibrws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode"; @@ -49956,12 +50405,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20170701.1855"; + version = "20170724.2116"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "169acc082643b6b793aab17ab7e0de3694e74698"; - sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9"; + rev = "3b7417ac12f2710e88f8dff538670621064ef8bc"; + sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -50103,12 +50552,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170706.447"; + version = "20170814.404"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; - sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; + rev = "f572bf29d6592f587b671b215394cf459dd574b9"; + sha256 = "0f8nf4mljf2xfkwvn9n2d612sy02mk4m19lnx5pidjmm5a50id6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50184,6 +50633,27 @@ license = lib.licenses.free; }; }) {}; + org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-category-capture"; + version = "20170819.1047"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; + sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; + name = "org-category-capture"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-category-capture"; + license = lib.licenses.free; + }; + }) {}; org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; @@ -50208,12 +50678,12 @@ org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; - version = "20160819.900"; + version = "20170724.413"; src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; - rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e"; - sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg"; + rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01"; + sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink"; @@ -50250,12 +50720,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170326.1041"; + version = "20170813.1602"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "0bae215df11e5602b07294e83b595447ae73ca0d"; - sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv"; + rev = "e45d277a8811ee228119349f51af9788befb3b22"; + sha256 = "0fg1ky6aw0hmm6a6zv0i4f8h9xam4d65cnpm2k2a3p1zpn0yzdk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -50520,22 +50990,22 @@ license = lib.licenses.free; }; }) {}; - org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-edit-latex"; - version = "20170621.758"; + version = "20170816.114"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; - sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; + rev = "11481d0b324433e58d3846d5da675be559be507a"; + sha256 = "1j2klbyfjyk5ysvnv9xihbkcb3lbfijkqf4c8bp38n6lb9bdhlhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; name = "org-edit-latex"; }; - packageRequires = [ auctex emacs org ]; + packageRequires = [ auctex emacs ]; meta = { homepage = "https://melpa.org/#/org-edit-latex"; license = lib.licenses.free; @@ -50729,27 +51199,6 @@ license = lib.licenses.free; }; }) {}; - org-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "org-jekyll"; - version = "20130508.239"; - src = fetchFromGitHub { - owner = "juanre"; - repo = "org-jekyll"; - rev = "66300a1a6676ab168663178e7a7c954541a39992"; - sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8e6059b532fc95e0251a1edb7b1e29d03477b3f2/recipes/org-jekyll"; - sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i"; - name = "org-jekyll"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/org-jekyll"; - license = lib.licenses.free; - }; - }) {}; org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; @@ -50774,12 +51223,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170705.217"; + version = "20170712.657"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; - sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; + rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1"; + sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50795,12 +51244,12 @@ org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-minor-mode"; - version = "20170616.516"; + version = "20170805.1152"; src = fetchFromGitHub { owner = "seanohalpin"; repo = "org-link-minor-mode"; - rev = "f7d986b4c63673e0e81ad87e9109237abc667893"; - sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj"; + rev = "7b92df60f3fee7f609d649d80ef243b45771ebea"; + sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode"; @@ -50861,8 +51310,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; - sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; + rev = "526b3d4b980317ef176869011b9b152ef85b5258"; + sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50881,8 +51330,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; - sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; + rev = "526b3d4b980317ef176869011b9b152ef85b5258"; + sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -50898,12 +51347,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170506.2244"; + version = "20170807.549"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0"; - sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z"; + rev = "8067e76eb1fb6a9c15229cc93015aba923120a19"; + sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -50916,6 +51365,27 @@ license = lib.licenses.free; }; }) {}; + org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-mind-map"; + version = "20170813.631"; + src = fetchFromGitHub { + owner = "theodorewiles"; + repo = "org-mind-map"; + rev = "baf46fa5cbdc545d13be78badac359cb50706c89"; + sha256 = "0z1yvii2956nv27wkb6qwzb74vn8b09bgv3r8xq5b9xhcxm7x2aa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; + sha256 = "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs"; + name = "org-mind-map"; + }; + packageRequires = [ dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-mind-map"; + license = lib.licenses.free; + }; + }) {}; org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mobile-sync"; @@ -51003,12 +51473,12 @@ org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; - version = "20170315.441"; + version = "20170820.2115"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "org-octopress"; - rev = "a8a251d6940623daae58453dd91630593c2536c0"; - sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j"; + rev = "38598ef98d04076a8eb78d549907ddfde8d3a652"; + sha256 = "0bmj5wkwidj1v3b8ipligr0nkfdaxm82717nz8fqidz967q4xbk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress"; @@ -51045,12 +51515,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170607.442"; + version = "20170806.1924"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "fa4e86621a63033148f8fe295a11b4721ba17462"; - sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d"; + rev = "50430ababf73a2d090881a952e9770badaf7478b"; + sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -51075,11 +51545,11 @@ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170703.1738"; + version = "20170814.2016"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "e8c81e633595"; - sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; + rev = "f568dd98a8b2"; + sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -51098,8 +51568,8 @@ version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; - sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; + rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20"; + sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -51196,27 +51666,48 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170520.2310"; + version = "20170819.1047"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80"; - sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; - sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; + sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; }; }) {}; + org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: + melpaBuild { + pname = "org-projectile-helm"; + version = "20170819.826"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; + sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; + name = "org-projectile-helm"; + }; + packageRequires = [ emacs helm org-projectile ]; + meta = { + homepage = "https://melpa.org/#/org-projectile-helm"; + license = lib.licenses.free; + }; + }) {}; org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; @@ -51289,12 +51780,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170703.1625"; + version = "20170807.1014"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42"; - sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20"; + rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968"; + sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -51314,8 +51805,8 @@ src = fetchFromGitHub { owner = "gongo"; repo = "org-redmine"; - rev = "4cdf9a2aea8420befd2d667d98f63c386f3e44f7"; - sha256 = "0fvzrc8k67di5qyzh13ly5wx6m34rg980yl2rqp5d3vvw8mbbsqw"; + rev = "e77d013bc3784947c46a5c53f03cd7d3c68552fc"; + sha256 = "06miv3mf2a39vkf6mmm5ssc47inqh7dq82khsyc03anz4d4lj822"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine"; @@ -51331,12 +51822,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 = "20170626.1834"; + version = "20170808.625"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "6abe56f638562cc683d866f209387c9d30a32299"; - sha256 = "08rnqk4iwg86gndbra4f78qnxadbn0cyd2h3dffx30cl6y23w2vz"; + rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8"; + sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51447,12 +51938,12 @@ org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "20170621.2328"; + version = "20170706.646"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "e9ba61e8bbe6e2bd1cb5fe2e507d066fa05cabd9"; - sha256 = "1ng94m39r7g573l7zl7561zchz5m5mzlf8a0ym2hj1cdf98x5ziv"; + rev = "9dea733006ae53902e6ec91fb11ff058229afe84"; + sha256 = "0gyhhcr54myg0r4pjc5z4mkmpc2xnw3ymykz3m0sm589q1i1ym34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -51486,6 +51977,27 @@ license = lib.licenses.free; }; }) {}; + org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }: + melpaBuild { + pname = "org-super-agenda"; + version = "20170819.2228"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-super-agenda"; + rev = "63a48409b1046b25fd51fb8e464e30b0b8a0857a"; + sha256 = "0lxldd7s4wvv00ny5asqml4yglbf86l93fhp51wkffdxwh4h9l8c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; + sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra"; + name = "org-super-agenda"; + }; + packageRequires = [ dash emacs ht org s ]; + meta = { + homepage = "https://melpa.org/#/org-super-agenda"; + license = lib.licenses.free; + }; + }) {}; org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; @@ -51493,8 +52005,8 @@ src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722"; - sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z"; + rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8"; + sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; @@ -51762,16 +52274,16 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20160204.1715"; + version = "20170727.1911"; src = fetchFromGitHub { - owner = "dato"; + owner = "tesujimath"; repo = "org-wc"; - rev = "7735d5111f779a84c40b1eb3783631e6048fb6fe"; - sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac"; + rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; + sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc"; - sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; + sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl"; name = "org-wc"; }; packageRequires = []; @@ -51783,16 +52295,16 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20170318.450"; + version = "20170809.638"; src = fetchFromGitHub { owner = "tumashu"; - repo = "org-webpage"; - rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53"; - sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; - sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage"; + sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm"; name = "org-webpage"; }; packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ]; @@ -51825,12 +52337,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170627.1750"; + version = "20170804.2043"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; - sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; + rev = "8bcf98ea538c1397f9fbe2098dc836fe9e1dcdf9"; + sha256 = "08ddhdhrs0jz22g8dv0dzyqpdqsjii4cfjax3xsij8qvs4h593cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -51906,15 +52418,45 @@ license = lib.licenses.free; }; }) {}; + org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: + melpaBuild { + pname = "org2web"; + version = "20170809.411"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; + sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; + name = "org2web"; + }; + packageRequires = [ + cl-lib + dash + el2org + ht + htmlize + mustache + org + simple-httpd + ]; + meta = { + homepage = "https://melpa.org/#/org2web"; + license = lib.licenses.free; + }; + }) {}; organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20170125.606"; + version = "20170720.1111"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d"; - sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y"; + rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820"; + sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -51951,12 +52493,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170403.1323"; + version = "20170731.1003"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "c91e662ace7e3ce992269cbf755f378bc6742511"; - sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16"; + rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; + sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -51993,12 +52535,12 @@ orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }: melpaBuild { pname = "orglue"; - version = "20150430.513"; + version = "20150503.114"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "orglue"; - rev = "4732f8bfd6866e20230b36e5971f2492827c6944"; - sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6"; + rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4"; + sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue"; @@ -52287,16 +52829,16 @@ osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; - version = "20131026.1730"; + version = "20170721.2307"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; - rev = "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841"; - sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk"; + repo = "mac-pseudo-daemon"; + rev = "d235680a72677f11925b912428ad1a57b664e3e8"; + sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/25a3562788b541e8682500911d7da89d209ab84f/recipes/osx-pseudo-daemon"; - sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; name = "osx-pseudo-daemon"; }; packageRequires = []; @@ -52368,6 +52910,27 @@ license = lib.licenses.free; }; }) {}; + outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outline-toc"; + version = "20170730.430"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "outline-toc.el"; + rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463"; + sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc"; + sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb"; + name = "outline-toc"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/outline-toc"; + license = lib.licenses.free; + }; + }) {}; outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outlined-elisp-mode"; @@ -52410,15 +52973,36 @@ license = lib.licenses.free; }; }) {}; + outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outrespace"; + version = "20170818.1835"; + src = fetchFromGitHub { + owner = "articuluxe"; + repo = "outrespace"; + rev = "47df84553ca3df0f42da19fa79e7ddff6e50ca35"; + sha256 = "1fckl6jim7i63zpq6jadagpzcq65ds23ya3n4ajilw611bd0jn26"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; + sha256 = "13xasp9vjb3n0smdhrh9pq1yhhrg3p6z14fmlvf6xqip52rx89hl"; + name = "outrespace"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/outrespace"; + license = lib.licenses.free; + }; + }) {}; outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20170414.1217"; + version = "20170721.521"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279"; - sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j"; + rev = "0fdd0cd619d20e71b3157f225bb117a7e21dc9b3"; + sha256 = "1hhvbfpbixh5s2s4h06f44p4h0kqnmbm9mlqfas3msq5m6m77h2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -52518,16 +53102,16 @@ ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-bibtex-chinese"; - version = "20160510.506"; + version = "20170722.2009"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-bibtex-chinese"; - rev = "7771304977f921ff0596b17520289c984116f1a1"; - sha256 = "1d463d7mdlr65yrq7x16nk9124fw1iphf5g238mlh4abbl6kz241"; + rev = "2ad2364399229144110db7ef6365ad0461d6a38c"; + sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese"; - sha256 = "0h02jlzk97rd3jmdni5mggbkij61d7zn1n1ibz1jg6zb0000cj7a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese"; + sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61"; name = "ox-bibtex-chinese"; }; packageRequires = [ emacs ]; @@ -52539,16 +53123,16 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20170108.1348"; + version = "20170805.505"; src = fetchFromGitHub { owner = "jkitchin"; - repo = "scimax"; - rev = "957fc496311e8c685a5299aeaeb0f1882caaa3af"; - sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2"; + repo = "ox-clip"; + rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e"; + sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; - sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip"; + sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv"; name = "ox-clip"; }; packageRequires = [ htmlize org ]; @@ -52770,15 +53354,15 @@ ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20170706.431"; + version = "20170818.747"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4"; - sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq"; + rev = "558661d1b6ba98ce2dd9b8a498a01db341bbbe31"; + sha256 = "0if6d8c04m2rgv0abxrav04fqz8v2y1bgkcxkmj8x8xr3fk675p3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; name = "ox-pandoc"; }; @@ -52900,8 +53484,8 @@ src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly"; @@ -52980,12 +53564,12 @@ ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-twiki"; - version = "20160306.915"; + version = "20170803.1339"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki"; @@ -53068,8 +53652,8 @@ src = fetchFromGitHub { owner = "milkypostman"; repo = "package-filter"; - rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b"; - sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7"; + rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e"; + sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter"; @@ -53085,12 +53669,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170702.227"; + version = "20170820.524"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "416d1cba6664b0783722129d24f4a748bd71e057"; - sha256 = "1718raqkpzscrnih519dp7a7jnaymjgcaqppfgskbsw59r46p7sj"; + rev = "58d5fcd4ddcb023fbd74b0bdb304cd3037a955d3"; + sha256 = "0yqnbvswps2244zsib3ym3cbmd94sqn3yznfry5rwbq30b9fya2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53106,12 +53690,12 @@ package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-plus"; - version = "20150319.1455"; + version = "20170815.1956"; src = fetchFromGitHub { owner = "zenspider"; repo = "package"; - rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"; - sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97"; + rev = "9213f6134eabc2cff5826779ced437714324c066"; + sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+"; @@ -53166,22 +53750,22 @@ license = lib.licenses.free; }; }) {}; - packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170314.1340"; + version = "20170819.942"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; - rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; - sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; + rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; + sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/packed"; license = lib.licenses.free; @@ -53353,6 +53937,27 @@ license = lib.licenses.free; }; }) {}; + pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: + melpaBuild { + pname = "pamparam"; + version = "20170808.1219"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "pamparam"; + rev = "33efb42525da0094a5338f6cae4013fddf550118"; + sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; + sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f"; + name = "pamparam"; + }; + packageRequires = [ emacs hydra lispy worf ]; + meta = { + homepage = "https://melpa.org/#/pamparam"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -53377,12 +53982,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20170503.606"; + version = "20170720.127"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "72aa0c2abad0ecca689adcf93dd4e9109c9fc737"; - sha256 = "0hrnd46anfq8vzanax7qzq5fl9kdw26aprally9kjqbr5xdjik2h"; + rev = "58f893d54c0916ad832097a579288ef8ce405da5"; + sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -53606,12 +54211,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170612.1048"; + version = "20170710.821"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "972d413b4d8284ba67ab43513a6a709692325f20"; - sha256 = "16f2jimhdbqhpgq66qrakk6ajp87ixihgmzvx9aip6icnp10mhgc"; + rev = "23ac701e2a1a1364ca96d267437c3413986a4497"; + sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -53690,12 +54295,12 @@ pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170615.605"; + version = "20170803.1301"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "77bde345cfb3822c86eb9b1aa8cca4e8fcc38420"; - sha256 = "1x9ms4aljpbz9nfv4lrrlkvqb3a127sfd0a865lphdyivqrai3j3"; + rev = "6511193677d6113fec1171f476c0db3be242ee15"; + sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -53711,12 +54316,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20161111.1320"; + version = "20170815.225"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; - sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; + rev = "358070a74f5bf13c0707e7da13a51c3c41eb20cd"; + sha256 = "19m7gsvaagql5n9q8l7dm2h9ir2mg9d3h7lxfwh2bvpl3c9vsh2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -53813,21 +54418,21 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: + password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }: melpaBuild { pname = "password-store"; - version = "20151027.1449"; + version = "20170726.2054"; src = fetchgit { - url = "http://git.zx2c4.com/password-store"; - rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; - sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; + url = "https://git.zx2c4.com/password-store"; + rev = "8fa1be8cdff8f5278011616171d8095b8a46b287"; + sha256 = "0i9iqsrg5y2w694kx9wa4fv3syijdshripjl6wi83c2xi4cp6p8s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; - sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; + sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; name = "password-store"; }; - packageRequires = [ f s ]; + packageRequires = [ f s with-editor ]; meta = { homepage = "https://melpa.org/#/password-store"; license = lib.licenses.free; @@ -53854,6 +54459,27 @@ license = lib.licenses.free; }; }) {}; + paste-of-code = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "paste-of-code"; + version = "20170709.1655"; + src = fetchFromGitHub { + owner = "spebern"; + repo = "paste-of-code.el"; + rev = "92d258e8ec98598d847ecab82903f9224c7c2050"; + sha256 = "1bf2d0i726psjwnqdp0w4h0qk7fnwcbwf1a66q7p8vczavqygfan"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b29a5101bb6fc01b8b6e1b798ce6f73bc6d34944/recipes/paste-of-code"; + sha256 = "0wjcchpp1689arfz6s7gfq4bxn0svz6qj5azvjwwsyzais1bicdi"; + name = "paste-of-code"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/paste-of-code"; + license = lib.licenses.free; + }; + }) {}; pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastebin"; @@ -53917,26 +54543,6 @@ license = lib.licenses.free; }; }) {}; - pastels-on-dark-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "pastels-on-dark-theme"; - version = "20120304.1022"; - src = fetchgit { - url = "https://gist.github.com/1974259.git"; - rev = "854839a0b4bf8c3f6a7d947926bf41d690547002"; - sha256 = "1ar6rf2ykd252y8ahx0lca7xsgfs6ff287q9iij79gs9fhn4yfy5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2/recipes/pastels-on-dark-theme"; - sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh"; - name = "pastels-on-dark-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pastels-on-dark-theme"; - license = lib.licenses.free; - }; - }) {}; pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pastery"; @@ -54276,12 +54882,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170417.150"; + version = "20170820.1117"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9"; - sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2"; + rev = "c70520068cb316f736811e922a015347fdbcd30b"; + sha256 = "03ys82k68d4f5xvhwjq2i2qxh8r4scj49rvgv2bdrsmnmzcpxdrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54297,12 +54903,12 @@ peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peacock-theme"; - version = "20141115.2302"; + version = "20170808.620"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-peacock-theme"; - rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7"; - sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3"; + rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8"; + sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme"; @@ -54378,6 +54984,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170818.1352"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef"; + sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -54632,12 +55258,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170312.19"; + version = "20170813.1754"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "f093cfecde0e8ce0d5e390784c228831536aef72"; - sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4"; + rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6"; + sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -54926,12 +55552,12 @@ phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-mono-theme"; - version = "20130306.1215"; + version = "20170729.706"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-mono"; - rev = "dafb65c542605145d6b1702aae5b195b70f98285"; - sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri"; + rev = "a54f515d162148bcb38676980bc2316adb3d7b8b"; + sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme"; @@ -54947,12 +55573,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20170324.1144"; + version = "20170729.703"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "219edf69adb7e911394c5849c310ca0f4201a917"; - sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq"; + rev = "4defbb76b00c1a29f060813898578152d6be623d"; + sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -55073,12 +55699,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170621.2242"; + version = "20170729.1258"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "3a9076b6f6146326c1314c580acddce9cbb5a290"; - sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc"; + rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079"; + sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55098,8 +55724,8 @@ src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; - rev = "963eb19c06a7237879ae7b7a111c83abcfe9ca36"; - sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr"; + rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203"; + sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; @@ -55241,12 +55867,12 @@ picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picpocket"; - version = "20170305.259"; + version = "20170820.309"; src = fetchFromGitHub { owner = "johanclaesson"; repo = "picpocket"; - rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e"; - sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l"; + rev = "e1f5c9421b53aa0edc44509b9c8c4b4cebd691d4"; + sha256 = "14x0qg9254yx7zqlsrm2843691gv4a976qx7q84srn89xznmq99n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket"; @@ -55427,22 +56053,22 @@ license = lib.licenses.free; }; }) {}; - pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pippel"; - version = "20170325.649"; + version = "20170730.623"; src = fetchFromGitHub { owner = "brotzeitmacher"; repo = "pippel"; - rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f"; - sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8"; + rev = "3737d5934665b5059c1e858feeb4270262b37e53"; + sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel"; sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw"; name = "pippel"; }; - packageRequires = [ emacs s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/pippel"; license = lib.licenses.free; @@ -55451,12 +56077,12 @@ pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; - version = "20161028.618"; + version = "20170720.816"; src = fetchFromGitHub { owner = "jxa"; repo = "pivotal-tracker"; - rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c"; - sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw"; + rev = "0311d117037c74512149a4a78b269c2e46d7dfba"; + sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker"; @@ -55616,22 +56242,22 @@ license = lib.licenses.free; }; }) {}; - plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "20161225.1142"; + version = "20170819.1033"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "c7e83c260778467be5f82500a5541ce76da662ac"; - sha256 = "0lf2438ia39idxbz2b7qaagajnlfgf74cgvwppdl53hsy12b421n"; + rev = "fce628885b54635b0287b3337626752b2725369d"; + sha256 = "1pcxl00iwhrsi57s6gbf3bch00pkdxbg46p8xryn1w5r16xzd9pm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h"; name = "plantuml-mode"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/plantuml-mode"; license = lib.licenses.free; @@ -55848,8 +56474,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "0df827ef0bd0b0f858cc6dfd6ea83a4502e5f13b"; - sha256 = "0z836mvpnm7pvv0b7ygls0s602yaydv1farrazscnx6sk8303qd9"; + rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42"; + sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -55865,12 +56491,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20170315.1934"; + version = "20170818.533"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5"; - sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq"; + rev = "26e4583311ebc472f7bba59a1189f04938f2c03e"; + sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -55949,12 +56575,12 @@ point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; - version = "20141225.2110"; + version = "20170808.958"; src = fetchFromGitHub { owner = "dgutov"; repo = "point-stack"; - rev = "86b37666882398f4db93f3aba0ebb7b7965032cd"; - sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp"; + rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2"; + sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack"; @@ -56028,6 +56654,27 @@ license = lib.licenses.free; }; }) {}; + poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: + melpaBuild { + pname = "poly-ruby"; + version = "20170802.648"; + src = fetchFromGitHub { + owner = "knu"; + repo = "poly-ruby.el"; + rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11"; + sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby"; + sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg"; + name = "poly-ruby"; + }; + packageRequires = [ emacs polymode ]; + meta = { + homepage = "https://melpa.org/#/poly-ruby"; + license = lib.licenses.free; + }; + }) {}; polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; @@ -56052,12 +56699,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20170310.634"; + version = "20170817.2253"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488"; - sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla"; + rev = "58a4368d91d472aa47a83f498be82db8929cf41a"; + sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -56094,12 +56741,12 @@ pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pony-mode"; - version = "20151028.302"; + version = "20170807.822"; src = fetchFromGitHub { owner = "davidmiller"; repo = "pony-mode"; - rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7"; - sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr"; + rev = "760684d30b6c234d1b88c9a4673a808f36f7f341"; + sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode"; @@ -56451,12 +57098,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20161121.2320"; + version = "20170708.1442"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "67538e4dbc2f1d2f270142481eb0b0d24e8cde36"; - sha256 = "0jjv6wszsnrdi5l5qz4d50nj6p6zzyvqmn1j31zlhypbvi05isls"; + rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4"; + sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56615,12 +57262,12 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20150119.1241"; + version = "20170802.1753"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; - rev = "19bce980d41607bef8af4b1901343abfca0f0855"; - sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0"; + rev = "341d85f8ecdc8834956a0352ece542f45def88db"; + sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; @@ -56636,12 +57283,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170703.519"; + version = "20170712.2334"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "22a333402aa9bbe00e2943f6aa6e25c402345241"; - sha256 = "0dsm4iz8d2qj72a7jpznjy4skiznsh5lpai95p612dlanafgfpyn"; + rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40"; + sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -56865,12 +57512,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20160929.2302"; + version = "20170816.1114"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "50a5d4e0c720e73ef0919cf8019a32d934e86616"; - sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57"; + rev = "94d4d2870b86af1185e6395dabf15b3695846f38"; + sha256 = "017xw1havxq9v6vxwvarmvxwk41jsrjik1mak5habmpfpwv78k01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; @@ -57073,12 +57720,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170416.148"; + version = "20170820.2210"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "56e262dd3b5998d0dc6a590d06bc11058839c588"; - sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z"; + rev = "74bac5b5744ed293533966cc4959cb366029fa5c"; + sha256 = "13yw4rjmjgsajab4njlq7g5g8xh97f2xwpq9f2qfbsavkbpbf2p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57178,12 +57825,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170704.2358"; + version = "20170814.522"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "c917c6e188de27331815f39511ed45a408de22d0"; - sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif"; + rev = "d1dbd67ebdee9405ac95b0fbd71210df54457fb1"; + sha256 = "06v3wix90y92rjp769hrl92p57p60acf1b9mpdllcy48l6q0p074"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -57203,8 +57850,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; - sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; + rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d"; + sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -57283,12 +57930,12 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20170410.905"; + version = "20170717.1151"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131"; - sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s"; + rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008"; + sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -57448,6 +58095,27 @@ license = lib.licenses.free; }; }) {}; + proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "proportional"; + version = "20170628.137"; + src = fetchFromGitHub { + owner = "ksjogo"; + repo = "proportional"; + rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a"; + sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional"; + sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx"; + name = "proportional"; + }; + packageRequires = [ emacs use-package ]; + meta = { + homepage = "https://melpa.org/#/proportional"; + license = lib.licenses.free; + }; + }) {}; prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prosjekt"; @@ -57476,8 +58144,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "6bd51a59df41b99058ec8c2b03a177a218267ce5"; - sha256 = "1bgi9954xb70wjymxyzihjfqy29ps28x9h1brnd2krza15rwgrwf"; + rev = "ba4e54724d2e6a1881c4fe88664d81fbacaf8c08"; + sha256 = "1qa6qjixgw82jd9zwi6c11lqh2qkc444pwp1lczjrw2fm4iyw549"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57493,12 +58161,12 @@ protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protocols"; - version = "20170327.758"; + version = "20170802.432"; src = fetchFromGitHub { owner = "davep"; repo = "protocols.el"; - rev = "1c93a48d4173635a7b742248797f424e7ce851e3"; - sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr"; + rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77"; + sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; @@ -57514,15 +58182,15 @@ 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 = "20170607.1512"; + version = "20170817.1206"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "fb19c2624d209919204a1e247741595c500b5b74"; - sha256 = "0732l03h37xqamnfqbazzbbx99rc8kn8k0rfxrk0ncjmfpj60jiy"; + rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e"; + sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; name = "psc-ide"; }; @@ -57545,16 +58213,16 @@ psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20160717.1125"; + version = "20170818.1301"; src = fetchFromGitHub { - owner = "ardumont"; + owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "d773b407f772e6ab3c40406c22824889e0fd14fe"; - sha256 = "1kvw5qj975s7r58858aiql9861rglz1xgj9n69g5li9mcdxk0v2f"; + rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5"; + sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci"; - sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; + sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9"; name = "psci"; }; packageRequires = [ dash f purescript-mode s ]; @@ -57734,12 +58402,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170614.2215"; + version = "20170719.752"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608"; - sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r"; + rev = "fb1b683191d767eab312ea424de3517062d86420"; + sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -57839,14 +58507,14 @@ pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pushover"; - version = "20160718.857"; + version = "20170818.1403"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; - rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; - sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; + rev = "bbe3ac8df3c532a72da4552615af960b8a577588"; + sha256 = "187bisngi37n66ik2dq7rg4hy4nlxl9pifqgqq08kf9238y8hd11"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9553cd029bc0733c89d2c790cb173d9668a9eba/recipes/pushover"; sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl"; name = "pushover"; }; @@ -57901,15 +58569,15 @@ py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-gnitset"; - version = "20140224.2010"; + version = "20170821.1032"; src = fetchFromGitHub { owner = "quodlibetor"; repo = "py-gnitset"; - rev = "471eb99b83eb9f6915d8ca241e9770ddd6244a78"; - sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6"; + rev = "1e993cc29cbc31e06fe1e335dec198e21972fa55"; + sha256 = "1hslq2bdk95cgza9qbskxf942ckhjb4bqi6nrhbmlnm9agmjqm59"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/187d97c797818c4e0f61073b9e24baf925c437ff/recipes/py-gnitset"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/py-gnitset"; sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r"; name = "py-gnitset"; }; @@ -58052,8 +58720,8 @@ src = fetchFromGitHub { owner = "mattharrison"; repo = "pycoverage.el"; - rev = "dbc152a807efcaac4e50bedb64c026674009a279"; - sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs"; + rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d"; + sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage"; @@ -58073,8 +58741,8 @@ src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "84133eefce0e52a861894815f0c414f1f276f6e1"; - sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg"; + rev = "916153516382e5546b59b46342c58ed76cf27faf"; + sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; @@ -58110,12 +58778,12 @@ pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: melpaBuild { pname = "pyenv-mode"; - version = "20160221.1123"; + version = "20170801.1648"; src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "560614d47e3b0331f5c0e136763be69ef052048d"; - sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j"; + rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; + sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -58191,15 +58859,99 @@ license = lib.licenses.free; }; }) {}; + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + melpaBuild { + pname = "pyim"; + version = "20170809.413"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; + }; + 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 ]; + meta = { + homepage = "https://melpa.org/#/pyim"; + license = lib.licenses.free; + }; + }) {}; + pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-basedict"; + version = "20170726.1959"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-basedict"; + rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab"; + sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; + sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; + name = "pyim-basedict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-basedict"; + license = lib.licenses.free; + }; + }) {}; + pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-cangjie5dict"; + version = "20170729.1946"; + src = fetchFromGitHub { + owner = "erstern"; + repo = "pyim-cangjie5dict"; + rev = "c8618590780b818db1a67a29bc47c5d25903517a"; + sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict"; + sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn"; + name = "pyim-cangjie5dict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-cangjie5dict"; + license = lib.licenses.free; + }; + }) {}; + pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-wbdict"; + version = "20170724.1527"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-wbdict"; + rev = "114489ed97e825ae11a8d09da6e873820cf23106"; + sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; + sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; + name = "pyim-wbdict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; - version = "20170303.732"; + version = "20170808.346"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "2482c8efee8edab9f26ea278848d786323fcff9d"; - sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv"; + rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76"; + sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -58240,8 +58992,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "d4b0bdaec9042333f9d75688b3145658adef9f91"; - sha256 = "0ik86kp7rmg0zyw3471pj82x5w9hpg6w3k3cvv4zjgfrhilxb9z1"; + rev = "3b56d183ca3b148d2ff092bbda5b061c20660a2c"; + sha256 = "1q0z0pij051nv9yb60c7wcdirycz3p3nl63yhs58pvpw6hxnwcfp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -58383,12 +59135,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170626.1017"; + version = "20170813.50"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "11c6a487b2a3a22d1fbb7ae16bf3b7a5dabdeadb"; - sha256 = "1yk4rrpfrqmq6cm9fg64qh7zzwrvwfpbixfp0352c0jplzxqgxqp"; + rev = "8c3d55344fecd2837a3f268472f89866365fb54b"; + sha256 = "0cnzj17wrs5590kc84kywdk5xbs2149kygb3ys74jcli7zvg8bbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58425,12 +59177,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20170427.1549"; + version = "20170711.1155"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "7052b5ff1b599ce04800779b283bf4d293a7f223"; - sha256 = "18i0nh4qslbnj106hnxjmzgyg1gwyv2k968xwna73lzp7d4ykaq4"; + rev = "196efba6dae286e0719bc5993ee23e01db9a0912"; + sha256 = "00hbwy0cnv2v1djncijmbsdxddd48p4g0mfr4nn83203243hvbn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -58614,12 +59366,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20170620.2318"; + version = "20170727.557"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd"; - sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4"; + rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d"; + sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -58719,12 +59471,12 @@ quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "quickref"; - version = "20160326.936"; + version = "20170817.532"; src = fetchFromGitHub { owner = "pd"; repo = "quickref.el"; - rev = "9cad569c6eaeacf0b393a2c520ba444f6521ff38"; - sha256 = "13svdvww8dbv75lg66xhca6xi08k7k44rsx2ckdf82j9i52y5lw6"; + rev = "f368c8b8219bb90498c5ab84e26f00eedaa234cf"; + sha256 = "0nalnfb816qk1dfxjk9j8r5lvzv2k4jf747xdjbj2mcvv07g2jd2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/quickref"; @@ -58779,6 +59531,27 @@ license = lib.licenses.free; }; }) {}; + quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quiz"; + version = "20170818.415"; + src = fetchFromGitHub { + owner = "davep"; + repo = "quiz.el"; + rev = "64bc2f4b72f70a6c9eab6ebeaa49afb5fc34b879"; + sha256 = "0zx1ic6cn95wa7b8afq0v2cb7rf8w48gmjlp2dlhz06vk78j1w27"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; + sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg"; + name = "quiz"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/quiz"; + license = lib.licenses.free; + }; + }) {}; r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "r-autoyas"; @@ -58824,12 +59597,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170617.1942"; + version = "20170818.1226"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7"; - sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y"; + rev = "0f8f36e1726166b1974ebea0e4c2e43de8fe2509"; + sha256 = "09iy75d47q8s9nxv6qww6v6l87jv5fcqbim81hc56f2fwq3akylk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -58842,27 +59615,6 @@ license = lib.licenses.free; }; }) {}; - railgun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "railgun"; - version = "20121016.2257"; - src = fetchFromGitHub { - owner = "mbriggs"; - repo = "railgun.el"; - rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8"; - sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ba60673f2cb04176ed734c6457a20211609118/recipes/railgun"; - sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0"; - name = "railgun"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/railgun"; - license = lib.licenses.free; - }; - }) {}; rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rails-log-mode"; @@ -58884,27 +59636,6 @@ license = lib.licenses.free; }; }) {}; - rails-new = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rails-new"; - version = "20141221.49"; - src = fetchFromGitHub { - owner = "cheunghy"; - repo = "rails-new"; - rev = "b68055a99cde15f9d02ab36b8ad0ea7ab35b2283"; - sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f86ccce9ea4ef3cb7e162d4572609d3a8216cc/recipes/rails-new"; - sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h"; - name = "rails-new"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rails-new"; - license = lib.licenses.free; - }; - }) {}; railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; @@ -59097,12 +59828,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20170522.2331"; + version = "20170817.857"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "e371cdc2d6065099fe7c68583597b1d0abea792b"; - sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1"; + rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef"; + sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -59139,12 +59870,12 @@ rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "rats"; - version = "20170505.245"; + version = "20170818.313"; src = fetchFromGitHub { owner = "ane"; repo = "rats.el"; - rev = "40aee473d369cd27593cb7709f4792d1006ca8f7"; - sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6"; + rev = "a6d55aebcc54f669c6c6ffedf84364c4097903cc"; + sha256 = "0cskw05jb7wckhfs2qs9pn5icxa93ay2mw2i1brsmdd0igz34lg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats"; @@ -59269,8 +60000,8 @@ src = fetchFromGitHub { owner = "kensanata"; repo = "rcirc-color"; - rev = "a94c7811e6ab578a138eb582f7ce31d3568b5c4d"; - sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497"; + rev = "9fa5150685fac91323e7e32a1df190270de2ac01"; + sha256 = "08v3gldqdhrix7k1qw1in1c9kr0xa43dlnscq0lm63arlnmijh3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/146b31de03f1f588fda3f7e27a538f87e71077f1/recipes/rcirc-color"; @@ -59286,12 +60017,12 @@ rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-groups"; - version = "20160115.431"; + version = "20170731.1401"; src = fetchFromGitHub { owner = "dimitri"; repo = "rcirc-groups"; - rev = "e858084e5956ba32a84046616326c0903de6d59f"; - sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh"; + rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7"; + sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups"; @@ -59388,15 +60119,36 @@ license = lib.licenses.free; }; }) {}; + rdxmk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rdxmk"; + version = "20170629.1834"; + src = fetchFromGitHub { + owner = "jsalzbergedu"; + repo = "rdxmk"; + rev = "e78749fb29738365ffa4d863ffabeb969ebb0bcf"; + sha256 = "0gwlqjk84ih89c2ckx0rrw07jgwd32wfwj4mibchdrn0ai891md0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db54339795e0519f154328e54d47a7a0c80afc71/recipes/rdxmk"; + sha256 = "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky"; + name = "rdxmk"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/rdxmk"; + license = lib.licenses.free; + }; + }) {}; react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "react-snippets"; - version = "20160712.1521"; + version = "20170803.1550"; src = fetchFromGitHub { owner = "johnmastro"; repo = "react-snippets.el"; - rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709"; - sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; @@ -59416,8 +60168,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "read-aloud.el"; - rev = "d5f80ab72054a957aed25224639c1779cae5f4d1"; - sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy"; + rev = "c662366226abfb07204ab442b4f853ed85438d8a"; + sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud"; @@ -59496,12 +60248,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170630.1507"; + version = "20170803.632"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "b3719faa0207688db5db543e5420648c11928d4f"; - sha256 = "0hn9qcc6c5lgna57yjlwkfl5yahwwgvjnhgp1r0idzamfc631g5g"; + rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3"; + sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59607,12 +60359,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20170406.2136"; + version = "20170730.943"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077"; - sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk"; + rev = "ee0d8796eca831110b7084a2af96fb4184d0a418"; + sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -59834,12 +60586,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20160912.1847"; + version = "20170810.2004"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "7758d2a42a1a98199a9ed6af95bf70fe70f0c168"; - sha256 = "0q08yfrv6mfkhh5rm0wq6c8p6sb60rib5z42k98y9d92gsn96lzz"; + rev = "56916601db4797712c7f1f62b44a8ccd5de3c6f0"; + sha256 = "0kpyfx228n0dj36h80hkhl23phx6cmgcadig9kn8gsz9j2icfrpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -59893,27 +60645,6 @@ license = lib.licenses.free; }; }) {}; - refheap = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: - melpaBuild { - pname = "refheap"; - version = "20140902.1402"; - src = fetchFromGitHub { - owner = "Raynes"; - repo = "refheap.el"; - rev = "d41f8efb8e913b29035f545914859e3f18287492"; - sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/refheap"; - sha256 = "11w2pmkz56141gvyzyims9rd42djizni3g6dw4qa48bvlqc56klh"; - name = "refheap"; - }; - packageRequires = [ json ]; - meta = { - homepage = "https://melpa.org/#/refheap"; - license = lib.licenses.free; - }; - }) {}; refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; @@ -60151,8 +60882,8 @@ src = fetchFromGitHub { owner = "anler"; repo = "remember-last-theme"; - rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf"; - sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr"; + rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51"; + sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme"; @@ -60172,8 +60903,8 @@ src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-repeatable-motion"; - rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee"; - sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm"; + rev = "f29effdc4121c2dc7e3fec9b3a62debce29cda9d"; + sha256 = "11s7r5g0djj0yc8ll7jfw5v3m9kyvaiscndnfnvvjw5lwgfyh0v3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion"; @@ -60251,10 +60982,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170307.942"; + version = "20170801.1947"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5"; + sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj"; name = "replace+.el"; }; recipeFile = fetchurl { @@ -60460,12 +61191,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170703.33"; + version = "20170727.825"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; - sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; + rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; + sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60485,8 +61216,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; - sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; + rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518"; + sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -60563,12 +61294,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170623.640"; + version = "20170721.940"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286"; - sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v"; + rev = "63fb1edee017177c44f8b663a707201b3dd78345"; + sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -60605,12 +61336,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20170105.2156"; + version = "20170804.545"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e"; - sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix"; + rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea"; + sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -60623,27 +61354,6 @@ license = lib.licenses.free; }; }) {}; - revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "revive"; - version = "20150417.1555"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "revive"; - rev = "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818"; - sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/965891688e94839e63fcc7c22dae317bb56d1ff6/recipes/revive"; - sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5"; - name = "revive"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/revive"; - license = lib.licenses.free; - }; - }) {}; reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reykjavik-theme"; @@ -60687,12 +61397,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170622.1135"; + version = "20170809.1107"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; - sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; + rev = "081685a8c624220ece68d6dca8d60016585b04ff"; + sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60726,15 +61436,36 @@ license = lib.licenses.free; }; }) {}; + rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rib-mode"; + version = "20170726.748"; + src = fetchFromGitHub { + owner = "blezek"; + repo = "rib-mode"; + rev = "97470158784c3c212e22e2c20b8471ee65ba59af"; + sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode"; + sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587"; + name = "rib-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rib-mode"; + license = lib.licenses.free; + }; + }) {}; rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; - version = "20160725.1255"; + version = "20170813.622"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "478f0fbc0dbba6619a96a471b9b295f2f436475f"; - sha256 = "1n07bvjaz468zbd7am3rmw98a97clz8p4x6ryhbd4riqmfh845wi"; + rev = "333e4669f76a0fb68b433117d377711e418a525e"; + sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -60768,6 +61499,27 @@ license = lib.licenses.free; }; }) {}; + rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rimero-theme"; + version = "20170819.648"; + src = fetchFromGitHub { + owner = "yveszoundi"; + repo = "emacs-rimero-theme"; + rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb"; + sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme"; + sha256 = "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r"; + name = "rimero-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rimero-theme"; + license = lib.licenses.free; + }; + }) {}; rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }: melpaBuild { pname = "rinari"; @@ -60813,12 +61565,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20170602.152"; + version = "20170810.1118"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; - sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; + rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d"; + sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -60834,12 +61586,12 @@ riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "riscv-mode"; - version = "20161001.1838"; + version = "20170804.821"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "riscv-mode"; - rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570"; - sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4"; + rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749"; + sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode"; @@ -60855,12 +61607,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170422.832"; + version = "20170808.634"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; - sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -61086,12 +61838,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170705.144"; + version = "20170819.1611"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; - sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; + rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b"; + sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61152,8 +61904,8 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59273"; - sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; + rev = "59630"; + sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; @@ -61206,39 +61958,19 @@ license = lib.licenses.free; }; }) {}; - ruby-dev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ruby-dev"; - version = "20130811.151"; - src = fetchFromGitHub { - owner = "Mon-Ouie"; - repo = "ruby-dev.el"; - rev = "3a6f6e489697916dd554852492bd325879be2e44"; - sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b6e0c48ac1fa26e027c6a17f20eee7c084568cae/recipes/ruby-dev"; - sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh"; - name = "ruby-dev"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ruby-dev"; - license = lib.licenses.free; - }; - }) {}; - ruby-electric = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: + ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "20150424.752"; - src = fetchsvn { - url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59273"; - sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; + version = "20170810.430"; + src = fetchFromGitHub { + owner = "knu"; + repo = "ruby-electric.el"; + rev = "3553448a780a1ea5c3b0e9becd820d4762876593"; + sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric"; - sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; + sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2"; name = "ruby-electric"; }; packageRequires = []; @@ -61254,8 +61986,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "ruby-end.el"; - rev = "ea453f5ac6259f09667fa26b865b6afacd06aa97"; - sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55"; + rev = "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0"; + sha256 = "1f530gaiy010qln51g83m1llazhyfi8ws0lvsb982fhi4dh1xfk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end"; @@ -61289,27 +62021,6 @@ license = lib.licenses.free; }; }) {}; - ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ruby-guard"; - version = "20160131.1752"; - src = fetchFromGitHub { - owner = "cheunghy"; - repo = "ruby-guard"; - rev = "bc864cadb241be855ada148f07e5048cce0991a0"; - sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d47bb7eb0f6c56fa7fcf84478aab34f938d195/recipes/ruby-guard"; - sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr"; - name = "ruby-guard"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ruby-guard"; - license = lib.licenses.free; - }; - }) {}; ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; @@ -61415,6 +62126,27 @@ license = lib.licenses.free; }; }) {}; + rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rufo"; + version = "20170718.716"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "rufo.el"; + rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe"; + sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; + sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; + name = "rufo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rufo"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -61481,12 +62213,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170606.457"; + version = "20170820.651"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "ac6a45e6091c0d542b696b6e13551be7e333264a"; - sha256 = "0hba3djxzgpk13xcfz51s0qlv9415q8701pkw9qq974fxqpcrawl"; + rev = "f57a8ebfc33de72e0ca6fe61ed3d7a622510b5b3"; + sha256 = "0f42sw2c20nv5nyamd6smbxfkqaygg3li511l5bmwmp557gkakl5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -61628,12 +62360,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20170218.1829"; + version = "20170806.2110"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499"; - sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15"; + rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36"; + sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -61859,12 +62591,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170629.2356"; + version = "20170820.924"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "03834eb7fa0922efaa31d2157d9effa2b7e04810"; - sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw"; + rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd"; + sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -61884,8 +62616,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "0b7aaa108710b2f197cbcb32fdb3ae12ff121747"; - sha256 = "1yp382s4jxbyn646mv245gm5c2h1n734r8qzrspimipr79mrbklk"; + rev = "959b9c4b712ed5db6938fc6ebdf2c1cb58df6c4f"; + sha256 = "1wjfxwd6xzc0yn1crrfw2a1j91sh9x6nxkm4rypkznj1qjwn7icq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -61922,12 +62654,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170611.806"; + version = "20170802.432"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -62297,12 +63029,12 @@ scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }: melpaBuild { pname = "scrooge"; - version = "20160718.1735"; + version = "20170728.1106"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "emacs-scrooge"; - rev = "5e8a301919ec88a7aa48a9c66cafb1bddd9f6100"; - sha256 = "0ndv9j7n9z53f7q0w7cgb4wsh7vyb8f4bga723cm7j0gipx8fjnf"; + rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a"; + sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge"; @@ -62339,12 +63071,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20170501.2155"; + version = "20170801.2216"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f"; - sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif"; + rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219"; + sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -62463,11 +63195,11 @@ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "secretaria"; - version = "20170430.1724"; + version = "20170813.1107"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; - rev = "7551dfa21a4a796e0306041145c32c2ec8738028"; - sha256 = "1wiqk8ja3wjv7kmnnd93fg9rync08wjyhy1ssxan5csqfg89vw5a"; + rev = "7bd1cf591528b18a153e15a260d7817b72c900f2"; + sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; @@ -62525,12 +63257,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170618.500"; + version = "20170803.547"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323"; - sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v"; + rev = "9197838617211c71a965aa4b009249d231249902"; + sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -62651,12 +63383,12 @@ sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }: melpaBuild { pname = "sensitive"; - version = "20131015.635"; + version = "20170818.551"; src = fetchFromGitHub { owner = "timvisher"; repo = "sensitive.el"; - rev = "7f2c77811e983234e1a93055d78cc4480ae807c3"; - sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3"; + rev = "69dd6125a41d8b55f4b6ba61daa4d1aa1f716fa8"; + sha256 = "0nj71ds4frfi16hsfswmp89rfxkvvdvhdlsqizzi9cbvr49s0l1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e5468ce136fabe59e1434f8a7f265f41c5e64c1/recipes/sensitive"; @@ -62676,8 +63408,8 @@ src = fetchFromGitHub { owner = "sbelak"; repo = "sentence-highlight"; - rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa"; - sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd"; + rev = "c7a501f38de5a9b52b1f30e21299fe1c374a27c7"; + sha256 = "13idmpw7nz75bpjbi85pv89annqqffc0gjizsazbzfdm21i8p7y6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight"; @@ -62735,12 +63467,12 @@ sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sequences"; - version = "20130908.1122"; + version = "20170818.552"; src = fetchFromGitHub { owner = "timvisher"; repo = "sequences.el"; - rev = "2bcc54a6738202fffb23e9579b9695337ba6ef26"; - sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl"; + rev = "564ebbd93b0beea4e75acfbf824350e90b5d5738"; + sha256 = "0ym2bl9dpsglz35is0iwxfw5w7zs9398bkln8lgv28nr6kw0ym4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf716df68fb2d6a41fe75fac0b41e356bddcf30/recipes/sequences"; @@ -62818,12 +63550,12 @@ services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "services"; - version = "20170327.835"; + version = "20170802.430"; src = fetchFromGitHub { owner = "davep"; repo = "services.el"; - rev = "87d65bf9fd8b02101f751846c650fc518355d1ea"; - sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3"; + rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596"; + sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; @@ -63465,12 +64197,12 @@ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: melpaBuild { pname = "shr-tag-pre-highlight"; - version = "20170525.902"; + version = "20170820.2127"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "shr-tag-pre-highlight.el"; - rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; - sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36"; + sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; @@ -63483,6 +64215,27 @@ license = lib.licenses.free; }; }) {}; + shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "shrink-path"; + version = "20170812.1947"; + src = fetchFromGitLab { + owner = "bennya"; + repo = "shrink-path.el"; + rev = "9d06c453d1537df46a4b703a29213cc7f7857aa0"; + sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; + sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; + name = "shrink-path"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/shrink-path"; + license = lib.licenses.free; + }; + }) {}; shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shrink-whitespace"; @@ -63528,12 +64281,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170703.926"; + version = "20170805.1619"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; - sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63567,27 +64320,6 @@ license = lib.licenses.free; }; }) {}; - sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sicp"; - version = "20170124.1650"; - src = fetchFromGitHub { - owner = "webframp"; - repo = "sicp-info"; - rev = "935da01b7aa782a1a7f9fd17b5512132b197da8c"; - sha256 = "0mgbhf5cp7z6yd5kl5x4whlc6nfm2lqq6khxcmilrbgv4was55sj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp"; - sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz"; - name = "sicp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sicp"; - license = lib.licenses.free; - }; - }) {}; sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sift"; @@ -63842,12 +64574,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20170603.1542"; + version = "20170803.540"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -63968,12 +64700,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20170122.938"; + version = "20170730.1241"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "18a90f401451f8ca0486bdaf45647ac3ccebc0ac"; - sha256 = "1y25c3mq5fzlsjjj98p75jxynk1aaj72vp1zi6jrr2g8hay1yi31"; + rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590"; + sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -64052,12 +64784,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170701.436"; + version = "20170814.116"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "35b0ae538b2023c91b035b3f9c133b28f0afbaf8"; - sha256 = "12ks2d91bvsxkwwjjgs9ymcwf3w90x7r0krvb6nsgh970s35yv78"; + rev = "b5ca813fa5c56f65fd1302d29f5babd0965a0751"; + sha256 = "128wggbny4z6zhr9ldw3blrj5mbgvdl5bfap7i7v8pnzz660z9wy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64094,12 +64826,12 @@ slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slim-mode"; - version = "20140611.950"; + version = "20170728.648"; src = fetchFromGitHub { owner = "slim-template"; repo = "emacs-slim"; - rev = "869c84821cf3e556b380c5c35d8ad62287c4df58"; - sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1"; + rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87"; + sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode"; @@ -64115,12 +64847,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170705.643"; + version = "20170820.1946"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; - sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; + rev = "5ba5e9036ac39fdb51a5d0c07ff794ec2c30eef4"; + sha256 = "0f85rvsy2g136qwd3fkkxnf5ppkqnn1gvzc5qfzhl2y3fycy4vkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64133,27 +64865,6 @@ license = lib.licenses.free; }; }) {}; - slime-annot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: - melpaBuild { - pname = "slime-annot"; - version = "20131230.1908"; - src = fetchFromGitHub { - owner = "arielnetworks"; - repo = "cl-annot"; - rev = "c99e69c15d935eabc671b483349a406e0da9518d"; - sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/498c938a9d5c51f0842fdae317f5b2fae33bb6d5/recipes/slime-annot"; - sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n"; - name = "slime-annot"; - }; - packageRequires = [ slime ]; - meta = { - homepage = "https://melpa.org/#/slime-annot"; - license = lib.licenses.free; - }; - }) {}; slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; @@ -64178,12 +64889,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "20160817.2344"; + version = "20170718.1157"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "f90fc274c2f764a5962a3cbcf0ea00622ee5bfe6"; - sha256 = "0wknygb8gnr49xc5wyyalgs97zk0qj33wwcw1kcxah4nmvzgqg7f"; + rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f"; + sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -64196,36 +64907,15 @@ license = lib.licenses.free; }; }) {}; - slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slime-ritz"; - version = "20130218.1537"; - src = fetchFromGitHub { - owner = "pallet"; - repo = "ritz"; - rev = "4003fdaa5657d4ed1eeb0e244c46658cbb981667"; - sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz"; - sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a"; - name = "slime-ritz"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slime-ritz"; - license = lib.licenses.free; - }; - }) {}; slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-theme"; - version = "20141115.2302"; + version = "20170808.622"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-slime-theme"; - rev = "441288a5791d24e79ada2698888653ef3cf2ac6f"; - sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx"; + rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f"; + sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme"; @@ -64304,12 +64994,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170629.235"; + version = "20170802.413"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; - sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; + rev = "5e86904ae3facafb3204607c08f8b14aa53fabec"; + sha256 = "05h5wsv2a4maqrsvr5klj1pqnhaj0cxlzyv7dvs5vb9wkd0mblzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -64448,48 +65138,6 @@ license = lib.licenses.free; }; }) {}; - sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: - melpaBuild { - pname = "sly-repl-ansi-color"; - version = "20160214.18"; - src = fetchFromGitHub { - owner = "PuercoPop"; - repo = "sly-repl-ansi-color"; - rev = "505d162d52219654b57a455e26c9e02c7254a8f2"; - sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2fc906b674e1829e023e6a1c0e4cf87830216a8/recipes/sly-repl-ansi-color"; - sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi"; - name = "sly-repl-ansi-color"; - }; - packageRequires = [ cl-lib sly ]; - meta = { - homepage = "https://melpa.org/#/sly-repl-ansi-color"; - license = lib.licenses.free; - }; - }) {}; - smali-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "smali-mode"; - version = "20160406.1556"; - src = fetchFromGitHub { - owner = "strazzere"; - repo = "Emacs-Smali"; - rev = "10437ab0b29994cf4bf67ec28ccf82a74b8c026b"; - sha256 = "1ircjz571q1sgjkxryc3rlcpdrh6ac7ydnvclr7ldh3nhz77pm7p"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/90182e5bbf79c570b3cb59f541636d4aad5d8652/recipes/smali-mode"; - sha256 = "17fcr66ky9hmj74i4wr3y9n1d9g8hib7l3gmr4jxj8vsjzfxy7h7"; - name = "smali-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/smali-mode"; - license = lib.licenses.free; - }; - }) {}; smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-comment"; @@ -64658,12 +65306,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20160818.508"; + version = "20170708.1317"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9"; - sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr"; + rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; + sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -64683,8 +65331,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9"; - sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr"; + rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; + sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -64826,12 +65474,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170705.1319"; + version = "20170723.1205"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "34ca8a68b201879e88c3814a2dfe3a1b9609bac3"; - sha256 = "0ybij6m0h27q3q1pv1cny5bpg35q0m0yx071db40qd8pdvxn0b90"; + rev = "6db99046471460716fde0b450ab92b849cb23a3e"; + sha256 = "08blry9257jl301wg8hl79m78ngsnp0gq0vh5jr7cgg49a9ac45l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64886,27 +65534,6 @@ license = lib.licenses.free; }; }) {}; - smartwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "smartwin"; - version = "20160513.56"; - src = fetchFromGitHub { - owner = "jerryxgh"; - repo = "smartwin"; - rev = "61528c1cf6c8d913a44e60c40fa8773b7e400eac"; - sha256 = "1jcaspqrm23viigk0701711bmaqsyc5fbpkszf7bg7nvhkl4pfqy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/29c5d92b518ad74f4dff2d83fb0230d49e76aaf1/recipes/smartwin"; - sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif"; - name = "smartwin"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/smartwin"; - license = lib.licenses.free; - }; - }) {}; smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smarty-mode"; @@ -65033,18 +65660,19 @@ license = lib.licenses.free; }; }) {}; - sml-modeline = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }: + sml-modeline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sml-modeline"; - version = "20120110.1240"; - src = fetchbzr { - url = "lp:~nxhtml/nxhtml/main"; - rev = "835"; - sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4"; + version = "20170614.1411"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "sml-modeline"; + rev = "d2f9f70174c4cf68c67eb3bb8088235735e34d9a"; + sha256 = "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3438977c0bf907b7a3480e6b88b277109c663385/recipes/sml-modeline"; - sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline"; + sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y"; name = "sml-modeline"; }; packageRequires = []; @@ -65263,6 +65891,27 @@ license = lib.licenses.free; }; }) {}; + snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "snoopy"; + version = "20170730.1951"; + src = fetchFromGitHub { + owner = "anmonteiro"; + repo = "snoopy-mode"; + rev = "8adce636376812df99bd79f3fbb3d9ec19a02351"; + sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; + sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; + name = "snoopy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/snoopy"; + license = lib.licenses.free; + }; + }) {}; socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "socyl"; @@ -65350,12 +65999,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20170610.442"; + version = "20170809.1220"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800"; - sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm"; + rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f"; + sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -65371,12 +66020,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20170430.800"; + version = "20170818.447"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "8aa2ce76327dc7081b1c9a310e858fe2b854d899"; - sha256 = "1a8hqagh4jjskyyc66s2xyspn9k4hvl430kfzgjcfzis889v19y7"; + rev = "7bc1e83e7fc4fa1d6d02322ebab73b30d8b0ffdf"; + sha256 = "1vs731wn7am01d510vxls0adyb7rc7mx7hfqy1xn1kfls4bmi4x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -65392,12 +66041,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20161017.1506"; + version = "20170712.1442"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "db392f96f8e892b7788ebe25819a8ec195bb376d"; - sha256 = "1x1ljbmrn06pbdcb7kjivbh2f2m29ivwa1ifl4lgi2rh884s27ma"; + rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f"; + sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -65669,27 +66318,6 @@ license = lib.licenses.free; }; }) {}; - sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { - pname = "sourcetalk"; - version = "20140823.739"; - src = fetchFromGitHub { - owner = "malroc"; - repo = "sourcetalk_emacs"; - rev = "aced89fa8776e6d5e42dad4a863e159959f08de6"; - sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk"; - sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z"; - name = "sourcetalk"; - }; - packageRequires = [ request ]; - meta = { - homepage = "https://melpa.org/#/sourcetalk"; - license = lib.licenses.free; - }; - }) {}; sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sourcetrail"; @@ -65756,12 +66384,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "20170703.237"; + version = "20170719.131"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "655ad80f6d63aa6bb2fcc8f73e5a2c65f807b02d"; - sha256 = "0b4l3afajkcgahzara666fhkxm6wbgim65r4yy73psadhwpfhp3l"; + rev = "84ee6d37b8e6d50763ca2977133684143fc61cf3"; + sha256 = "1w66rfp1kmhqhnqjz2j41i245fw6840q09bfhsaci6kbhvhd5fnm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -65777,12 +66405,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170705.1052"; + version = "20170731.845"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "6f41a3321296c35c1b77660cf3956f07b3b68086"; - sha256 = "0n8gchqrm8nm687wpqm599622yhvylkf1vslw0akgq3r4vsyfini"; + rev = "5bcac14ab4b99bc3bef20fd62ef981c4590c4021"; + sha256 = "0xx22mf4wskn9gv04farwyp3mpx2ab3lsmmxvd3k00x99637x6jq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65798,12 +66426,12 @@ spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spaces"; - version = "20130610.49"; + version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; - rev = "164be41b588b615864258c502583100d3ccfe13e"; - sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs"; + rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; + sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa5d57074f73cf11607f2f1610f92a0c77367f2a/recipes/spaces"; @@ -65861,12 +66489,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170619.255"; + version = "20170731.542"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "c06eac2abae29ae55794e61ebd06890909edda7c"; - sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx"; + rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e"; + sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -65901,12 +66529,12 @@ speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speech-tagger"; - version = "20160224.2"; + version = "20170728.1129"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "speech-tagger"; - rev = "60ce97b0fc34eb32f507957646679fff77b5f0fd"; - sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6"; + rev = "61955b40d4e8b09e66a3e8033e82893f81657c06"; + sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger"; @@ -66089,12 +66717,12 @@ splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "splitter"; - version = "20130705.50"; + version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; - rev = "164be41b588b615864258c502583100d3ccfe13e"; - sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs"; + rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; + sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/129f0d20616226c449bdaf672c43a06e8f281869/recipes/splitter"; @@ -66317,27 +66945,6 @@ license = lib.licenses.free; }; }) {}; - sql-mssql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sql-mssql"; - version = "20160512.137"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "sql-mssql"; - rev = "f8a7f16720fbc7480a7ae83e21958860f66c1ccf"; - sha256 = "02jsz69j1mi082s0xfk99qrm6wskdfz20na3jc7c35f564l493hs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f4df28e4f5fe01a7c4e02744c4a335047779fe1d/recipes/sql-mssql"; - sha256 = "15z60d2244mxhigr52g332qzjj5ygqyl1i6c19q6vfv2z2vcvy7x"; - name = "sql-mssql"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/sql-mssql"; - license = lib.licenses.free; - }; - }) {}; sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlite"; @@ -66361,10 +66968,10 @@ }) {}; sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlplus"; - version = "20161110.758"; + version = "20170710.150"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=25"; - sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3"; + url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26"; + sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q"; name = "sqlplus.el"; }; recipeFile = fetchurl { @@ -66444,12 +67051,12 @@ ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssass-mode"; - version = "20170310.2024"; + version = "20170817.1216"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "c26852123436849367d826c370f24dd9f20cb501"; - sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd"; + rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec"; + sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -66486,12 +67093,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20170205.1306"; + version = "20170807.1152"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "94abffa716aff963175196066526c7ee8b4efae7"; - sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; + rev = "e572e031852561f98a7053afcdc9a3796dde2137"; + sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -66507,12 +67114,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170603.251"; + version = "20170803.1039"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "ba47dd11c5be684595ffa62dbdfdc616ce3eb9d6"; - sha256 = "011n7vyhrawmymkhmr28isk5zvdljj9bhynmfr6v0mi2h7kn79p3"; + rev = "c6dc66b6678605f0df8eb61778b10ae21eb7caf5"; + sha256 = "05pdz6117m78zfvxi9mskw8svx4bs5k3bpv9nk9mzg9n0zw8algy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -66528,12 +67135,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170628.52"; + version = "20170801.2303"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "c8b322a248ea8089eb26f2c5cee58ed47e5f43d3"; - sha256 = "1iyvdbwm7v1acb2mjqz51c7ksi5169mg3kiksg3q5bhvmfjy6s3r"; + rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1"; + sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66798,25 +67405,6 @@ license = lib.licenses.free; }; }) {}; - stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "stgit"; - version = "20140213.348"; - src = fetchgit { - url = "git://repo.or.cz/stgit.git"; - rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e"; - sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; - sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89"; - name = "stgit"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/stgit"; - license = lib.licenses.free; - }; - }) {}; sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sticky"; version = "20101129.1852"; @@ -67229,57 +67817,15 @@ license = lib.licenses.free; }; }) {}; - subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "subshell-proc"; - version = "20130122.1322"; - src = fetchFromGitHub { - owner = "andrewmains12"; - repo = "subshell-proc"; - rev = "d18b20e03fc89ee08e8c6a968aba31a16b53287f"; - sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc"; - sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp"; - name = "subshell-proc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/subshell-proc"; - license = lib.licenses.free; - }; - }) {}; - sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sudden-death"; - version = "20140829.538"; - src = fetchFromGitHub { - owner = "yewton"; - repo = "sudden-death.el"; - rev = "beba6b4fb42b1e27575d3f722d23a0eb19666736"; - sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death"; - sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; - name = "sudden-death"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sudden-death"; - license = lib.licenses.free; - }; - }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20170605.1710"; + version = "20170803.2052"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "57d49eafd53868d3c86b20fa51e1889e621872c0"; - sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -67337,12 +67883,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170703.1433"; + version = "20170806.1414"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "59e140248a667127771aa7aa49ee0511c55e8817"; - sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; + rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2"; + sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67440,12 +67986,12 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "20170528.801"; + version = "20170801.126"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "d380321ce7b7a5650847a7866bd98226af51d4b4"; - sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs"; + rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; + sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -67608,16 +68154,16 @@ swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swbuff"; - version = "20160824.707"; + version = "20041012.18"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "swbuff"; - rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; - sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; + rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028"; + sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff"; - sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; + sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; name = "swbuff"; }; packageRequires = []; @@ -67669,12 +68215,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170224.1825"; + version = "20170716.2320"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; - sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; + rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; + sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -67711,12 +68257,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170609.938"; + version = "20170817.1000"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; - sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; + rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f"; + sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67774,12 +68320,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170701.246"; + version = "20170718.1932"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; - sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; + rev = "67113287ba61ce1951363a49f54148743dcea51e"; + sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -68045,12 +68591,12 @@ syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20170510.2348"; + version = "20170816.258"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a"; - sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc"; + rev = "dcbdd3139e04b6f6ade034896643d6d176ad9918"; + sha256 = "1g965a0ikva2gmpjzzdk39zq7907cw6wdsxb3k35hfwy7z2b45y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68104,36 +68650,15 @@ license = lib.licenses.free; }; }) {}; - syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: - melpaBuild { - pname = "syslog-mode"; - version = "20170107.1517"; - src = fetchFromGitHub { - owner = "vapniks"; - repo = "syslog-mode"; - rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2"; - sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; - sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19"; - name = "syslog-mode"; - }; - packageRequires = [ hide-lines ]; - meta = { - homepage = "https://melpa.org/#/syslog-mode"; - license = lib.licenses.free; - }; - }) {}; system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20170627.1127"; + version = "20170710.612"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "170f07c3cdf2859efaedc60c7013f6d72e009468"; - sha256 = "06knc4vy6lskp8jgfjg33v089kf8pm0lmqp9114apa6hwwqx9fd9"; + rev = "ae993f994ed60a845c5752e90491cf127bb1c052"; + sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -68170,12 +68695,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20170202.1844"; + version = "20170727.504"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; - sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; + rev = "2c71ec55291eca382305b1f31020e0396907534d"; + sha256 = "1fj7hh0p33kscjbcqkf91p2bg1fq1jgfq1i5wkgjdgwg6rg2rb62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -68463,12 +68988,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170624.1300"; + version = "20170718.2306"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95"; - sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw"; + rev = "321dad4278776b63f8dcd1e67ad387531c472ed4"; + sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -68488,8 +69013,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "477a87418980cfba695b2507a268d632f4e7a220"; - sha256 = "1xgi33wi69v3lx62q8lk04njcjz8ny2lnjn7ll332bcgx7sbh292"; + rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4"; + sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -68652,12 +69177,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20170611.1115"; + version = "20170804.1057"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "743614f372598597282efd29a18e624d5ef80bc1"; - sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf"; + rev = "01a2be2798850519873fe7abc59d715a978e6f20"; + sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -68904,12 +69429,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20170426.48"; + version = "20170805.251"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c"; - sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc"; + rev = "5e440c33a1d24762477863af5c9b7a896df4be1b"; + sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -69320,10 +69845,10 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20170331.1338"; + version = "20170726.1355"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57"; - sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq"; + url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58"; + sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9"; name = "thing-cmds.el"; }; recipeFile = fetchurl { @@ -69380,12 +69905,12 @@ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thinks"; - version = "20170607.144"; + version = "20170802.428"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; - sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; + rev = "c02f236abc8c2025d9f01460b09b89ebdc96e28d"; + sha256 = "0g4ls668kyqnh4xkvz1s1z9j6n0a1gkgrzgl98hys7hny6zrk7aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; @@ -69401,12 +69926,12 @@ thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thread-dump"; - version = "20130323.1025"; + version = "20170816.1150"; src = fetchFromGitHub { owner = "nd"; repo = "thread-dump.el"; - rev = "1cee07775ac8c13bb52217be6c383562c617542b"; - sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p"; + rev = "204c9600242756d4b514bb5ff6293e052bf4b49d"; + sha256 = "11qx194gwizqg7p2mqy7mdfii85bdayabxfd388dmrm916i4w47n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/thread-dump"; @@ -69447,8 +69972,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "49e5103920e75a149d02c7d487496c8c79154a6c"; - sha256 = "1ywqyz27k1h87rz3vwyzchsajl52smp0ypwdmwggj2yn1mrcc9p6"; + rev = "ec64f23d236d7874e3b28ae86c833f57c7aa3389"; + sha256 = "0b819jbs0318dap8nfvs6ljfiw5qiqbhgda3czq4vns728m0rqsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69502,22 +70027,22 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170621.1159"; + version = "20170819.2329"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "ec4a2b7a68c2503a6bdb31f1b6977321ad588102"; - sha256 = "1dj29365ia50gf4cicwvpcidlcp67hndyv60w6cgy6fghsslldnn"; + rev = "ed6cfafbed4d49f06015f2090682b218a4b001ec"; + sha256 = "0cqg8yb52ljgvjz5f6fmxs2x5p19bj41x2myqarm2jdyy8j58yyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; name = "tide"; }; - packageRequires = [ cl-lib dash flycheck typescript-mode ]; + packageRequires = [ cl-lib dash flycheck s typescript-mode ]; meta = { homepage = "https://melpa.org/#/tide"; license = lib.licenses.free; @@ -69782,27 +70307,6 @@ license = lib.licenses.free; }; }) {}; - tj-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, tern }: - melpaBuild { - pname = "tj-mode"; - version = "20150826.851"; - src = fetchFromGitHub { - owner = "katspaugh"; - repo = "tj-mode"; - rev = "361f5b0baa90f9d0b3fd92a3d9d557a1224b4308"; - sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1b16dd25c0c1031923717d4fe23bbb9276f75885/recipes/tj-mode"; - sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf"; - name = "tj-mode"; - }; - packageRequires = [ emacs js2-mode tern ]; - meta = { - homepage = "https://melpa.org/#/tj-mode"; - license = lib.licenses.free; - }; - }) {}; tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; @@ -70221,12 +70725,12 @@ tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tql-mode"; - version = "20170402.1846"; + version = "20170723.1954"; src = fetchFromGitHub { owner = "tiros-dev"; repo = "tql-mode"; - rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018"; - sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2"; + rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638"; + sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode"; @@ -70242,12 +70746,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170528.2302"; + version = "20170713.2320"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "4b84b8b4cf43e1167b3d7fcc51eb7a16b62c26f1"; - sha256 = "0mpx2wlw7fhqmgvya3vq7yfjqpab10wjbgpxyyd2ki15nwc4c0xd"; + rev = "7a443ad17643060f9b4c2897abe185bb9221e304"; + sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -70273,8 +70777,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "47bbcf4268602688f90c08ce64ec93226fc3f894"; + sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -70308,22 +70812,22 @@ license = lib.licenses.free; }; }) {}; - tramp-hdfs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-hdfs"; - version = "20151028.2036"; + version = "20170821.620"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; - rev = "82683b45eabc09f327ea45a9e8faba0524eada29"; - sha256 = "0llzfn9y3yyz2wwdbv8whx8vy2lazbnww6hjj0r621gkfxjml7wd"; + rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35"; + sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs"; sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b"; name = "tramp-hdfs"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/tramp-hdfs"; license = lib.licenses.free; @@ -70374,12 +70878,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170330.2125"; + version = "20170807.823"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "3d44f4e916257855e5f0c3d06ebe78c2637c9b0c"; - sha256 = "0dmydawpdjh821sfaki2km1sff5f2kspbhi9wkcss12m8kkz6fg4"; + rev = "b165329a21b9d2693661372f4802208f52029c7a"; + sha256 = "1lksw9nxvaml4ykhr6m8na3dcwk13r1q86hncyk3ybrg5w9663bq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -70479,12 +70983,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170705.1153"; + version = "20170817.1155"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; - sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; + rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27"; + sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -70504,8 +71008,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; - sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; + rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27"; + sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -70518,6 +71022,27 @@ license = lib.licenses.free; }; }) {}; + treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "treepy"; + version = "20170721.913"; + src = fetchFromGitHub { + owner = "volrath"; + repo = "treepy.el"; + rev = "b2191139d67d024e4666b6039e39a23b15b1aba2"; + sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy"; + sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72"; + name = "treepy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/treepy"; + license = lib.licenses.free; + }; + }) {}; trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }: melpaBuild { pname = "trident-mode"; @@ -70539,27 +71064,6 @@ license = lib.licenses.free; }; }) {}; - tronesque-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "tronesque-theme"; - version = "20150125.241"; - src = fetchFromGitHub { - owner = "aurelienbottazini"; - repo = "tronesque"; - rev = "42093c08a50c860601c364c8a746c803458c10ba"; - sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c7e488c08c56a879d0c20f0e8c271b7179faee8a/recipes/tronesque-theme"; - sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j"; - name = "tronesque-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tronesque-theme"; - license = lib.licenses.free; - }; - }) {}; trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; @@ -70708,12 +71212,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170531.557"; + version = "20170814.933"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "79bca7dc9254da190d821b504da4946df8c3d548"; - sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc"; + rev = "6b9b57ad4532abb369c374bab4f5b22e7f777b8c"; + sha256 = "0lrx7d1cykrb9y6bbbmq2fax00k0mn0ahysayc47v9iz6w46rk06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70810,27 +71314,6 @@ license = lib.licenses.free; }; }) {}; - turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "turkish"; - version = "20160324.323"; - src = fetchFromGitHub { - owner = "emres"; - repo = "turkish-mode"; - rev = "237b696e2f513149f1a77ef58b5ba7d44b6f4661"; - sha256 = "1jb6par116mm5l4z27wk6m2sfh6j9nmgrya352sdagcvjbcpnzcl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4c305076082d17db90647577137d76128b15defa/recipes/turkish"; - sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532"; - name = "turkish"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/turkish"; - license = lib.licenses.free; - }; - }) {}; turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "turnip"; @@ -70981,12 +71464,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170530.953"; + version = "20170813.1541"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "9ad892fb2274decb637d12d81a8640d2c6cf11d3"; - sha256 = "0ynnh3ac6zblcg2d0nf8fwdfmp5ymzjqncl64xa43m4lw24p6xng"; + rev = "2c43dd034c156762589f80f7c6163a2bd35b51d0"; + sha256 = "1xyalhrv7d8fa32xsyx044bxcxk7shm44hcjrncghps9w21zfdwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -71046,8 +71529,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; - sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; + rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; + sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -71191,8 +71674,8 @@ src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "e3a343991c0175092f27665fce9474e240f3f1f7"; - sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv"; + rev = "3f9938f24d053ad21fbbc4773fc786f78a55d522"; + sha256 = "1x1ay6qwgmj9294shi8l7xr6x7sjrpdwrxgdjynzf4wwgl2ydz4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -71287,6 +71770,27 @@ license = lib.licenses.free; }; }) {}; + underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "underline-with-char"; + version = "20170814.223"; + src = fetchFromGitHub { + owner = "marcowahl"; + repo = "underline-with-char"; + rev = "6daeba77e17dc11558ca3ccb0495524f5104d581"; + sha256 = "1i6qgkzn8rlv44mjc4b9sksr4wpnj9a1b6p1y3g6fqpvhy5pmygg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; + sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; + name = "underline-with-char"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/underline-with-char"; + license = lib.licenses.free; + }; + }) {}; underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "underwater-theme"; @@ -71352,12 +71856,12 @@ unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unfill"; - version = "20160816.2300"; + version = "20170722.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; - sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; + rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e"; + sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -71699,12 +72203,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170425.331"; + version = "20170802.426"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5"; + sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -71720,12 +72224,12 @@ url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; - version = "20160404.1959"; + version = "20170804.1942"; src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; - rev = "48182912d4f3a704d0b53f1664b995cfbf2ccd28"; - sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h"; + rev = "06db8270213b9e352d6c335b0663059a1353d05e"; + sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; @@ -71781,12 +72285,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170702.1322"; + version = "20170812.2256"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; - sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; + rev = "360df30683a711c443f87e495ba14cdd125a505d"; + sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71802,12 +72306,12 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20170208.1035"; + version = "20170717.1152"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "e8551ce8a514d865831d3a889acece79103fc627"; - sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; + rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026"; + sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords"; @@ -71827,8 +72331,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; - sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; + rev = "5ca193128c10f6af877c174ec0a9029782f0ef50"; + sha256 = "1m8ccx4hnncwd5hhi46ghprk9cdljw0qlyy4ya05fgvxl7yz8b4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -71883,27 +72387,6 @@ license = lib.licenses.free; }; }) {}; - uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "uzumaki"; - version = "20150119.1706"; - src = fetchFromGitHub { - owner = "geyslan"; - repo = "uzumaki"; - rev = "afae141588ef9407ff86ce1ae9a0f1860843c4a4"; - sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki"; - sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q"; - name = "uzumaki"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/uzumaki"; - license = lib.licenses.free; - }; - }) {}; v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "v2ex-mode"; @@ -72114,6 +72597,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "20170725.7"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "6f1b788a58d2b64ac0c4648039ecd40b3989a489"; + sha256 = "1xay9h16vr9pm1csfaqy71m9rsphh77r2rmk1sxpdasr5aa00vq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; @@ -72471,36 +72975,15 @@ license = lib.licenses.free; }; }) {}; - vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vimgolf"; - version = "20170323.600"; - src = fetchFromGitHub { - owner = "timvisher"; - repo = "vimgolf.el"; - rev = "741e414ec24072af05471058a5719271bfcfe766"; - sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf"; - sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f"; - name = "vimgolf"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vimgolf"; - license = lib.licenses.free; - }; - }) {}; vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170606.539"; + version = "20170730.2206"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610"; - sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s"; + rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; + sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -72516,12 +72999,12 @@ vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimrc-mode"; - version = "20150607.913"; + version = "20170814.1837"; src = fetchFromGitHub { owner = "mcandre"; repo = "vimrc-mode"; - rev = "fae7604e5ea6eef104d8c68598c3bbf9d798aa74"; - sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg"; + rev = "ba8140fba6e03a35b123acbd62fc8c6f0a03bf4a"; + sha256 = "07pwmjaa24hh20bcanmxgnaf050c0j6190i0qfvpd0gpc4p80pxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode"; @@ -72705,12 +73188,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20170501.932"; + version = "20170713.1652"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "55e0c404c802c4cf056a8dde94a77df2970a42c7"; - sha256 = "0v9zfav3gpw2vvmqdbp4g24jxxgprzql5z82i7rx6ma0in42kvz2"; + rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837"; + sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -72829,12 +73312,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170225.2301"; + version = "20170804.1723"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "e9708b80a319af14266562d8bf920747e94f1cf8"; - sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj"; + rev = "cd76195b2bda28d247a79124334ffcc5124676cb"; + sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -72850,12 +73333,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170621.652"; + version = "20170712.930"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "b5ecf28ec78033ddaac69065492fa4fd1d07637e"; - sha256 = "0bybqffh2fbaah8iyib029v8wq0q9prcaydca4k2fr7hh5snrzwz"; + rev = "a680998d5e597e91be2e7e15e88bd83856a13c84"; + sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -73119,12 +73602,12 @@ wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wavefront-obj-mode"; - version = "20150501.1116"; + version = "20170808.1016"; src = fetchFromGitHub { owner = "abend"; repo = "wavefront-obj-mode"; - rev = "75eedad052848e82cdd94064764956b906e6d6b2"; - sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy"; + rev = "34027915de6496460d8e68b5991dd24d47d54859"; + sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode"; @@ -73287,12 +73770,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170613.959"; + version = "20170807.903"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "8c35710775de9369f0637a9bd5fde39e4074db72"; - sha256 = "02l948kffqp5fds2gka6klv7myphnaakjk68g35sm98nxvzhf5cl"; + rev = "b0c8db9b08978dd041c8a3ed41361afa9638d17d"; + sha256 = "0cx038sychpx5jqdsx5llvmq98wwi3bdhwsi8hj0gw5pqc59vrx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -73410,22 +73893,22 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20170610.2117"; + version = "20170819.1111"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb"; - sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw"; + rev = "b77aca6ccf0937601e53b53ec906f9ee4fc5d469"; + sha256 = "1af8kx9b4fzvgpf4z486vlxg8r4ai046pmzl5v0i42ifnk2bsxli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; name = "websocket"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/websocket"; license = lib.licenses.free; @@ -73459,8 +73942,8 @@ src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "a0d81074088d313dd596af6602e51d4253a55ca5"; - sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm"; + rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef"; + sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -73644,12 +74127,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20170530.526"; + version = "20170817.1107"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298"; - sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans"; + rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; + sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -73770,12 +74253,12 @@ whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; - version = "20110901.130"; + version = "20170815.212"; src = fetchFromGitHub { owner = "purcell"; repo = "whole-line-or-region"; - rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941"; - sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d"; + rev = "1220974153b7eaca5192ed87f86182d121e228e4"; + sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; @@ -73856,8 +74339,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615"; - sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw"; + rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b"; + sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74018,12 +74501,12 @@ window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-jump"; - version = "20150213.1236"; + version = "20170809.1508"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; - rev = "164be41b588b615864258c502583100d3ccfe13e"; - sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs"; + rev = "6bdb51e9a346907d60a9625f6180bddd06be6674"; + sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d44fc32e12f00bbaa799b4054e9ff0fc0d3bfbfb/recipes/window-jump"; @@ -74060,12 +74543,12 @@ window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-number"; - version = "20141106.1829"; + version = "20170731.1851"; src = fetchFromGitHub { owner = "nikolas"; repo = "window-number"; - rev = "1d222f0b48c8d51bad956c3000ff0635b883a355"; - sha256 = "0n6a4kriwx7c8shvns3fcdp8l1i66bsca5mgd00p7nllnxvldhn3"; + rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87"; + sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number"; @@ -74121,12 +74604,12 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20161017.433"; + version = "20170722.655"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318"; - sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g"; + rev = "00ddafcf4802e7430ca709769b888656a6eb421b"; + sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -74160,6 +74643,27 @@ license = lib.licenses.free; }; }) {}; + windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "windwow"; + version = "20170815.1848"; + src = fetchFromGitHub { + owner = "vijumathew"; + repo = "windwow"; + rev = "77bad26f651744b68d31b389389147014d250f23"; + sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow"; + sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h"; + name = "windwow"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/windwow"; + license = lib.licenses.free; + }; + }) {}; winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winpoint"; @@ -74229,8 +74733,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "f94ec5fed665"; - sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n"; + rev = "e5a20c81c0bd"; + sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -74246,12 +74750,12 @@ wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wispjs-mode"; - version = "20140103.1432"; + version = "20170720.1219"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "wispjs-mode"; - rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f"; - sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x"; + rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8"; + sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode"; @@ -74264,22 +74768,22 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170706.349"; + version = "20170817.1240"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "e300dab6c4be06ae42bc2f1919ed37e8624c3605"; - sha256 = "07lz63yzjxj1y2524b7cd829srl3dvng7g67kf1377njgyrrgq0f"; + rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; + sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; name = "with-editor"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ async emacs ]; meta = { homepage = "https://melpa.org/#/with-editor"; license = lib.licenses.free; @@ -74306,6 +74810,27 @@ license = lib.licenses.free; }; }) {}; + with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + melpaBuild { + pname = "with-simulated-input"; + version = "20170820.2317"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "with-simulated-input"; + rev = "1012ccbec77d7d162790706c07bb23c039ccc61f"; + sha256 = "1489njq2xbsd89kh3z560vwm892zzjbs12lzk1pr0fajqvnm62r5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; + sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk"; + name = "with-simulated-input"; + }; + packageRequires = [ emacs s seq ]; + meta = { + homepage = "https://melpa.org/#/with-simulated-input"; + license = lib.licenses.free; + }; + }) {}; wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wn-mode"; @@ -74393,12 +74918,12 @@ wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordgen"; - version = "20161104.944"; + version = "20170803.1120"; src = fetchFromGitHub { owner = "Fanael"; repo = "wordgen.el"; - rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; - sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; @@ -74418,8 +74943,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "wordnut"; - rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc"; - sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62"; + rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb"; + sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut"; @@ -74432,36 +74957,15 @@ license = lib.licenses.free; }; }) {}; - wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "wordsmith-mode"; - version = "20151117.236"; - src = fetchFromGitHub { - owner = "istib"; - repo = "wordsmith-mode"; - rev = "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf"; - sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode"; - sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n"; - name = "wordsmith-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wordsmith-mode"; - license = lib.licenses.free; - }; - }) {}; worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170427.8"; + version = "20170818.1105"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "8b0de0d0896aa82a31d13972baf15de56ca5516e"; - sha256 = "14jk3sinxrb2685y5dslrik10cwjwjc76pgwj3w47h4s6ykarwn8"; + rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d"; + sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -74565,8 +75069,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "wrap-region.el"; - rev = "0eff3165db36464d28ed303ab25b715307cbdee0"; - sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n"; + rev = "fbae9b0f106187af19823f1a6260b5c68b7252e6"; + sha256 = "1k5q925igdv5lnpbmy0c2f0j3rj7yh4l6bxbd61g9lcnyl0j3ym9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region"; @@ -74645,12 +75149,12 @@ wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wsd-mode"; - version = "20160930.236"; + version = "20170731.837"; src = fetchFromGitHub { owner = "josteink"; repo = "wsd-mode"; - rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19"; - sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93"; + rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6"; + sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode"; @@ -74792,15 +75296,15 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170517.1634"; + version = "20170821.400"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "a5a19ee45b54eff7eeccd81b65ba42a0e9c7ba4c"; - sha256 = "1x3vwqpbz06xg2wazg7skgsvgq36cs0445nrk2ahzvqknxh638vr"; + rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307"; + sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr"; name = "xah-css-mode"; }; @@ -74813,15 +75317,15 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170620.1705"; + version = "20170821.357"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "1ecbe880d6aea24a77a8bd903e2c82225a35caf4"; - sha256 = "14081cmsm5xrcmfpz5jh92ml0yir0fwvn9pxpf4x93x1wmp6d5r7"; + rev = "4f7b14d913bd4401f6765ae75ba17c5350b24782"; + sha256 = "0x3w5k5n1wg9iqbm5hw0chfmrbb6m5z450q1nm68cqvqlxbjxniy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij"; name = "xah-elisp-mode"; }; @@ -74834,15 +75338,15 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170407.251"; + version = "20170821.358"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390"; - sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr"; + rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887"; + sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find"; sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq"; name = "xah-find"; }; @@ -74855,15 +75359,15 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170706.348"; + version = "20170821.356"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "ea43010b362f6b5dd214f2f81daf4c12f6433f40"; - sha256 = "0cwk3m1179ldb1qk6jx0g156vsqv14h3bqgfyb4yc5bg980ikm61"; + rev = "c6c7dac8260d0b74034224b8fbc789b0f30034f6"; + sha256 = "1qgj69rx4flrdgrrib3aq86qf5iyr3xp1qdnvb3m9iwd9pngwadr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs"; name = "xah-fly-keys"; }; @@ -74876,15 +75380,15 @@ xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20170527.1806"; + version = "20170821.353"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "5adaf02b8a7464ffb81ae185edb48902a4c3a4d4"; - sha256 = "16cxk55haln36m57pszxbbyx2h0dzdxagsj2zvm6i2nn0jhyy4v7"; + rev = "e3ef069ea9fea3a092689d45c94c6211b51d0ea4"; + sha256 = "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-get-thing"; sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg"; name = "xah-get-thing"; }; @@ -74897,15 +75401,15 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170517.1459"; + version = "20170821.405"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "3872d3273b472202052dfd63a7d8e388f9517830"; - sha256 = "0krmxp55gbmbxmzkj293v7i9c9lfxji47g0cmfjiyhzzamz1kdgw"; + rev = "cd5d622140e78e01d0ab32fcb43edc49f4e7fbb5"; + sha256 = "1i952mm0mxiaphnwimlr28swrk8b0k6rwx90f4s5s8idcp6wvp4y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup"; sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc"; name = "xah-lookup"; }; @@ -74918,15 +75422,15 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170210.2128"; + version = "20170821.406"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "a4b8aa833f65c028f7f94b9c3b5b8993b8961736"; - sha256 = "02xin68nrzlg6qaniincj5dk1aw5fbqfb8cj00yjyyjnv55jrbpn"; + rev = "6cdde9e4721fd6d026872ca3e59c212a34913486"; + sha256 = "0qn2dv14cw8yq14wgbfcf474bvdlfacb3m6i1rfwwqzsmcarlbnm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a"; name = "xah-math-input"; }; @@ -74939,15 +75443,15 @@ xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-reformat-code"; - version = "20170706.339"; + version = "20170821.411"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-reformat-code"; - rev = "655cc8820118737db7b758ab72ad107d7fff091a"; - sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs"; + rev = "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1"; + sha256 = "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-reformat-code"; sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp"; name = "xah-reformat-code"; }; @@ -74960,15 +75464,15 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20170221.2112"; + version = "20170821.354"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "b5bd1ff843063f6eba32ab71f33f0ebde57d5e41"; - sha256 = "1m5yd9kwsjy37f2czqhjpj5dkqf62pgj40a4ziy65mch4niw0slz"; + rev = "d11f78994f08cec335e351db92924db133fb47de"; + sha256 = "05j850yplz1bsf9zxq9gvlh9aikdcy4q78m109gdb0imrikm9h9i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs"; sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x"; name = "xah-replace-pairs"; }; @@ -74981,15 +75485,15 @@ xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xahk-mode"; - version = "20170523.1946"; + version = "20170821.407"; src = fetchFromGitHub { owner = "xahlee"; repo = "xahk-mode.el"; - rev = "538b891a1565d109d079185b56332cd28dd846a7"; - sha256 = "1rm3sih1rciszs7m9d29r7vkgs8q2kwpn8sdwadlycgjmk9c38s1"; + rev = "02012b20603c00e3b2ef32159a690ed1e05d12c3"; + sha256 = "09nakcfczb95vd48f8z77igmi1kbcblmgpzfzm9i7df4jcfkkh3c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xahk-mode"; sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9"; name = "xahk-mode"; }; @@ -75086,12 +75590,12 @@ xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xml-plus"; - version = "20160210.1942"; + version = "20170727.1651"; src = fetchFromGitHub { owner = "bddean"; repo = "xml-plus"; - rev = "1b728dda31dd13506aa4e1220f925bb43c93847b"; - sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k"; + rev = "232fa863c08fc159b21dd58c39ea45dce3334895"; + sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+"; @@ -75279,8 +75783,8 @@ src = fetchFromGitHub { owner = "CQQL"; repo = "xresources-theme"; - rev = "09a0bfc1684161dd1cdc899c027808a99646a652"; - sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341"; + rev = "feb0552d31cb54210eabbc1abe32c8ea62841b6f"; + sha256 = "1dfksid7dc27dz43lrriyr724qs7pf7dqhkmcai6b5qbi893ib8y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cef3a5683ea572f823d915ec2a94d591ac915d6/recipes/xresources-theme"; @@ -75510,8 +76014,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "40fc1d12a4f69cacf8b6b07d3372dee2969cb2e5"; - sha256 = "0ahkrgl1isd9bppclk8i72fkm9c0hmhf9i5zc1n9k96c4x9h831i"; + rev = "7652ce2c926084a893b26695a765ba8b8f4ba328"; + sha256 = "09mzglx049b2xcrz8g7iywxbr79haf1xbcs8qnj1ljypmdmkq89a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75548,12 +76052,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170406.241"; + version = "20170727.1531"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6"; - sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7"; + rev = "28c34033194130d452d5c958b5241c88d42ca02b"; + sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -75693,12 +76197,12 @@ yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yara-mode"; - version = "20160821.724"; + version = "20170719.2351"; src = fetchFromGitHub { owner = "binjo"; repo = "yara-mode"; - rev = "3ad06bc419329ec9c872fe3292da214b3aa9a1f1"; - sha256 = "12xdhmxilqfrsqkx8dv5g78c0dcarsfjf3gy928rqjfhgslafbq6"; + rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c"; + sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode"; @@ -75714,12 +76218,12 @@ yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yard-mode"; - version = "20160310.850"; + version = "20170817.537"; src = fetchFromGitHub { owner = "pd"; repo = "yard-mode.el"; - rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095"; - sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y"; + rev = "ba74a47463b0320ae152bd42a7dd7aeecd7b5748"; + sha256 = "0zry3p66bvrk32icnd6kkk8y5rrr8crnqjp6wlp889c8c7wm00n1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode"; @@ -75753,6 +76257,27 @@ license = lib.licenses.free; }; }) {}; + yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yarn-mode"; + version = "20170709.1237"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "yarn-mode"; + rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b"; + sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; + sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; + name = "yarn-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yarn-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -75777,12 +76302,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170624.803"; + version = "20170818.1916"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "65952e30547754eb5ed11750f0cd736095fd6700"; - sha256 = "1iycbb9rbyks860bigywy9h1607m67aq606068vlq13ivhz18b9f"; + rev = "c79c8df5999e3147170a45566ad2da4e71c80531"; + sha256 = "1c0za8p4fyciv3qzg8z2s3sch2rw908i0x4a51z910q3j8lvacnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -75795,6 +76320,27 @@ license = lib.licenses.free; }; }) {}; + yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "yasnippet-snippets"; + version = "20170821.302"; + src = fetchFromGitHub { + owner = "AndreaCrotti"; + repo = "yasnippet-snippets"; + rev = "6ff001decd016fa753392192936204e020ea3785"; + sha256 = "0wzai1d70f7q5vppks3j2f3np1z4241wf4p5i821p67y1fsyz4wr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; + sha256 = "0i6rk50a9l26r47v9xsnx35ziz4spx5pml3ys8y30n0r0xjdsj51"; + name = "yasnippet-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/yasnippet-snippets"; + license = lib.licenses.free; + }; + }) {}; yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; @@ -75816,25 +76362,6 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yatex"; - version = "20170611.1642"; - src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "e9299b77df1f"; - sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; - name = "yatex"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yatex"; - license = lib.licenses.free; - }; - }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -75880,12 +76407,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170622.146"; + version = "20170723.1458"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; - sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -76039,13 +76566,13 @@ pname = "zeitgeist"; version = "20131228.1009"; src = fetchgit { - url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources"; + url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git"; rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5f96d92b33fe97573334038f2fe4f984f37cca/recipes/zeitgeist"; - sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist"; + sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz"; name = "zeitgeist"; }; packageRequires = []; @@ -76137,18 +76664,39 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "zephir-mode"; + version = "20170810.2302"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "5c8fcf633709b70f87015073a5d48556fc930b76"; + sha256 = "1c671ncrb4dmrmbx5p7qqxv01wah63cjisn60mhrpzjcyg8w8hss"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ cl-lib emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170607.1301"; + version = "20170818.47"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "ab406749083a41e5ca7fe518949a09853f23e5d5"; - sha256 = "0kanprhczqx14gn87wjwi9x4fg6dn7i64awbwsls4r5nkqf4ykn0"; + rev = "e43ecf497a73c742f6ecdd0f38750fcc53aad5b5"; + sha256 = "0rys0kvnfjbf29f943bpi79490sax1r7yqbj8xlilk4wnvgs6x7q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; @@ -76158,27 +76706,6 @@ license = lib.licenses.free; }; }) {}; - zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "zig-mode"; - version = "20170413.130"; - src = fetchFromGitHub { - owner = "AndreaOrru"; - repo = "zig-mode"; - rev = "9a252ebd4ccd8a30abef3d9ed0ecb510e3d88844"; - sha256 = "07ar5lijj3y62ynx1fj9qxabf0h82laxzyb60f6cgxpzgxfpn1b8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode"; - sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09"; - name = "zig-mode"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/zig-mode"; - license = lib.licenses.free; - }; - }) {}; zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zlc"; @@ -76266,12 +76793,12 @@ zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-nyan"; - version = "20161014.154"; + version = "20170818.944"; src = fetchFromGitHub { owner = "wasamasa"; repo = "zone-nyan"; - rev = "0ec6328ee58d7d140c8c7be84822c07741f3ad2b"; - sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57"; + rev = "4b1f8d95f130946718d52806489ffe2762aebfdc"; + sha256 = "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan"; @@ -76349,10 +76876,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170605.1046"; + version = "20170802.1406"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30"; - sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz"; + url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32"; + sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk"; name = "zones.el"; }; recipeFile = fetchurl { @@ -76515,12 +77042,12 @@ zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoutline"; - version = "20160915.503"; + version = "20170722.651"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "714c10a25112b3da62696585bea289c3f8e74158"; - sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1"; + rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507"; + sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; @@ -76533,21 +77060,21 @@ license = lib.licenses.free; }; }) {}; - zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: + zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20170703.2041"; + version = "20170730.2055"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "d8f7969db645"; - sha256 = "03xyal7r0gc6r4vx23sx44vcm4fk68dkxyd1x0jw47im4xfmfvzv"; + rev = "33b840f663b7"; + sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j"; name = "zpresent"; }; - packageRequires = [ dash emacs org-parser ]; + packageRequires = [ dash emacs org-parser request ]; meta = { homepage = "https://melpa.org/#/zpresent"; license = lib.licenses.free; @@ -76623,8 +77150,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; - sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; + rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; + sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 6e1cc04a2f66..1c521d0c9db5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -20,6 +20,27 @@ license = lib.licenses.free; }; }) {}; + a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "a"; + version = "0.1.0alpha4"; + src = fetchFromGitHub { + owner = "plexus"; + repo = "a.el"; + rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361"; + sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a"; + sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886"; + name = "a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/a"; + license = lib.licenses.free; + }; + }) {}; aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: melpaBuild { pname = "aa-edit-mode"; @@ -65,12 +86,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -590,12 +611,12 @@ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "ac-rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1115,12 +1136,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; - sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; + rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564"; + sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1178,12 +1199,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "2.6.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a"; - sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; + rev = "bb69345ead914345faad582723a2b61618f13289"; + sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1247,6 +1268,27 @@ license = lib.licenses.free; }; }) {}; + amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "amx"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "amx"; + rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae"; + sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; + sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; + name = "amx"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/amx"; + license = lib.licenses.free; + }; + }) {}; anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; @@ -1606,12 +1648,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "0.4.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "c4629201a63047f9094be0d9150f201dd5be18ad"; - sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -1648,12 +1690,12 @@ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apache-mode"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "apache-mode"; - rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d"; - sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; @@ -1690,12 +1732,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.1.2"; + version = "0.2"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45"; - sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss"; + rev = "1a3fff7a0265d1d13d6854b45e0c5ebe68a802de"; + sha256 = "0pg67nlmdpfqlhljggm5id5pmddh8p6slgpwsqh1pmfqs328j5hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -1750,6 +1792,27 @@ license = lib.licenses.free; }; }) {}; + apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apropospriate-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "waymondo"; + repo = "apropospriate-theme"; + rev = "0d918da74a7a225fe5a586e26f5d834e579c5323"; + sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; + sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9"; + name = "apropospriate-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/apropospriate-theme"; + license = lib.licenses.free; + }; + }) {}; artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; @@ -1939,27 +2002,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "0.0.2"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -1986,14 +2028,14 @@ pname = "auto-compile"; version = "1.4.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; packageRequires = [ dash emacs packed ]; @@ -2173,12 +2215,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170620"; + version = "20170716"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43"; - sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif"; + rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; + sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -2662,12 +2704,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4"; - sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj"; + rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; + sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -2788,12 +2830,12 @@ binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "davep"; repo = "binclock.el"; - rev = "2e529ace67a04e6872a2328769782ef33b0e463a"; - sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns"; + rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876"; + sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; @@ -3082,12 +3124,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -3124,12 +3166,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; - sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + rev = "1110217973afa1329c47a1f7e6962aad36a90134"; + sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -3468,8 +3510,8 @@ sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; - sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; + sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; name = "calfw"; }; packageRequires = []; @@ -3478,6 +3520,90 @@ license = lib.licenses.free; }; }) {}; + calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-cal"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; + sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; + name = "calfw-cal"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-cal"; + license = lib.licenses.free; + }; + }) {}; + calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-howm"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; + sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; + name = "calfw-howm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-howm"; + license = lib.licenses.free; + }; + }) {}; + calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-ical"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; + sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; + name = "calfw-ical"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-ical"; + license = lib.licenses.free; + }; + }) {}; + calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-org"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; + sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; + name = "calfw-org"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-org"; + license = lib.licenses.free; + }; + }) {}; camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "camcorder"; @@ -3754,12 +3880,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "99e8b116e779f97e96866891362817c1c5c6534c"; - sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0"; + rev = "520851447dba901097b121b58b1a0da370481a2c"; + sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -3904,13 +4030,13 @@ version = "0.1"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-fonts-setup"; + repo = "cnfonts"; rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d"; sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; - sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup"; + sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1"; name = "chinese-fonts-setup"; }; packageRequires = [ cl-lib ]; @@ -3919,69 +4045,27 @@ license = lib.licenses.free; }; }) {}; - chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: + chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-pyim"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tumashu"; - repo = "chinese-pyim"; - rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; - sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; + repo = "pyim"; + rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; + sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; - sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; + sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn"; name = "chinese-pyim"; }; - packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ]; + packageRequires = [ pyim ]; meta = { homepage = "https://melpa.org/#/chinese-pyim"; license = lib.licenses.free; }; }) {}; - chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-basedict"; - version = "0.1"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-basedict"; - rev = "f13b6d20629a0b691ead626cca249b227622fa83"; - sha256 = "1ddld5jkhqarm31p6qjdvdha36k6yqaz3jzg3lyzd0nkavcmdq57"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; - sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv"; - name = "chinese-pyim-basedict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-basedict"; - license = lib.licenses.free; - }; - }) {}; - chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "chinese-pyim-greatdict"; - version = "0.1"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "chinese-pyim-greatdict"; - rev = "11cf5145710349e9d928eb9197bebb426025fd58"; - sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; - sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc"; - name = "chinese-pyim-greatdict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chinese-pyim-greatdict"; - license = lib.licenses.free; - }; - }) {}; chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-word-at-point"; @@ -4027,12 +4111,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e"; - sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c"; + rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4"; + sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -4501,12 +4585,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.0pre5"; + version = "3.9.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "372de3f8039f69b3a2edcf7120083ec4097f8bd3"; - sha256 = "0yvh65b2fz4fpd2rx0q1c3gcidika5zx3nrm2rp4v6z69n2xgd13"; + rev = "fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4"; + sha256 = "08x5mqhrsm3y28hiy32h336n9ggn2snb56k242hqhij1lsg7iga3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4753,12 +4837,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb"; - sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i"; + rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; + sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -5068,12 +5152,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81"; - sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -5200,12 +5284,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -5302,6 +5386,27 @@ license = lib.licenses.free; }; }) {}; + company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: + melpaBuild { + pname = "company-terraform"; + version = "1.1"; + src = fetchFromGitHub { + owner = "rafalcieslak"; + repo = "emacs-company-terraform"; + rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6"; + sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; + sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh"; + name = "company-terraform"; + }; + packageRequires = [ company emacs terraform-mode ]; + meta = { + homepage = "https://melpa.org/#/company-terraform"; + license = lib.licenses.free; + }; + }) {}; company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; @@ -5512,6 +5617,27 @@ license = lib.licenses.free; }; }) {}; + copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "copy-file-on-save"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "emacs-auto-deployment"; + rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; + sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save"; + sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3"; + name = "copy-file-on-save"; + }; + packageRequires = [ cl-lib emacs f s ]; + meta = { + homepage = "https://melpa.org/#/copy-file-on-save"; + license = lib.licenses.free; + }; + }) {}; copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copyit"; @@ -5767,12 +5893,12 @@ cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; - sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; + rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; + sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -5869,6 +5995,27 @@ license = lib.licenses.free; }; }) {}; + csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: + melpaBuild { + pname = "csound-mode"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "hlolli"; + repo = "csound-mode"; + rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76"; + sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; + sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d"; + name = "csound-mode"; + }; + packageRequires = [ emacs multi shut-up ]; + meta = { + homepage = "https://melpa.org/#/csound-mode"; + license = lib.licenses.free; + }; + }) {}; csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csv"; @@ -6040,12 +6187,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.26alpha0"; + version = "0.26"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "5528995cc6d138456be9b9d42a422a3c5de7800a"; - sha256 = "1fd3335f2ay24nhicncmy1sz0mcdrminphsv630wkifmykarz9zh"; + rev = "62f04f6766386893f5da6bee23d4de1e92a4148d"; + sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6082,12 +6229,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; - sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + rev = "92641503c7e93309db12380d5228f99dbe64a53c"; + sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -6100,22 +6247,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34"; - sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8"; + rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9"; + sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs flycheck ]; + packageRequires = [ dash emacs f flycheck haskell-mode s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -6229,12 +6376,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "1.0.3"; + version = "1.2.3"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; - sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; + rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58"; + sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -6436,17 +6583,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "0.7"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -7176,6 +7325,27 @@ license = lib.licenses.free; }; }) {}; + docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "docker-compose-mode"; + version = "0.3.3"; + src = fetchFromGitHub { + owner = "meqif"; + repo = "docker-compose-mode"; + rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14"; + sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; + name = "docker-compose-mode"; + }; + packageRequires = [ dash emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/docker-compose-mode"; + license = lib.licenses.free; + }; + }) {}; docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "docker-tramp"; @@ -7428,6 +7598,27 @@ license = lib.licenses.free; }; }) {}; + dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dtrt-indent"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "jscheid"; + repo = "dtrt-indent"; + rev = "a54871bedadabede505b3913ee1039f5ab36cad2"; + sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; + sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5"; + name = "dtrt-indent"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dtrt-indent"; + license = lib.licenses.free; + }; + }) {}; ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ducpel"; @@ -7661,12 +7852,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "0.9.9"; + version = "1.5.7"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; - sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; + rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c"; + sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -7742,22 +7933,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "4d19565516785348894c4911e757e33a270b3efd"; + sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -7787,12 +7978,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.11.3"; + version = "2.11.6"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ee28c043492a550c68ca2f465042cd51ef150b9e"; - sha256 = "0jzw313hn7srr9mhwygl56iibx0wxra4php6pk9isbl338cw3gv0"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -8099,6 +8290,27 @@ license = lib.licenses.free; }; }) {}; + eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eg"; + version = "1.1"; + src = fetchFromGitHub { + owner = "davep"; + repo = "eg.el"; + rev = "0791452498719afb7409d1f723dbea2ec26d56f1"; + sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; + sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7"; + name = "eg"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/eg"; + license = lib.licenses.free; + }; + }) {}; egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egg"; @@ -8310,12 +8522,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "1.1.2"; + version = "1.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; - sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; + rev = "cc26f37e19ebc60ca75067115d3794cda88003c5"; + sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -8370,6 +8582,27 @@ license = lib.licenses.free; }; }) {}; + el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el2org"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "el2org"; + rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; + sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; + sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh"; + name = "el2org"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el2org"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -8436,12 +8669,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; - sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -8457,12 +8690,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; - sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8688,12 +8921,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d"; - sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i"; + rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f"; + sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -8755,27 +8988,6 @@ license = lib.licenses.free; }; }) {}; - elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }: - melpaBuild { - pname = "elscreen-persist"; - version = "0.2.0"; - src = fetchFromGitHub { - owner = "robario"; - repo = "elscreen-persist"; - rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c"; - sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist"; - sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k"; - name = "elscreen-persist"; - }; - packageRequires = [ elscreen revive ]; - meta = { - homepage = "https://melpa.org/#/elscreen-persist"; - license = lib.licenses.free; - }; - }) {}; elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elwm"; @@ -8800,16 +9012,16 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; - rev = "84c9cd5721be9594de743330e7abcec092d2838c"; - sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; + rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; + sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -9634,12 +9846,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a01de6873844ba510084090abec734c4166d71fa"; - sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; + rev = "6ede2da826335960037299d9f3b0e66d072ea5a0"; + sha256 = "1zxfyd711l13n6xhspa8l0k4l7hb8aq1q1j2b2yrzw9k1hx2lfyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9746,8 +9958,8 @@ sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; - sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; + sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; name = "es-mode"; }; packageRequires = [ cl-lib dash spark ]; @@ -9798,6 +10010,27 @@ license = lib.licenses.free; }; }) {}; + esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-help"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "esh-help"; + rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695"; + sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; + sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w"; + name = "esh-help"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/esh-help"; + license = lib.licenses.free; + }; + }) {}; eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-autojump"; @@ -10008,27 +10241,6 @@ license = lib.licenses.free; }; }) {}; - ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: - melpaBuild { - pname = "ess-R-object-popup"; - version = "1.0"; - src = fetchFromGitHub { - owner = "myuhe"; - repo = "ess-R-object-popup.el"; - rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948"; - sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup"; - sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj"; - name = "ess-R-object-popup"; - }; - packageRequires = [ ess popup ]; - meta = { - homepage = "https://melpa.org/#/ess-R-object-popup"; - license = lib.licenses.free; - }; - }) {}; ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ess-smart-underscore"; @@ -10053,12 +10265,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "6faef1fe1b5ff2fb761722ef1972a16395d9a10b"; - sha256 = "18igz3gcdp42wk89y59d4gxkbv0zvs8i4lg1b0qsrf90knasfjc9"; + rev = "53355b13dc9f1636ba681ffff830162ebbd3b223"; + sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -10116,12 +10328,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "674873139ebde439fbeecaf0fb217d54f470bc14"; - sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s"; + rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60"; + sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -10187,8 +10399,8 @@ sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; - sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; + sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; packageRequires = [ goto-chg undo-tree ]; @@ -10431,12 +10643,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; - sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; + rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b"; + sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -11018,12 +11230,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.6.4"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c"; - sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi"; + rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; + sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -11249,12 +11461,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686"; - sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39"; + rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f"; + sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -11354,12 +11566,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.3.2"; + version = "5.4.0"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "99801cd730d579ed3b05d084ad254b6a73b259aa"; - sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h"; + rev = "2d3e8d095e0c36f927142e80c4330977be698568"; + sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -11613,12 +11825,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "fdac635ecc57ac7743f74678147aca2e956561de"; - sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -11970,12 +12182,12 @@ flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-julia"; - version = "0.0.3"; + version = "0.1.1"; src = fetchFromGitHub { owner = "gdkrmr"; repo = "flycheck-julia"; - rev = "67cdef277741f06c884525636a1cf1349efebbb4"; - sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2"; + rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6"; + sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; @@ -12135,6 +12347,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "0.12.2"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "ef86aad907f27ca076859d8d9416f4f7727619c6"; + sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -12156,6 +12389,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-pycheckers"; + version = "0.2"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "flycheck-pycheckers"; + rev = "220c551df591792d08fc9d149ab3329171743cb9"; + sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; + sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq"; + name = "flycheck-pycheckers"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-pycheckers"; + license = lib.licenses.free; + }; + }) {}; flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; @@ -12180,12 +12434,12 @@ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { pname = "flycheck-rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -13101,6 +13355,27 @@ license = lib.licenses.free; }; }) {}; + frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "frames-only-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "frames-only-mode"; + rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; + sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; + sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; + name = "frames-only-mode"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/frames-only-mode"; + license = lib.licenses.free; + }; + }) {}; free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "free-keys"; @@ -13214,25 +13489,6 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuel"; - version = "0.96"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0"; - sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; - name = "fuel"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuel"; - license = lib.licenses.free; - }; - }) {}; full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; @@ -13257,12 +13513,12 @@ fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fullframe"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tomterl"; repo = "fullframe"; - rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912"; - sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4"; + rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd"; + sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe"; @@ -13275,22 +13531,22 @@ license = lib.licenses.free; }; }) {}; - function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: + function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "25e447d8a8930a8c515077de57a7693c6a642514"; - sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8"; + rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d"; + sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak"; name = "function-args"; }; - packageRequires = [ swiper ]; + packageRequires = [ ivy ]; meta = { homepage = "https://melpa.org/#/function-args"; license = lib.licenses.free; @@ -13362,12 +13618,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "0.8"; + version = "1.0"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; - sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; + rev = "795b969346982b75e24b5c8619b46197982fbb4d"; + sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -13614,12 +13870,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "5.7.0.0"; + version = "5.8.0.0"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "c3d0a681a19261817cf928685f7b96878fe51e91"; - sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3"; + rev = "35690941aadbe44d9401102ab44a39753e0bb2b5"; + sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -13679,14 +13935,14 @@ pname = "ghub"; version = "1.2.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "magit"; repo = "ghub"; rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; - sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; + sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -13698,12 +13954,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "44a5558eb299adee1463b7120c23b26b1d914ea8"; - sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487"; + rev = "f315677e3d35951021e1f10cc7b4f629814a13f0"; + sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -14283,6 +14539,27 @@ license = lib.licenses.free; }; }) {}; + gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitpatch"; + version = "0.5.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "gitpatch"; + rev = "94d40a2ee2b7cd7b209546ea02568079176b0034"; + sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch"; + sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1"; + name = "gitpatch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitpatch"; + license = lib.licenses.free; + }; + }) {}; gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; @@ -14304,6 +14581,27 @@ license = lib.licenses.free; }; }) {}; + gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gl-conf-mode"; + version = "0.3"; + src = fetchFromGitHub { + owner = "llloret"; + repo = "gitolite-emacs"; + rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec"; + sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; + sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; + name = "gl-conf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gl-conf-mode"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -14769,12 +15067,12 @@ google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-this"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "Malabarba"; repo = "emacs-google-this"; - rev = "22cff810e7ed3b3c9dae066588508864c25c6d99"; - sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0"; + rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84"; + sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; @@ -14790,12 +15088,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "0.11.13"; + version = "0.11.14"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "c859592c3fda01594b270e388414a79373b5587b"; - sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw"; + rev = "486c63bbfa0338589589f628703c38112035a5b2"; + sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -15060,15 +15358,15 @@ license = lib.licenses.free; }; }) {}; - graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: + graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed"; - sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl"; + rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe"; + sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -15081,7 +15379,7 @@ exec-path-from-shell flycheck graphene-meta-theme - ido-ubiquitous + ido-completing-read-plus ppd-sr-speedbar smartparens smex @@ -15345,12 +15643,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92"; - sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk"; + rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; + sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -15615,27 +15913,6 @@ license = lib.licenses.free; }; }) {}; - harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: - melpaBuild { - pname = "harvest"; - version = "0.3.8"; - src = fetchFromGitHub { - owner = "kostajh"; - repo = "harvest.el"; - rev = "69041907bdca68d3ab6802e08ec698c3448f28a1"; - sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest"; - sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd"; - name = "harvest"; - }; - packageRequires = [ hydra s swiper ]; - meta = { - homepage = "https://melpa.org/#/harvest"; - license = lib.licenses.free; - }; - }) {}; haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; @@ -15782,6 +16059,27 @@ license = lib.licenses.free; }; }) {}; + hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "hasky-stack"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "hasky-mode"; + repo = "hasky-stack"; + rev = "e256e50fce9a65cad1754d863d9ed969b159cefe"; + sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; + sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8"; + name = "hasky-stack"; + }; + packageRequires = [ emacs f magit-popup ]; + meta = { + homepage = "https://melpa.org/#/hasky-stack"; + license = lib.licenses.free; + }; + }) {}; haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haxor-mode"; @@ -15827,12 +16125,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d"; - sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil"; + rev = "d6bd5719dbe8b43f615245acf5846dfeca839867"; + sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -15911,12 +16209,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -16163,12 +16461,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d"; - sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil"; + rev = "d6bd5719dbe8b43f615245acf5846dfeca839867"; + sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -16205,12 +16503,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0"; - sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai"; + rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe"; + sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -16244,6 +16542,27 @@ license = lib.licenses.free; }; }) {}; + helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-directory"; + version = "0.6.4"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-directory"; + rev = "2c6d45404506ba744888dcdb65e9f63878f2da16"; + sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; + sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; + name = "helm-directory"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-directory"; + license = lib.licenses.free; + }; + }) {}; helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; @@ -16520,12 +16839,12 @@ helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hatena-bookmark"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; - rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb"; - sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2"; + rev = "d64833a5bbb4ae112ed176f6473232e526138572"; + sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark"; @@ -17045,12 +17364,12 @@ helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-qiita"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; - rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a"; - sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq"; + rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1"; + sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita"; @@ -17129,12 +17448,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -17276,12 +17595,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "89a7564edc6b23ffba52b02353528b9b6285c729"; - sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -18095,12 +18414,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "0.13.6"; + version = "0.14.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58"; - sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j"; + rev = "943636fe4a35298d9d234222bc4520dec9ef2305"; + sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -18239,22 +18558,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.16"; + version = "4.5"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; + sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs memoize s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -18347,16 +18666,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.16"; + version = "4.5"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; + sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -18599,12 +18918,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -18620,12 +18939,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f"; - sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7"; + rev = "27170d27c9594989587c03c23f753a809f6a0e10"; + sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -18659,27 +18978,6 @@ license = lib.licenses.free; }; }) {}; - imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }: - melpaBuild { - pname = "imgix"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "imgix"; - repo = "imgix-emacs"; - rev = "cf3994f69b34a36f627e9ceaf3e6f4309ee9ec30"; - sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix"; - sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg"; - name = "imgix"; - }; - packageRequires = [ cl-lib dash ht json s ]; - meta = { - homepage = "https://melpa.org/#/imgix"; - license = lib.licenses.free; - }; - }) {}; immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "immutant-server"; @@ -18767,12 +19065,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "135e049d763ceb4cabd0bab068c4c71452459065"; - sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -18995,27 +19293,6 @@ license = lib.licenses.free; }; }) {}; - inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "inline-crypt"; - version = "0.1.4"; - src = fetchFromGitHub { - owner = "Sodel-the-Vociferous"; - repo = "inline-crypt-el"; - rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282"; - sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt"; - sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n"; - name = "inline-crypt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/inline-crypt"; - license = lib.licenses.free; - }; - }) {}; inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inlineR"; @@ -19123,12 +19400,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c"; - sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v"; + rev = "4c8f3e7f4ad03179425c722d5072beae254da73b"; + sha256 = "0q377rpgszqixjbmwck6kcczfb3j8axx0pk6fqavzp8qyc3q121l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -19141,6 +19418,27 @@ license = lib.licenses.free; }; }) {}; + inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inverse-acme-theme"; + version = "1.12.0"; + src = fetchFromGitHub { + owner = "dcjohnson"; + repo = "inverse-acme-theme"; + rev = "e57f494fd94e49321a6396f530b8a13bae8b57df"; + sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; + sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; + name = "inverse-acme-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/inverse-acme-theme"; + license = lib.licenses.free; + }; + }) {}; iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iplayer"; @@ -19291,12 +19589,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "117369f882f81fb9cc88459a4072a2789138c136"; - sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; + rev = "acd6322571cb0820868a6febdc5326782a29b729"; + sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -19396,12 +19694,12 @@ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: melpaBuild { pname = "ivy-rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -19417,12 +19715,12 @@ ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: melpaBuild { pname = "ivy-youtube"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "32f609f1d1a3718739be5797e020d6266d8340d2"; - sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd"; + rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d"; + sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; @@ -19772,12 +20070,12 @@ js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-closure"; - version = "2.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "jart"; repo = "js2-closure"; - rev = "6050abb334c228702c23fcb03bfdf1dfbd1d6b11"; - sha256 = "1b4d13kz7afr5a6wyhq6vmwz8gsabdi86scw3q3v6l56hl2rgy46"; + rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb"; + sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; @@ -19814,12 +20112,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170116"; + version = "20170721"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; - sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; + rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc"; + sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -20381,12 +20679,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "b488c3dbba657bbd524402f48fde16ab6b1211db"; - sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5"; + rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; + sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -20507,12 +20805,12 @@ ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ksp-cfg-mode"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; - rev = "07a957512e66030e1b9f8ac0f259051386acb5b5"; - sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr"; + rev = "713a22ee28688e581ec3ad60228c853b516a14b6"; + sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode"; @@ -20633,12 +20931,12 @@ latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "Malabarba"; repo = "latex-extra"; - rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd"; - sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a"; + rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5"; + sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; @@ -21162,6 +21460,47 @@ license = lib.licenses.free; }; }) {}; + lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lively"; + version = "0.2"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "lively"; + rev = "6ec648fcde85e81393db1ed1364860f960179c92"; + sha256 = "06sdaj2akwjg1a7yvmm3gsip66iaq9bhm3gr45szwg6z622q4gvf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; + sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g"; + name = "lively"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lively"; + license = lib.licenses.free; + }; + }) {}; + lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lms"; + version = "0.7"; + src = fetchhg { + url = "https://bitbucket.com/inigoserna/lms.el"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; + sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1"; + name = "lms"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lms"; + license = lib.licenses.free; + }; + }) {}; load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; @@ -21309,22 +21648,22 @@ license = lib.licenses.free; }; }) {}; - love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "love-minor-mode"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ejmr"; repo = "love-minor-mode"; - rev = "1634ff3a8b657c63a5cffd9a937812a289f2c954"; - sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk"; + rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a"; + sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode"; sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m"; name = "love-minor-mode"; }; - packageRequires = []; + packageRequires = [ lua-mode ]; meta = { homepage = "https://melpa.org/#/love-minor-mode"; license = lib.licenses.free; @@ -21372,6 +21711,27 @@ license = lib.licenses.free; }; }) {}; + mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mac-pseudo-daemon"; + version = "2.1"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "mac-pseudo-daemon"; + rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; + sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; + name = "mac-pseudo-daemon"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/mac-pseudo-daemon"; + license = lib.licenses.free; + }; + }) {}; macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macro-math"; @@ -21589,6 +21949,27 @@ license = lib.licenses.free; }; }) {}; + magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-imerge"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-imerge"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; + sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; + name = "magit-imerge"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-imerge"; + license = lib.licenses.free; + }; + }) {}; magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; @@ -21715,22 +22096,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60"; - sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7"; + rev = "959e7b259697c79ccf46b95827575d3e15e83d30"; + sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs git-commit magit s with-editor ]; + packageRequires = [ emacs ghub-plus magit s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -21949,12 +22330,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "65f48df07c87d37275cc6a135741df4b585f1836"; - sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f"; + rev = "134fd336750b8b3165bc906f0a7161c25eb6f589"; + sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; @@ -22250,12 +22631,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; - sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; + rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; + sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -22289,6 +22670,27 @@ license = lib.licenses.free; }; }) {}; + memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "memoize"; + version = "1.1"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "emacs-memoize"; + rev = "636defefa9168f90bce6fc27431352ac7d01a890"; + sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize"; + sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6"; + name = "memoize"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/memoize"; + license = lib.licenses.free; + }; + }) {}; mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: melpaBuild { pname = "mentor"; @@ -22313,12 +22715,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.5"; + version = "3.0.2"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "957e551140587f0cd83d9186a06fba10a38c6084"; - sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -22415,27 +22817,6 @@ license = lib.licenses.free; }; }) {}; - mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "mic-paren"; - version = "3.10"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "mic-paren"; - rev = "e4cf6e1a0ee91e849a9d42ecdcd6ed0287f8a521"; - sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren"; - sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7"; - name = "mic-paren"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mic-paren"; - license = lib.licenses.free; - }; - }) {}; migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "migemo"; @@ -23737,22 +24118,22 @@ license = lib.licenses.free; }; }) {}; - nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.11"; + version = "1.2.1"; src = fetchFromGitHub { owner = "NixOS"; - repo = "nix"; - rev = "026f4f9ae881d9196422981f1f85fa3137525014"; - sha256 = "016c0ghqw7wmgdk47biqc0i4bav2igd5ayh6wr9bygrik81n126z"; + repo = "nix-mode"; + rev = "d5e839692a1273b128003eaed543318e7e5965a7"; + sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; - sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; + sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; name = "nix-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/nix-mode"; license = lib.licenses.free; @@ -23784,14 +24165,14 @@ pname = "no-littering"; version = "0.5.9"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -23824,12 +24205,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "0.1.1"; + version = "0.1.6"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "d821ef49a8eae0e405fd2a000246f0475542a575"; - sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; + rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1"; + sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -23884,11 +24265,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24.2"; + version = "0.25"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba"; - sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by"; + rev = "9f648dfbb8e253dab1bc4a0e761ad46cec405f4d"; + sha256 = "17b2rwvfq5zqm4cw8zqqzns8jjld3bpb25ca4133ckgkwach4v1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -24027,6 +24408,27 @@ license = lib.licenses.free; }; }) {}; + numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "numbers"; + version = "1.4"; + src = fetchFromGitHub { + owner = "davep"; + repo = "numbers.el"; + rev = "74be68b94143f042ce461b2a69202f515acaf20c"; + sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; + sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; + name = "numbers"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/numbers"; + license = lib.licenses.free; + }; + }) {}; nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; @@ -24069,27 +24471,6 @@ license = lib.licenses.free; }; }) {}; - nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "nyan-prompt"; - version = "0.2.0"; - src = fetchFromGitHub { - owner = "PuercoPop"; - repo = "nyan-prompt"; - rev = "b5137f2ee9afe640f59786eed17b308df6356c73"; - sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt"; - sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb"; - name = "nyan-prompt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/nyan-prompt"; - license = lib.licenses.free; - }; - }) {}; o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "o-blog"; @@ -24114,12 +24495,12 @@ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; - version = "20170501.112"; + version = "20170728.113"; src = fetchFromGitHub { owner = "corpix"; repo = "ob-blockdiag.el"; - rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6"; - sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv"; + rev = "634fcf64a4ae735afe7001d865b03f5d71e23046"; + sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; @@ -24282,12 +24663,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e"; - sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -24324,12 +24705,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "032599b162624a4b65c82c20be06433f24b00e8f"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -24387,12 +24768,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8"; + sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -24513,12 +24894,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 = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; - sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; + rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549"; + sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -24836,6 +25217,27 @@ license = lib.licenses.free; }; }) {}; + org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-category-capture"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; + sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav"; + name = "org-category-capture"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-category-capture"; + license = lib.licenses.free; + }; + }) {}; org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-commentary"; @@ -25254,27 +25656,48 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "0.2.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; - sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; - sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; + sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs org-category-capture projectile s ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; }; }) {}; + org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }: + melpaBuild { + pname = "org-projectile-helm"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "org-projectile"; + rev = "48f621b595e748c5e03431f237facf258ffc9443"; + sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; + sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4"; + name = "org-projectile-helm"; + }; + packageRequires = [ emacs helm org-projectile ]; + meta = { + homepage = "https://melpa.org/#/org-projectile-helm"; + license = lib.licenses.free; + }; + }) {}; org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; @@ -25895,6 +26318,27 @@ license = lib.licenses.free; }; }) {}; + osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "osx-pseudo-daemon"; + version = "2.1"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "mac-pseudo-daemon"; + rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; + sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; + name = "osx-pseudo-daemon"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/osx-pseudo-daemon"; + license = lib.licenses.free; + }; + }) {}; osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-trash"; @@ -26074,7 +26518,7 @@ sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; name = "ox-pandoc"; }; @@ -26236,14 +26680,14 @@ pname = "packed"; version = "2.0.1"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; packageRequires = [ dash emacs ]; @@ -26318,12 +26762,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc"; - sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc"; + rev = "58f893d54c0916ad832097a579288ef8ce405da5"; + sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -26547,12 +26991,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; - sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; + rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c"; + sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -26612,13 +27056,13 @@ pname = "password-store"; version = "1.7.1"; src = fetchgit { - url = "http://git.zx2c4.com/password-store"; + url = "https://git.zx2c4.com/password-store"; rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; - sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; + sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; name = "password-store"; }; packageRequires = [ f s ]; @@ -26858,6 +27302,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170808"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; + sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -27382,22 +27846,22 @@ license = lib.licenses.free; }; }) {}; - plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3"; - sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k"; + rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d"; + sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h"; name = "plantuml-mode"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/plantuml-mode"; license = lib.licenses.free; @@ -28180,12 +28644,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "5532abc15b97f3489183b266b41844306052a3fa"; - sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; + rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95"; + sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -28224,14 +28688,14 @@ pname = "psci"; version = "0.0.6"; src = fetchFromGitHub { - owner = "ardumont"; + owner = "purescript-emacs"; repo = "emacs-psci"; rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4"; sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci"; - sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; + sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9"; name = "psci"; }; packageRequires = [ dash deferred f purescript-mode s ]; @@ -28555,6 +29019,69 @@ license = lib.licenses.free; }; }) {}; + pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: + melpaBuild { + pname = "pyim"; + version = "1.6.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim"; + rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; + sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; + }; + 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 ]; + meta = { + homepage = "https://melpa.org/#/pyim"; + license = lib.licenses.free; + }; + }) {}; + pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pyim-basedict"; + version = "0.2"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-basedict"; + rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585"; + sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict"; + sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9"; + name = "pyim-basedict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pyim-basedict"; + license = lib.licenses.free; + }; + }) {}; + pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: + melpaBuild { + pname = "pyim-wbdict"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "pyim-wbdict"; + rev = "114489ed97e825ae11a8d09da6e873820cf23106"; + sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; + sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i"; + name = "pyim-wbdict"; + }; + packageRequires = [ pyim ]; + meta = { + homepage = "https://melpa.org/#/pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; @@ -28786,6 +29313,27 @@ license = lib.licenses.free; }; }) {}; + quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quiz"; + version = "1.4"; + src = fetchFromGitHub { + owner = "davep"; + repo = "quiz.el"; + rev = "69629937eaf994a51dad39c26355e1a56b9dcb95"; + sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz"; + sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg"; + name = "quiz"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/quiz"; + license = lib.licenses.free; + }; + }) {}; r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "r-autoyas"; @@ -29080,6 +29628,27 @@ license = lib.licenses.free; }; }) {}; + react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "react-snippets"; + version = "0.1"; + src = fetchFromGitHub { + owner = "johnmastro"; + repo = "react-snippets.el"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; + sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73"; + name = "react-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/react-snippets"; + license = lib.licenses.free; + }; + }) {}; real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; @@ -29608,12 +30177,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; - sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; + rev = "081685a8c624220ece68d6dca8d60016585b04ff"; + sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -29626,6 +30195,27 @@ license = lib.licenses.free; }; }) {}; + rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rib-mode"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "blezek"; + repo = "rib-mode"; + rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866"; + sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode"; + sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587"; + name = "rib-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rib-mode"; + license = lib.licenses.free; + }; + }) {}; rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; @@ -29713,12 +30303,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; - sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -29860,12 +30450,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; - sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + rev = "db1244c1c14514324474f362c857112e89bbf0c6"; + sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -29920,6 +30510,27 @@ license = lib.licenses.free; }; }) {}; + ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ruby-electric"; + version = "2.3.1"; + src = fetchFromGitHub { + owner = "knu"; + repo = "ruby-electric.el"; + rev = "3553448a780a1ea5c3b0e9becd820d4762876593"; + sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; + sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2"; + name = "ruby-electric"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ruby-electric"; + license = lib.licenses.free; + }; + }) {}; ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-end"; @@ -30004,6 +30615,27 @@ license = lib.licenses.free; }; }) {}; + rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rufo"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "rufo.el"; + rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc"; + sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; + sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; + name = "rufo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rufo"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -30305,8 +30937,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -30405,11 +31037,11 @@ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "secretaria"; - version = "0.2.4"; + version = "0.2.5"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; - rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b"; - sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc"; + rev = "7bd1cf591528b18a153e15a260d7817b72c900f2"; + sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; @@ -30425,12 +31057,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.6"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916"; - sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7"; + rev = "d1fd5d47aacba723631d5d374169a45ff2051c41"; + sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -30929,12 +31561,12 @@ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: melpaBuild { pname = "shr-tag-pre-highlight"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "shr-tag-pre-highlight.el"; - rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; - sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36"; + sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; @@ -30947,6 +31579,27 @@ license = lib.licenses.free; }; }) {}; + shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "shrink-path"; + version = "0.3.1"; + src = fetchFromGitLab { + owner = "bennya"; + repo = "shrink-path.el"; + rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b"; + sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; + sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; + name = "shrink-path"; + }; + packageRequires = [ dash f s ]; + meta = { + homepage = "https://melpa.org/#/shrink-path"; + license = lib.licenses.free; + }; + }) {}; shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shrink-whitespace"; @@ -30992,12 +31645,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; - sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31097,12 +31750,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -31202,12 +31855,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4"; - sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv"; + rev = "51f3bbeafea6701de78190a395f6376a9974f1e5"; + sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -31346,27 +31999,6 @@ license = lib.licenses.free; }; }) {}; - slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slime-ritz"; - version = "0.6.0"; - src = fetchFromGitHub { - owner = "pallet"; - repo = "ritz"; - rev = "1cc6faedae26323994ea8dd1a4f555db8acbf244"; - sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz"; - sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a"; - name = "slime-ritz"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slime-ritz"; - license = lib.licenses.free; - }; - }) {}; slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-volleyball"; @@ -31745,6 +32377,27 @@ license = lib.licenses.free; }; }) {}; + snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "snoopy"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "anmonteiro"; + repo = "snoopy-mode"; + rev = "8d2b7b1354414f261b237f2fed0d472803ba3909"; + sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; + sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; + name = "snoopy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/snoopy"; + license = lib.licenses.free; + }; + }) {}; socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "socyl"; @@ -31766,6 +32419,27 @@ license = lib.licenses.free; }; }) {}; + solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solaire-mode"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-solaire-mode"; + rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358"; + sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; + sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5"; + name = "solaire-mode"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/solaire-mode"; + license = lib.licenses.free; + }; + }) {}; solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; @@ -31913,27 +32587,6 @@ license = lib.licenses.free; }; }) {}; - sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: - melpaBuild { - pname = "sourcetalk"; - version = "1.2.0"; - src = fetchFromGitHub { - owner = "malroc"; - repo = "sourcetalk_emacs"; - rev = "aced89fa8776e6d5e42dad4a863e159959f08de6"; - sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk"; - sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z"; - name = "sourcetalk"; - }; - packageRequires = [ request ]; - meta = { - homepage = "https://melpa.org/#/sourcetalk"; - license = lib.licenses.free; - }; - }) {}; spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; @@ -31958,12 +32611,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350"; - sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2"; + rev = "255e89303bb706b42057504e72caeb2764f3d413"; + sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -32000,12 +32653,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642"; - sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"; + rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e"; + sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -32294,12 +32947,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114"; - sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij"; + rev = "dbd8608551bc9e05280415b7b3937b1a151c7718"; + sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -32396,25 +33049,6 @@ license = lib.licenses.free; }; }) {}; - stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "stgit"; - version = "0.17.1"; - src = fetchgit { - url = "git://repo.or.cz/stgit.git"; - rev = "48e5cef14cea5c810833d119900cd484c2a6ca85"; - sha256 = "0hgqxhqnc93pnh6j3hyi92hfx1cbdjylzqb2nl6ldsz1g2wdcw9r"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; - sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89"; - name = "stgit"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/stgit"; - license = lib.licenses.free; - }; - }) {}; string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-edit"; @@ -32603,57 +33237,15 @@ license = lib.licenses.free; }; }) {}; - subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "subshell-proc"; - version = "0.1"; - src = fetchFromGitHub { - owner = "andrewmains12"; - repo = "subshell-proc"; - rev = "bf475eb7b0684af967755e91c9cabd19f953b03b"; - sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc"; - sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp"; - name = "subshell-proc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/subshell-proc"; - license = lib.licenses.free; - }; - }) {}; - sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sudden-death"; - version = "0.2"; - src = fetchFromGitHub { - owner = "yewton"; - repo = "sudden-death.el"; - rev = "c58fb9a672f306604dde4fbb0ff079e65a5e40be"; - sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death"; - sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; - name = "sudden-death"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sudden-death"; - license = lib.licenses.free; - }; - }) {}; suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; - sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; + rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f"; + sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -32669,12 +33261,12 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "2015.11.29"; + version = "2017.8.1"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e"; - sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann"; + rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; + sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -32761,8 +33353,8 @@ sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff"; - sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff"; + sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk"; name = "swbuff"; }; packageRequires = []; @@ -32795,12 +33387,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; - sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; + rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; + sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -33739,12 +34331,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.3.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268"; - sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w"; + rev = "f8b4752dfe7fde7b90c65895c47943231af3237d"; + sha256 = "1hy0jzk457nz9rz7s4hq6b5asv9g9wrrs1fdsisz7jzy6hzw4pqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -33906,12 +34498,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; - sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; + rev = "541f73c779e72eb6ebcc6814a75771e91679875a"; + sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -33948,12 +34540,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.7.6"; + version = "1.9"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda"; + sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -33969,12 +34561,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.7.6"; + version = "1.9"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda"; + sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -34029,6 +34621,27 @@ license = lib.licenses.free; }; }) {}; + try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "try"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "larstvei"; + repo = "Try"; + rev = "271b0a362cadf44d0694628b9e213f54516ef913"; + sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try"; + sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n"; + name = "try"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/try"; + license = lib.licenses.free; + }; + }) {}; tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "tss"; @@ -34323,6 +34936,27 @@ license = lib.licenses.free; }; }) {}; + underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "underline-with-char"; + version = "3.0.0"; + src = fetchFromGitHub { + owner = "marcowahl"; + repo = "underline-with-char"; + rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9"; + sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; + sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; + name = "underline-with-char"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/underline-with-char"; + license = lib.licenses.free; + }; + }) {}; underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "underwater-theme"; @@ -34581,27 +35215,6 @@ license = lib.licenses.free; }; }) {}; - uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "uzumaki"; - version = "0.1"; - src = fetchFromGitHub { - owner = "geyslan"; - repo = "uzumaki"; - rev = "a75956e1757f4b98aad3384a4616481aede70cb1"; - sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki"; - sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q"; - name = "uzumaki"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/uzumaki"; - license = lib.licenses.free; - }; - }) {}; v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "v2ex-mode"; @@ -34665,6 +35278,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee"; + sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcomp"; @@ -34836,12 +35470,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "5c9ae8018002c10a034de60b527c42f3665f6b67"; - sha256 = "01wxjvbq3i1ji9fpff7fbk20pzmr52z6fycqfi7malgwq05is1bm"; + rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; + sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -35445,12 +36079,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "3ff303b50495d492cfac70cc9f7321971928bdb1"; - sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm"; + rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; + sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -35739,11 +36373,11 @@ wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; - version = "0.9.1"; + version = "0.9.2"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "f94ec5fed665"; - sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n"; + rev = "e5a20c81c0bd"; + sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -35798,6 +36432,27 @@ license = lib.licenses.free; }; }) {}; + with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + melpaBuild { + pname = "with-simulated-input"; + version = "2.2"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "with-simulated-input"; + rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; + sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; + sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk"; + name = "with-simulated-input"; + }; + packageRequires = [ emacs s seq ]; + meta = { + homepage = "https://melpa.org/#/with-simulated-input"; + license = lib.licenses.free; + }; + }) {}; wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wn-mode"; @@ -35861,24 +36516,24 @@ license = lib.licenses.free; }; }) {}; - wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "wordsmith-mode"; - version = "1.0.0"; + pname = "wordgen"; + version = "0.1.4"; src = fetchFromGitHub { - owner = "istib"; - repo = "wordsmith-mode"; - rev = "41b10f2fe3589da9812395cb417c3dcf906f0969"; - sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs"; + owner = "Fanael"; + repo = "wordgen.el"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode"; - sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n"; - name = "wordsmith-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { - homepage = "https://melpa.org/#/wordsmith-mode"; + homepage = "https://melpa.org/#/wordgen"; license = lib.licenses.free; }; }) {}; @@ -36344,6 +36999,48 @@ license = lib.licenses.free; }; }) {}; + yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yard-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "pd"; + repo = "yard-mode.el"; + rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095"; + sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode"; + sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx"; + name = "yard-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yard-mode"; + license = lib.licenses.free; + }; + }) {}; + yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yarn-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "yarn-mode"; + rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; + sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; + sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; + name = "yarn-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yarn-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -36368,12 +37065,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; - sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; + rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5"; + sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -36407,25 +37104,6 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yatex"; - version = "1.78"; - src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "e9299b77df1f"; - sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; - name = "yatex"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yatex"; - license = lib.licenses.free; - }; - }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -36583,18 +37261,39 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zephir-mode"; + version = "0.3.3"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c"; + sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "60615d101769694038b17a2c75bb31c26f36a042"; - sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj"; + rev = "ceb46240636865e86f3fe26906957943ba7bd73c"; + sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 82bd5ea0c528..794c79d7151a 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 = "20170703"; + version = "20170821"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170703.tar"; - sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58"; + url = "http://orgmode.org/elpa/org-20170821.tar"; + sha256 = "0pfqm8r1hgk1mf57rwp1h46gc5dwsyfkgnpw01a8y5w35dcsvz4j"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170703"; + version = "20170821"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar"; - sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170821.tar"; + sha256 = "0m5zym1b4kr7q3ps41rhz92krbjmk9m220hc0rdym95gyjfzw62i"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 237b1ac14834..b01c526aa8e4 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; + homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index f830b16da981..0031ffee4d4d 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation ''; meta = { - homepage = "http://rudel.sourceforge.net/"; + homepage = http://rudel.sourceforge.net/; description = "A collaborative editing environment for GNU Emacs"; license = "GPL"; }; diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix index 092026aca88a..835cf8081afa 100644 --- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/hvesalai/scala-mode2"; + homepage = https://github.com/hvesalai/scala-mode2; description = "An Emacs mode for editing Scala code"; license = "permissive"; }; diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix index ed3ac0e3da05..0a44deb8ced8 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/hvesalai/scala-mode2"; + homepage = https://github.com/hvesalai/scala-mode2; description = "An Emacs mode for editing Scala code"; license = "permissive"; }; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 9334b7820faa..bd00045bca91 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WYSIWYG PostScript annotator"; - homepage = "http://http://flpsed.org/flpsed.html"; + homepage = http://http://flpsed.org/flpsed.html; license = licenses.gpl3; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ fuuzetsu ]; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index eedb674b472c..28106cf876bd 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; - homepage = "http://gottcode.org/focuswriter/"; + homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 89235514bb82..b2cf9c6d68dc 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.30.1"; + version = "1.31"; in stdenv.mkDerivation rec { @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491"; + sha256 = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk2 which file ]; diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index c74e47a5243d..dce02b568906 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Portable and fast console hex editor for unix operating systems"; - homepage = "http://heme.sourceforge.net/"; + homepage = http://heme.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 17bb9739b9b7..5c0f2ee18e1f 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ncurses-based console hexeditor written in C"; - homepage = "https://github.com/LonnyGomes/hexcurse"; + homepage = https://github.com/LonnyGomes/hexcurse; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 24282b9ac8e0..4671df77554f 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "View and edit files in hexadecimal or in ASCII"; - homepage = "http://prigaux.chez.com/hexedit.html"; + homepage = http://prigaux.chez.com/hexedit.html; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 4455c70d71a8..112eebfaf6f6 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "File editor/viewer/analyzer for executables"; - homepage = "http://hte.sourceforge.net"; + homepage = http://hte.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 99a1837f9f22..95f3c0801d2a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -17,11 +17,11 @@ let inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/clion/"; + homepage = https://www.jetbrains.com/clion/; inherit description license; longDescription = '' Enhancing productivity for every C and C++ - developer on Linux, OS X and Windows. + developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; platforms = platforms.linux; @@ -50,6 +50,9 @@ let patchelf --set-interpreter $interp bin/gdb/bin/gdb patchelf --set-interpreter $interp bin/gdb/bin/gdbserver + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \ + bin/clang/clang-tidy ) ''; }); @@ -59,7 +62,7 @@ let inherit name version src wmClass jdk; product = "DataGrip"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/datagrip/"; + homepage = https://www.jetbrains.com/datagrip/; inherit description license; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. @@ -76,7 +79,7 @@ let inherit name version src wmClass jdk; product = "Gogland"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/go/"; + homepage = https://www.jetbrains.com/go/; inherit description license; longDescription = '' Gogland is the codename for a new commercial IDE by JetBrains @@ -94,7 +97,7 @@ let inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/idea/"; + homepage = https://www.jetbrains.com/idea/; inherit description license; longDescription = '' IDE for Java SE, Groovy & Scala development Powerful @@ -111,7 +114,7 @@ let inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/phpstorm/"; + homepage = https://www.jetbrains.com/phpstorm/; inherit description license; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript @@ -128,7 +131,7 @@ let inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/pycharm/"; + homepage = https://www.jetbrains.com/pycharm/; inherit description license; longDescription = '' Python IDE with complete set of tools for productive @@ -155,7 +158,7 @@ let inherit name version src wmClass jdk; product = "Rider"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/rider/"; + homepage = https://www.jetbrains.com/rider/; inherit description license; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ @@ -181,7 +184,7 @@ let inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/ruby/"; + homepage = https://www.jetbrains.com/ruby/; inherit description license; longDescription = description; maintainers = with maintainers; [ edwtjo ]; @@ -194,7 +197,7 @@ let inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/webstorm/"; + homepage = https://www.jetbrains.com/webstorm/; inherit description license; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), @@ -213,12 +216,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.1.3"; + version = "2017.2.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 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g"; + sha256 = "acd3d09a37a3fa922a85a48635d1b230d559ea68917e2e7895caf16460d50c13"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -239,12 +242,12 @@ in gogland = buildGogland rec { name = "gogland-${version}"; - version = "171.4694.61"; /* updated by script */ + version = "172.3757.46"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */ + sha256 = "0d6b710edc434ed5d5ea5c4734b9026e2caeba7e74a027c1eb6fd837c5d4f4fd"; /* updated by script */ }; wmClass = "jetbrains-gogland"; update-channel = "gogland_1.0_EAP"; @@ -265,12 +268,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.1.4"; + version = "2017.2.2"; /* updated by script */ 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 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45"; + sha256 = "c719af3d538bef23d061ef62d4acbf503198ff62322a3c0c5b3c38ab7ac36c4f"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -304,12 +307,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1.4"; + version = "2017.2.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 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4"; + sha256 = "b8eb9d612800cc896eb6b6fbefbf9f49d92d2350ae1c3c4598e5e12bf93be401"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -317,15 +320,15 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.1.4"; + version = "2017.2.1"; /* updated by script */ 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 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf"; + sha256 = "2f1af9ef6e9cda25a809a19a25f2d4fbaef00edf9d1d5a195572ab5e04e71e5e"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2017.1"; + update-channel = "PS2017.2"; }; phpstorm10 = buildPhpStorm rec { @@ -343,12 +346,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.1.4"; /* updated by script */ + version = "2017.2.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 = "1e69ab29215a9c8c4626de6727df433ae0d9f6ed46eba2a6f48ffa52c2b04256"; /* updated by script */ + sha256 = "4eacc9bf512406bebf71546ccb4b6c14ea8e06748fd76be6ca409ea1955e1f53"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -356,12 +359,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.1.4"; /* updated by script */ + version = "2017.2.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 = "bbae5602b9cf6d26ccce9e1bf8b388d79c27cf89673d1a56f248bf0a50e518ed"; /* updated by script */ + sha256 = "21aedfd189115fcfee0e8c8df88eccbd8f19b998667af3c55ce5d56d4eaa37a9"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -369,25 +372,25 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "171.4456.575"; /* updated by script */ + version = "171.4456.1432"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz"; - sha256 = "9b7f46e9c800a091f2cdbe9fda08041729e2abc0ce57252731da659b2424707b"; /* updated by script */ + url = "https://download.jetbrains.com/resharper/Rider-RC-${version}.tar.gz"; + sha256 = "37bad69cdfcc4f297b2500a7bb673af7ef8f1fd45baa4eb2fa388d2c4bcb41ee"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider1.0EAP"; + update-channel = "rider_2017_1_eap"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.1.4"; + version = "2017.1.5"; /* 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 = "06jk0anlnc4gr240i51kam47shdjgda6zg3hglk5w3bpvbyix68z"; + sha256 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.1"; @@ -421,12 +424,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.1.4"; + version = "2017.2.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 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm"; + sha256 = "d6b7b103f8543e25d2602657f12d029856529895af6354e1a0875ed40bd05180"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index bbd9be220744..7a241277e8ef 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -2,7 +2,7 @@ , qtquickcontrols, qtwebkit, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor -, threadweaver, kxmlgui, kwindowsystem, grantlee +, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info , libksysguard, konsole, llvmPackages, makeWrapper }: @@ -34,7 +34,7 @@ mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared_mime_info libksysguard konsole + kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons ]; postInstall = '' diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f3527d85fd7f..3cb53a6116b6 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, hostPlatform, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.8.5"; + version = "2.8.6"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb"; + sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 88100b2e8f87..327edca0ed24 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.0.2) - neovim (0.3.1) + msgpack (1.1.0) + neovim (0.5.0) msgpack (~> 1.0) PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.12.5 + 1.15.1 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index c3ed45a78481..fbb9c63a1cff 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,18 +2,18 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; neovim = { dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "018mk4vqaxzbk4anq558h2rgj8prbn2rmi777iwrg3n0v8k5nxqw"; + sha256 = "1da0ha3mz63iyihldp7185b87wx86jg07023xjhbng6i28y1ksn7"; type = "gem"; }; - version = "0.3.1"; + version = "0.5.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index b553e09ed5e2..9b3896e32d65 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = "http://notepadqq.altervista.org/"; + homepage = http://notepadqq.altervista.org/; description = "Notepad++-like editor for the Linux desktop"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index c9d86561fe26..0bcbad58b3a2 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec { meta = with pkgs.lib; { description = "A simplenote-syncing note-taking tool inspired by Notational Velocity"; - homepage = "https://github.com/cpbotha/nvpy"; + homepage = https://github.com/cpbotha/nvpy; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9ac91e7086ab..efb0a6f624d8 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { name = "RStudio-${version}"; buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ]; - nativeBuildInputs = [ qt5.qmake ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ]; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index d02a08a0a597..61b28e02949e 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scite-${version}"; - version = "3.7.3"; + version = "3.7.5"; src = fetchurl { - url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite373.tgz"; - sha256 = "05d81h1fqhjlw9apvrni3x2q4a562cd5ra1071qpna8h4ml0an9m"; + url = http://www.scintilla.org/scite375.tgz; + sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.scintilla.org/SciTE.html"; + homepage = http://www.scintilla.org/SciTE.html; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 0b8ecda62302..c295313621e3 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -31,20 +31,19 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper zip unzip ]; # make exec.py in Default.sublime-package use own bash with # an LD_PRELOAD instead of "/bin/bash" patchPhase = '' mkdir Default.sublime-package-fix ( cd Default.sublime-package-fix - ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null + unzip -q ../Packages/Default.sublime-package substituteInPlace "exec.py" --replace \ "[\"/bin/bash\"" \ "[\"$out/sublime_bash\"" + zip -q ../Packages/Default.sublime-package **/* ) - ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null - mv Default.sublime-package.zip Packages/Default.sublime-package rm -r Default.sublime-package-fix ''; @@ -85,14 +84,17 @@ in stdenv.mkDerivation { name = "sublimetext3-${build}"; phases = [ "installPhase" ]; + + inherit sublime; + installPhase = '' mkdir -p $out/bin - ln -s ${sublime}/sublime_text $out/bin/subl - ln -s ${sublime}/sublime_text $out/bin/sublime - ln -s ${sublime}/sublime_text $out/bin/sublime3 + ln -s $sublime/sublime_text $out/bin/subl + ln -s $sublime/sublime_text $out/bin/sublime + ln -s $sublime/sublime_text $out/bin/sublime3 mkdir -p $out/share/applications - ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop - ln -s ${sublime}/Icon/256x256/ $out/share/icons + ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop + ln -s $sublime/Icon/256x256/ $out/share/icons ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index eb6e1baccb59..76c8e4ae0e44 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = "http://www.xm1math.net/texmaker/"; + homepage = http://www.xm1math.net/texmaker/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche ]; diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index eb0be39e7c16..e55bcb48787f 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An efficient hex editor"; - homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/tweak; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 442a2e2224e4..0733bd796656 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.29"; + version = "0.9.31"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7"; + sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659"; + sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1"; } ; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimal Markdown reading & writing app"; - homepage = "https://typora.io"; + homepage = https://typora.io; license = licenses.free; maintainers = with stdenv.lib.maintainers; [ jensbin ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index 97bf0d5c2371..becb5ccc29a1 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A terminal visual binary diff viewer"; - homepage = "http://www.cjmweb.net/vbindiff/"; + homepage = http://www.cjmweb.net/vbindiff/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3f588fdde585..0f81b0bdd640 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -24,6 +24,10 @@ let let pluginname = substitute(d, ".*/", "", "") if !has_key(seen, pluginname) exec 'set runtimepath^='.d + let after = d."/after" + if isdirectory(after) + exec 'set runtimepath^='.after + endif let seen[pluginname] = 1 endif endfor @@ -85,7 +89,7 @@ composableDerivation { NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; }; - } #Disable Darwin (Mac OS X) support. + } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a688170b8ad4..bb265e90b770 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Vim - the text editor - for Mac OS X"; + description = "Vim - the text editor - for macOS"; homepage = https://github.com/b4winckler/macvim; license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 5e98b3c9a785..c23bf360daf3 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -43,7 +43,7 @@ composableDerivation { ''; }; } - // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. + // edf { name = "darwin"; } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; } #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 291c7b1b412d..eef1746ff380 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vim like editor"; - homepage = http://github.com/martanne/vis; + homepage = https://github.com/martanne/vis; license = licenses.isc; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix new file mode 100644 index 000000000000..c54c8a4277f1 --- /dev/null +++ b/pkgs/applications/editors/vscode-with-extensions/default.nix @@ -0,0 +1,82 @@ +{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript +, vscodeExtensions ? [] }: + +/* + `vscodeExtensions` + : A set of vscode extensions to be installed alongside the editor. Here's a an + example: + + ~~~ + vscode-with-extensions.override { + + # When the extension is already available in the default extensions set. + vscodeExtensions = with vscode-extensions; [ + bbenoist.Nix + ] + + # Concise version from the vscode market place when not available in the default set. + ++ vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "code-runner"; + publisher = "formulahendry"; + version = "0.6.33"; + sha256 = "166ia73vrcl5c9hm4q1a73qdn56m0jc7flfsk5p5q41na9f10lb0"; + } + ]; + } + ~~~ + + This expression should fetch + - the *nix* vscode extension from whatever source defined in the + default nixpkgs extensions set `vscodeExtensions`. + + - the *code-runner* vscode extension from the marketplace using the + following url: + + ~~~ + https://bbenoist.gallery.vsassets.io/_apis/public/gallery/publisher/bbenoist/extension/nix/1.0.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage + ~~~ + + The original `code` executable will be wrapped so that it uses the set of pre-installed / unpacked + extensions as its `--extensions-dir`. +*/ + +let + + wrappedPkgVersion = lib.getVersion vscode; + wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; + + combinedExtensionsDrv = buildEnv { + name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}"; + paths = vscodeExtensions; + }; + + wrappedExeName = "code"; + exeName = wrappedExeName; + + wrapperExeFile = writeScript "${exeName}" '' + #!${stdenv.shell} + exec ${vscode}/bin/${wrappedExeName} \ + --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \ + "$@" + ''; + +in + +# When no extensions are requested, we simply redirect to the original +# non-wrapped vscode executable. +runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { + buildInputs = [ vscode which ]; + dontPatchELF = true; + dontStrip = true; + meta = vscode.meta; +} '' + mkdir -p "$out/bin" + ${if [] == vscodeExtensions + then '' + ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}" + '' + else '' + ln -sT "${wrapperExeFile}" "$out/bin/${exeName}" + ''} +'' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 50103de4d050..5db2a1aaece4 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.13.0"; + version = "1.15.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "069pv0w8yhsv50glpcxzypsjc7mxmrcrv25c75rnv43yiyamjvyi"; - "x86_64-linux" = "0cjkkvd5rs82yji0kpnbvzgwz5qvh9x6bmjd51rrvjz84dbwhgzq"; - "x86_64-darwin" = "1qbxv5drqrx9k835a6zj3kkbh4sga5r9y0gf9bq16g3gf0dd9bwq"; + "i686-linux" = "09vvq02bsq6fdb0ibshn97kll43dpfmyq2dahl9gj02jlwardq27"; + "x86_64-linux" = "1kg25i4kavmgivnk4w3dsbsnn9vncl5d2m0ds93f8qvmxpizwg21"; + "x86_64-darwin" = "1fgjg7c9appp8v0ir7m2r3a3x4z0gx4na0p3d8j1x4pcs0kqy0qp"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -77,11 +77,11 @@ in meta = with stdenv.lib; { description = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X + Linux and macOS ''; longDescription = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X. It includes support for debugging, embedded Git + Linux and macOS. It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index de423987c02b..ad294480e60b 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { a good reverse engineer tool like a good hex editor, you welcome. wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; - homepage = "http://www.wxhexeditor.org/"; + homepage = http://www.wxhexeditor.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b8c9d1718143..10c2ab9ebf99 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,24 +5,15 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.4"; + name = "qgis-2.18.10"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]); + (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; - patches = [ - # See https://hub.qgis.org/issues/16071 - (fetchpatch { - name = "fix-build-against-recent-sip"; - url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch"; - sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30"; - }) - ]; - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; @@ -34,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k"; + sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 5eaf488fff53..cd99861ea7b6 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -10,11 +10,12 @@ let if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else if stdenv.system == "armv7l-linux" then "armv7l" + else if stdenv.system == "aarch64-linux" then "aarch64" else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.6-0"; - sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i"; + version = "7.0.6-4"; + sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 39812b2cfc47..1cf08f286ef3 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -10,11 +10,12 @@ let if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else if stdenv.system == "armv7l-linux" then "armv7l" + else if stdenv.system == "aarch64-linux" then "aarch64" else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.8-10"; - sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg"; + version = "6.9.9-7"; + sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -85,7 +86,9 @@ stdenv.mkDerivation rec { moveToOutput "bin/*-config" "$dev" moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace pkg-config \ + substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ + ${pkgconfig}/bin/pkg-config + substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" done '' + lib.optionalString (ghostscript != null) '' diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 332bb8794e71..b1f64afd9aee 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,3 +1,5 @@ +# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. + {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index dc974aed0571..986e16834f76 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/ahodesuka/ahoviewer"; + homepage = https://github.com/ahodesuka/ahoviewer; description = "A GTK2 image viewer, manga reader, and booru browser"; maintainers = [ maintainers.skrzyp ]; license = licenses.mit; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 68ab287f1a65..8c1db9c039e7 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.4"; + version = "2.2.5"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1n7rddkxwcifc3kcdlnar9w562xv4h78fqkkn27jihqzp3b4am5x"; + sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; }; buildInputs = diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 4aeb7a4a567e..f15730874744 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; - homepage = "http://openexr.com"; + homepage = http://openexr.com; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 310f81961cbe..d49110d00693 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of utilities for manipulating OpenEXR images"; - homepage = "http://scanline.ca/exrtools"; + homepage = http://scanline.ca/exrtools; platforms = platforms.linux; license = licenses.mit; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index d06c3eb5ec13..2943b5ef94c0 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; - makeFlags = [ "prefix=$(out)" "verbose=yes" ]; + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; patchPhase = '' diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 5de8e7892abe..2b24b93282f1 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.19"; + version = "2.19.3"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf"; + sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay"; }; outputs = [ "out" "man" "doc" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; license = licenses.mit; - maintainers = [ maintainers.viric ]; + maintainers = [ maintainers.viric maintainers.willibutz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index ced6a5f7258a..8ca093b90c3e 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = http://github.com/fontmatrix/fontmatrix; + homepage = https://github.com/fontmatrix/fontmatrix; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index c58d9e0bda13..80f893e7c3c9 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -5,11 +5,11 @@ let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.16"; + version = "0.16.6712"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc"; + sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp"; }; buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = http://www.freecadweb.org/; + homepage = https://www.freecadweb.org/; license = licenses.lgpl2Plus; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 47004a025009..ff87b70a0c1e 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; - homepage = http://www.gimp.org/; + homepage = https://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 0a1059c6a47c..4b45e44e22d5 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://jocr.sourceforge.net/"; + homepage = http://jocr.sourceforge.net/; description = "GPL Optical Character Recognition"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch deleted file mode 100644 index dd375143277a..000000000000 --- a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch +++ /dev/null @@ -1,36 +0,0 @@ -# HG changeset patch -# User Bob Friesenhahn -# Date 1487905610 21600 -# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8 -# Parent 0392c4305a4369984ec8069055acc470c0a73647 -Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel. - -diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c ---- a/coders/tiff.c Sun Jan 29 10:04:57 2017 -0600 -+++ b/coders/tiff.c Thu Feb 23 21:06:50 2017 -0600 -@@ -1230,8 +1230,8 @@ - case 0: - if (samples_per_pixel == 1) - *quantum_type=GrayQuantum; -- else -- *quantum_type=RedQuantum; -+ else -+ *quantum_type=RedQuantum; - break; - case 1: - *quantum_type=GreenQuantum; -@@ -1411,12 +1411,12 @@ - } - else - { -- if (image->matte) -+ if (image->matte && samples_per_pixel >= 5) - { - *quantum_type=CMYKAQuantum; - *quantum_samples=5; - } -- else -+ else if (samples_per_pixel >= 4) - { - *quantum_type=CMYKQuantum; - *quantum_samples=4; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 0858dfba8b40..c8c9ac8f26ef 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,47 +2,18 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.25"; in +let version = "1.3.26"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"; + sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; }; patches = [ ./disable-popen.patch - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; - sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch"; - sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch"; - sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch"; - sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch"; - sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; - sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch"; - sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa"; - }) - ./cmyka-bounds.patch ]; configureFlags = [ diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index c96ddc987954..061dc2b69a61 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Perceptual JPEG encoder"; longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; - homepage = "https://github.com/google/guetzli"; + homepage = https://github.com/google/guetzli; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.x86_64; maintainers = [ stdenv.lib.maintainers.seppeljordan ]; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 4fdfb87f134c..90f8eec5993a 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Xinerama Aware Background Changer"; - homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; + homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ lucas8 ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f48ce6a4ce44..a3a58bc87ee4 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool +, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, automake114x, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake }: let @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x potrace cmake python2Env + makeWrapper gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif potrace cmake python2Env ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index c9587b222d90..f120f8b13d40 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; meta = { - homepage = "http://code.google.com/p/jbrout"; + homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ccac9dd0ed19..c8fb295044ad 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { meta = with lib; { description = "A free an open source painting application"; - homepage = "https://krita.org/"; + homepage = https://krita.org/; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index 1b5fbc2271b5..ac2a194b7ca4 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make PREFIX=$out install ''; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; buildInputs = [ libXext libX11 libjpeg libpng giflib ]; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index e8c22b37638c..51bfa603a055 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = "http://mtpaint.sourceforge.net/"; + homepage = http://mtpaint.sourceforge.net/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index f3b16a304608..e7a05c522ca2 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "3D parametric model compiler"; longDescription = '' OpenSCAD is a software for creating solid 3D CAD objects. It is free - software and available for Linux/UNIX, MS Windows and Mac OS X. + software and available for Linux/UNIX, MS Windows and macOS. Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. ''; - homepage = "http://openscad.org/"; + homepage = http://openscad.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 0973893bbec8..8736721b43d5 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; meta = { - homepage = "http://www.paraview.org/"; + homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric guibert]; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 894667597d85..1c582df50dea 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ git flex bison cmake zlib ]; meta = with stdenv.lib; { - homepage = "http://pbrt.org"; + homepage = http://pbrt.org; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; platforms = platforms.linux ; license = licenses.bsd2; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 5b1f79a6c4fd..f7175f9d2b87 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = http://github.com/prikhi/pencil; + homepage = https://github.com/prikhi/pencil; license = licenses.gpl2; # Commercial license is also available maintainers = with maintainers; [ bjornfor prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index d6bcdee41375..22db78b81254 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://photoqt.org/"; + homepage = http://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/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index a66e91631422..12ff5c772402 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; - homepage = http://processing.org; + homepage = https://processing.org; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 4bd80c01c93b..ff3ebfad484a 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { video- and still-cameras, frame-grabbers, etc. For a list of supported scanners, see http://www.sane-project.org/sane-backends.html. ''; - homepage = "http://www.sane-project.org/"; + homepage = http://www.sane-project.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx peti ]; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index bd19ef3c43b1..a956db400521 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { (if libusb != null then [libusb] else []); meta = { - homepage = "http://www.sane-project.org/"; + homepage = http://www.sane-project.org/; description = "Scanner Access Now Easy"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 083fde359029..55c856c19127 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; meta = { - homepage = "https://github.com/Y-Vladimir/SmartDeblur"; + homepage = https://github.com/Y-Vladimir/SmartDeblur; description = "Tool for restoring blurry and defocused images"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ viric ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index a55b19dc5b60..f8db30675b15 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm2, pangomm, glew, mesa_glu, xlibs, pcre +, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre }: stdenv.mkDerivation rec { - name = "solvespace-2.3-20170416"; - rev = "b1d87bf284b32e875c8edba592113e691ea10bcd"; + name = "solvespace-2.3-20170808"; + rev = "16540b1b2c540a4b44500ac02aaa4493bccfba7e"; src = fetchgit { url = https://github.com/solvespace/solvespace; inherit rev; - sha256 = "160qam04pfrwkh9qskfmjkj01wrjwhl09xi6jjxi009yqg3cff9l"; + sha256 = "1z10i21xf3yagd984lp1hwasnsizx2s3faq3wdzzjngrikr2zn70"; fetchSubmodules = true; }; buildInputs = [ cmake pkgconfig zlib libpng cairo freetype - json_c fontconfig gtkmm2 pangomm glew mesa_glu + json_c fontconfig gtkmm3 pangomm glew mesa_glu xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; enableParallelBuilding = true; @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { EOF ''; + postInstall = '' + substituteInPlace $out/share/applications/solvespace.desktop \ + --replace /usr/bin/ $out/bin/ \ + ''; + meta = { description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 843352b27913..93bb5f151d94 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X Image Viewer"; - homepage = "https://github.com/muennich/sxiv"; + homepage = https://github.com/muennich/sxiv; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ jfrankenau fuuzetsu ]; diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix index 577bff91e353..156c911b9b86 100644 --- a/pkgs/applications/graphics/tesseract/4.x.nix +++ b/pkgs/applications/graphics/tesseract/4.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = http://code.google.com/p/tesseract-ocr/; + homepage = https://github.com/tesseract-ocr/tesseract; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index a5643da8c3a8..eb9a63838612 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = http://code.google.com/p/tesseract-ocr/; + homepage = https://github.com/tesseract-ocr/tesseract; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index dc896e0b0d9b..31908dcfd9f0 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -104,7 +104,7 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; - homepage = "http://unigine.com/products/benchmarks/valley/"; + homepage = http://unigine.com/products/benchmarks/valley/; license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 023008183ffb..38f63bdb3836 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec { postInstall = "make DESTDIR=\"$out\" install"; meta = { - homepage = "https://github.com/karlch/vimiv"; + homepage = https://github.com/karlch/vimiv; description = "An image viewer with Vim-like keybindings"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 4b1040ce7657..2269f1c18f14 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://www.fractint.net/"; + homepage = https://www.fractint.net/; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 9af46f5cb358..fa85d44a4980 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - homepage = "http://www.yworks.com/en/products/yfiles/yed/"; + homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index b1574ea6963b..3f3c2a32e68e 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A compact distributed operating system for building cross-platform distributed systems"; - homepage = "http://inferno-os.org/"; + homepage = http://inferno-os.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix new file mode 100644 index 000000000000..ce6b6f75f93c --- /dev/null +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts, + kidentitymanagement, kio, kmailtransport, +}: + +mkDerivation { + name = "akonadi-calendar"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement + kio kmailtransport + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 3f410b7b8b91..b09058b60be9 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,20 +1,24 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, - akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes, - kio, kitemmodels, kmime, ktextwidgets, qtwebengine, + qtwebengine, + grantlee, + kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison, + akonadi, akonadi-mime, kcontacts, kmime, }: mkDerivation { name = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio - kitemmodels kmime ktextwidgets qtwebengine + qtwebengine + grantlee + kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison + akonadi-mime kcontacts kmime ]; propagatedBuildInputs = [ akonadi ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 98a341da6b68..52a17f5cbeb9 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,18 +1,16 @@ { - mkDerivation, lib, - extra-cmake-modules, - akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime, - shared_mime_info + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, shared_mime_info, + akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: mkDerivation { name = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ akonadi shared_mime_info - kdbusaddons ki18n kio kitemmodels kmime ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix new file mode 100644 index 000000000000..72c4d799239c --- /dev/null +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui +}: + +mkDerivation { + name = "akonadi-notes"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi kcompletion ki18n kitemmodels kmime kxmlgui + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix new file mode 100644 index 000000000000..617c086ad9c9 --- /dev/null +++ b/pkgs/applications/kde/akonadi-search.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime, + krunner, qtbase, xapian +}: + +mkDerivation { + name = "akonadi-search"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcmutils krunner xapian ]; + propagatedBuildInputs = [ + akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index f1ae1f23cc95..91fd934b1ecc 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -33,7 +33,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - } - const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); -+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN); ++ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") @@ -42,11 +42,11 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp } - mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); -+ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); ++ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; - mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); -+ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK); ++ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); @@ -55,7 +55,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); - mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); -+ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD); ++ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); @@ -84,7 +84,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp // generate config file - const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); -+ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); ++ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { @@ -133,7 +133,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - - defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); - defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); -+ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB); ++ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } @@ -145,7 +145,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - if (mInternalServer && mServerPath.isEmpty()) { - mServerPath = defaultServerPath; - } -+ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL); ++ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL); qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { @@ -166,7 +166,7 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); - const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher"); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); mController->start(agentLauncherExec, arguments); } return true; @@ -179,13 +179,13 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); - mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); if (mAgentServerEnabled) { mAgentServer = new Akonadi::ProcessControl; connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); - mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); } #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index c2e344284742..bb7dac1b62a0 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,28 +1,24 @@ { - mkDerivation, copyPathsToStore, lib, - extra-cmake-modules, - kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, - kwindowsystem, kcrash, kio, - boost, kitemmodels, shared_mime_info, - mysql + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, shared_mime_info, + boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, + ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: mkDerivation { name = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; buildInputs = [ - kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio - kwindowsystem kcrash shared_mime_info + kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n + kiconthemes kio kwindowsystem qttools ]; propagatedBuildInputs = [ boost kitemmodels ]; - cmakeFlags = [ - "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld" - ]; + outputs = [ "out" "dev" ]; NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"'' ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"'' diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix new file mode 100644 index 000000000000..844cbc7d17f2 --- /dev/null +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion, + kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, + ktextwidgets, kxmlgui, messagelib, qtbase, +}: + +mkDerivation { + name = "akonadiconsole"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets + kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui + messagelib qtbase + ]; +} diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix new file mode 100644 index 000000000000..98d53bc80838 --- /dev/null +++ b/pkgs/applications/kde/akregator.nix @@ -0,0 +1,30 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, + grantlee, + kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor, + kwindowsystem, + akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo, + messagelib, syndication +}: + +mkDerivation { + name = "akregator"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtwebengine + + grantlee + + kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem + + akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo + messagelib syndication + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index df15f6b0f188..013e2e63f599 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -7,7 +7,7 @@ khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive, # Archive tools - p7zip, unzipNLS, zip, + p7zip, unzip, zip, # Unfree tools unfreeEnableUnrar ? false, unrar, @@ -25,7 +25,7 @@ mkDerivation { let PATH = lib.makeBinPath - ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); + ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar); in '' wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" ''; diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix deleted file mode 100644 index 892d82fb51e8..000000000000 --- a/pkgs/applications/kde/build-support/application.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, srcs }: - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - outputs = args.outputs or [ "out" "dev" ]; - - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); -}) diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix new file mode 100644 index 000000000000..485397ec4aac --- /dev/null +++ b/pkgs/applications/kde/calendarsupport.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs, + kholidays, kidentitymanagement, kmime, pimcommon, qttools, +}: + +mkDerivation { + name = "calendarsupport"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools + ]; + propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 207228a65b0c..24b73f415ad9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -33,63 +33,121 @@ still shows most of the available features is in `./gwenview.nix`. let mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; -in -let + mkDerivation = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + mkDerivation = + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + in + mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + outputs = args.outputs or [ "out" ]; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); packages = self: with self; let callPackage = self.newScope { - mkDerivation = import ./build-support/application.nix { - inherit lib; - inherit srcs; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - }; + inherit mkDerivation; + + # Team of maintainers assigned to the KDE PIM suite + 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 {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; - ark = callPackage ./ark/default.nix {}; + akonadi-notes = callPackage ./akonadi-notes.nix {}; + akonadi-search = callPackage ./akonadi-search.nix {}; + akonadiconsole = callPackage ./akonadiconsole.nix {}; + akregator = callPackage ./akregator.nix {}; + ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; + calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + eventviews = callPackage ./eventviews.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; + grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; + incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; + kaddressbook = callPackage ./kaddressbook.nix {}; + kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; - kdenlive = callPackage ./kdenlive.nix {}; - kcalc = callPackage ./kcalc.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; + kcalc = callPackage ./kcalc.nix {}; + kcalcore = callPackage ./kcalcore.nix {}; + kcalutils = callPackage ./kcalutils.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; + kdav = callPackage ./kdav.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; + kdenlive = callPackage ./kdenlive.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; + kholidays = callPackage ./kholidays.nix {}; + kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; + kimap = callPackage ./kimap.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kldap = callPackage ./kldap.nix {}; + kleopatra = callPackage ./kleopatra.nix {}; + kmail = callPackage ./kmail.nix {}; + kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; + kmailtransport = callPackage ./kmailtransport.nix {}; + kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + kontact = callPackage ./kontact.nix {}; + kontactinterface = callPackage ./kontactinterface.nix {}; + korganizer = callPackage ./korganizer.nix {}; + kpimtextedit = callPackage ./kpimtextedit.nix {}; + kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krfb = callPackage ./krfb.nix {}; + ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; + libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; + libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; + libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + libksieve = callPackage ./libksieve.nix {}; + mailcommon = callPackage ./mailcommon.nix {}; + mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; + mbox-importer = callPackage ./mbox-importer.nix {}; + messagelib = callPackage ./messagelib.nix {}; okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; + pimcommon = callPackage ./pimcommon.nix {}; + pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; + syndication = callPackage ./syndication.nix {}; l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; }); }; diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix new file mode 100644 index 000000000000..cc1e83f6581d --- /dev/null +++ b/pkgs/applications/kde/eventviews.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools, +}: + +mkDerivation { + name = "eventviews"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index ad521a2b0388..c1b2c79c849c 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 4e915422d147..aa03425f36a0 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ffmpeg kio ]; + buildInputs = [ ffmpeg kio ]; } diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix new file mode 100644 index 000000000000..5035685c64fb --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, +}: + +mkDerivation { + name = "grantleetheme"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + output = [ "out" "dev" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase + ]; + propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; +} diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch new file mode 100644 index 000000000000..76b65a444752 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -0,0 +1,166 @@ +Index: grantleetheme-17.04.0/src/grantleetheme_p.h +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleetheme_p.h ++++ grantleetheme-17.04.0/src/grantleetheme_p.h +@@ -47,7 +47,7 @@ public: + QString description; + QString name; + QString dirName; +- QString absolutePath; ++ QStringList absolutePaths; + 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) { +@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons + Grantlee::Context ctx = createContext(); + ctx.insert(QStringLiteral("error"), reason); + ctx.insert(QStringLiteral("templateName"), origTemplateName); +- const QString errorString = failedTemplate +- ? failedTemplate->errorString() +- : QStringLiteral("(null template)"); ++ const QString errorString = failedTemplate->errorString(); + ctx.insert(QStringLiteral("errorMessage"), errorString); + return tpl->render(&ctx); + } +@@ -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 ++++ grantleetheme-17.04.0/src/grantleetheme.h +@@ -50,11 +50,14 @@ public: + QStringList displayExtraVariables() const; + QString dirName() const; + QString absolutePath() const; ++ QStringList absolutePaths() const; + QString author() const; + QString authorEmail() const; + + QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +Index: grantleetheme-17.04.0/src/grantleethememanager.cpp +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp ++++ grantleetheme-17.04.0/src/grantleethememanager.cpp +@@ -142,25 +142,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<addDir(directory); +@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } diff --git a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch new file mode 100644 index 000000000000..730d5b0fe261 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch @@ -0,0 +1,25 @@ +diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp +index b86fc3a..8af72f4 100644 +--- a/src/grantleetheme.cpp ++++ b/src/grantleetheme.cpp +@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason, + Grantlee::Context ctx = createContext(); + ctx.insert(QStringLiteral("error"), reason); + ctx.insert(QStringLiteral("templateName"), origTemplateName); +- ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString()); ++ const QString errorString = failedTemplate ++ ? failedTemplate->errorString() ++ : QStringLiteral("(null template)"); ++ ctx.insert(QStringLiteral("errorMessage"), errorString); + return tpl->render(&ctx); + } + +@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con + } + + Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine); +- if (tpl->error()) { ++ if (!tpl || tpl->error()) { + return d->errorTemplate(i18n("Template parsing error"), templateName, tpl); + } + diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series new file mode 100644 index 000000000000..5c38848de713 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/series @@ -0,0 +1,2 @@ +grantleetheme_check_null.patch +grantlee-merge-theme-dirs.patch diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 233566c1bdaf..3d03d1dea3e7 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras + phonon, qtimageformats, qtsvg, qtx11extras, kinit }: mkDerivation { @@ -17,5 +17,5 @@ mkDerivation { baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon qtimageformats qtsvg qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix new file mode 100644 index 000000000000..8224b98253b6 --- /dev/null +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, + kdiagram, kldap, kmime, qtbase, +}: + +mkDerivation { + name = "incidenceeditor"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram + kldap kmime qtbase + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 79806dc93fbc..409e674e1ad8 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -5,7 +5,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info +, ffmpeg, libmusicbrainz3, normalize, sox, transcode, shared_mime_info, kinit }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { maintainers = with maintainers; [ sander phreedom ]; platforms = platforms.linux; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ]; propagatedBuildInputs = [ # qt qtwebkit @@ -28,8 +28,9 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz2 shared_mime_info + ffmpeg libmusicbrainz3 shared_mime_info ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = let k3bPath = lib.makeBinPath [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix new file mode 100644 index 000000000000..b4b0450e78bf --- /dev/null +++ b/pkgs/applications/kde/kaddressbook.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, + kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, + kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison, + qgpgme, qtbase, +}: + +mkDerivation { + name = "kaddressbook"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash + kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit + kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase + ]; +} diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix new file mode 100644 index 000000000000..f2fb6f4d8bbd --- /dev/null +++ b/pkgs/applications/kde/kalarmcal.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, + kpimtextedit, +}: + +mkDerivation { + name = "kalarmcal"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 19e01aeebe9e..91faaef623a4 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -1,8 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kio, ki18n, karchive, qttools, - perl, python, php + karchive, ki18n, kio, perl, python, php, qttools, }: mkDerivation { @@ -12,6 +11,5 @@ mkDerivation { maintainers = with lib.maintainers; [ orivej ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kio ]; - buildInputs = [ perl python php ki18n karchive qttools ]; + buildInputs = [ karchive ki18n kio perl python php qttools ]; } diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 856da42c835a..2d902c220afc 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp + gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications, + kxmlgui, }: mkDerivation { @@ -11,8 +12,7 @@ mkDerivation { maintainers = [ lib.maintainers.fridh ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ gmp ]; - propagatedBuildInputs = [ - kconfig kconfigwidgets kguiaddons kinit knotifications + buildInputs = [ + gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui ]; } diff --git a/pkgs/applications/kde/kcalcore.nix b/pkgs/applications/kde/kcalcore.nix new file mode 100644 index 000000000000..4ac9c9b925af --- /dev/null +++ b/pkgs/applications/kde/kcalcore.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kdelibs4support, libical +}: + +mkDerivation { + name = "kcalcore"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kdelibs4support libical ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix new file mode 100644 index 000000000000..3f6821e08eae --- /dev/null +++ b/pkgs/applications/kde/kcalutils.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, + kidentitymanagement, kpimtextedit, +}: + +mkDerivation { + name = "kcalutils"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support + kidentitymanagement kpimtextedit + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 186505a050c3..45b32fbe832c 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -11,6 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kwidgetsaddons kxmlgui ]; + buildInputs = [ ki18n kwidgetsaddons kxmlgui ]; } diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index 96828af9d170..12b3198a26b2 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kcoreaddons, kconfig, kcodecs, ki18n, qtbase, }: @@ -8,8 +8,9 @@ mkDerivation { name = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/applications/kde/kdav.nix new file mode 100644 index 000000000000..800c92511de2 --- /dev/null +++ b/pkgs/applications/kde/kdav.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcoreaddons, kio, qtxmlpatterns, +}: + +mkDerivation { + name = "kdav"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kio qtxmlpatterns ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index 09f761df8517..e5f5b88ec440 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -12,4 +12,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kio ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 3302681bd852..2e43e946d7ff 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kio libkexiv2 libkdcraw ]; + buildInputs = [ kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix index e3abe89eaded..31e578e228a9 100644 --- a/pkgs/applications/kde/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -42,7 +42,7 @@ mkDerivation { meta = { platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; + homepage = http://www.kde.org; license = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 62176f3f3bbd..d251eb74f274 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; + buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; } diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix new file mode 100644 index 000000000000..6189e8706db0 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, + kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, +}: + +mkDerivation { + name = "kdepim-apps-libs"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets + kcontacts ki18n kiconthemes kio libkleo pimcommon prison + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch new file mode 100644 index 000000000000..02c369cc4ee8 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch @@ -0,0 +1,62 @@ +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +@@ -50,9 +50,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); +@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee + + void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +@@ -74,9 +74,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); +@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta + + void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series new file mode 100644 index 000000000000..1e8a52b55e96 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/series @@ -0,0 +1 @@ +kdepim-apps-libs-grantlee-merge-theme-dirs.patch diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix new file mode 100644 index 000000000000..01683a6315c1 --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + shared_mime_info, + akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, + kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, + kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + qtwebengine, +}: + +mkDerivation { + name = "kdepim-runtime"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + buildInputs = [ + akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes + kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap + kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + ]; + # Attempts to build some files before dependencies have been generated + enableParallelBuilding = false; +} diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index 333fea3df53e..eef94fd5eb24 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kcmutils + kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui, }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.peterhoeg ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcmutils ]; + buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ]; } diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index ca495a1ae269..33813f376a54 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,19 +1,18 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, makeWrapper, - akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, + akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, - ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem + ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme, }: mkDerivation { name = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - buildInputs = [ gnupg1 gpgme ki18n ]; - propagatedBuildInputs = [ - akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons - kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui - kwidgetsaddons kwindowsystem + buildInputs = [ + akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash + kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice + ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme ]; postFixup = '' wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}" diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index db68cec976e3..eae151e12252 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -1,16 +1,16 @@ { mkDerivation, extra-cmake-modules, kdoctools, - grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, - kdelibs4support, khtml, kservice, xapian + grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n, + kinit, khtml, kservice, xapian }: mkDerivation { name = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n xapian ]; - propagatedBuildInputs = [ - grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons - kinit kcmutils kservice + buildInputs = [ + grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml + ki18n kinit kservice xapian ]; + patches = [ ./khelpcenter_kcoreaddons.patch ]; } diff --git a/pkgs/applications/kde/khelpcenter_kcoreaddons.patch b/pkgs/applications/kde/khelpcenter_kcoreaddons.patch new file mode 100644 index 000000000000..c5380cb48e51 --- /dev/null +++ b/pkgs/applications/kde/khelpcenter_kcoreaddons.patch @@ -0,0 +1,13 @@ +diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt +index 298a32e..b9e06c6 100644 +--- a/searchhandlers/CMakeLists.txt ++++ b/searchhandlers/CMakeLists.txt +@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES + add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES}) + kde_target_enable_exceptions(khc_xapianindexer PRIVATE) + ecm_mark_nongui_executable(khc_xapianindexer) +-target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES}) ++target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES}) + if (${KF5_VERSION} VERSION_GREATER 5.35.0) + # practically means >=5.36 + target_link_libraries(khc_xapianindexer KF5::DocTools) diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/applications/kde/kholidays.nix new file mode 100644 index 000000000000..352bec094922 --- /dev/null +++ b/pkgs/applications/kde/kholidays.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtbase, qtdeclarative, qttools, +}: + +mkDerivation { + name = "kholidays"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase qtdeclarative qttools ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix new file mode 100644 index 000000000000..92fcc2387797 --- /dev/null +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit, + ktextwidgets, kxmlgui +}: + +mkDerivation { + name = "kidentitymanagement"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui + ]; + propagatedBuildInputs = [ kcoreaddons kpimtextedit ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 34b328962090..7b8589077952 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kparts, qtsvg, qtxmlpatterns, ktexteditor, boost, - karchive, kcrash + boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg, + qtxmlpatterns, }: mkDerivation { @@ -12,9 +12,8 @@ mkDerivation { maintainers = with lib.maintainers; [ raskin ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ boost ]; - propagatedBuildInputs = [ - kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash + buildInputs = [ + boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns ]; } diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix new file mode 100644 index 000000000000..9e42c5710583 --- /dev/null +++ b/pkgs/applications/kde/kimap.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + cyrus_sasl, kcoreaddons, ki18n, kio, kmime +}: + +mkDerivation { + name = "kimap"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n kio ]; + propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 50709a7ddef7..a78da6f48ca2 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -13,7 +13,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; - propagatedBuildInputs = [ + buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kpty libmtp libssh openexr openslp phonon qtsvg samba solid diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix new file mode 100644 index 000000000000..14a8aea5e67a --- /dev/null +++ b/pkgs/applications/kde/kldap.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + cyrus_sasl, ki18n, kio, kmbox, openldap +}: + +mkDerivation { + name = "kldap"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n kio kmbox ]; + propagatedBuildInputs = [ cyrus_sasl openldap ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix new file mode 100644 index 000000000000..a19fef9c9edb --- /dev/null +++ b/pkgs/applications/kde/kleopatra.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, + knotifications, kwindowsystem, kxmlgui, libkleo +}: + +mkDerivation { + name = "kleopatra"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime + knotifications kwindowsystem kxmlgui libkleo + ]; +} diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix new file mode 100644 index 000000000000..9f3d5e2ea019 --- /dev/null +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, shared_mime_info, + akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, + kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, + kwallet, libkdepim, libkleo, pimcommon, qttools, +}: + +mkDerivation { + name = "kmail-account-wizard"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + buildInputs = [ + akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport + knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim + libkleo pimcommon qttools + ]; +} diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix new file mode 100644 index 000000000000..ec8c98927795 --- /dev/null +++ b/pkgs/applications/kde/kmail.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, + kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, + kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, + kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, + kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, + kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, + messagelib, pim-sieve-editor, qtscript, qtwebengine, +}: + +mkDerivation { + name = "kmail"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig + kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n + kiconthemes kinit kio kldap kmail-account-wizard kmailtransport + knotifications knotifyconfig kontactinterface kparts kpty kservice + ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar + libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine + ]; + propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; +} diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix new file mode 100644 index 000000000000..19ce2ba94f30 --- /dev/null +++ b/pkgs/applications/kde/kmailtransport.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, +}: + +mkDerivation { + name = "kmailtransport"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ akonadi kcmutils ki18n kio ]; + propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix new file mode 100644 index 000000000000..4b6b72a37344 --- /dev/null +++ b/pkgs/applications/kde/kmbox.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kmime, qtbase, +}: + +mkDerivation { + name = "kmbox"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kmime qtbase ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index b14e0abcc3f1..b18a3f7fdc1e 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, ki18n, kcodecs, qtbase, }: @@ -8,8 +8,9 @@ mkDerivation { name = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ki18n ]; buildInputs = [ kcodecs qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 058fd8178c4a..8010c57d9278 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -12,12 +12,9 @@ mkDerivation { maintainers = [ lib.maintainers.rongcuid ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; - propagatedBuildInputs = [ - kglobalaccel kxmlgui kcoreaddons kdelibs4support - plasma-framework - ]; - cmakeFlags = [ - "-DKMIX_KF5_BUILD=1" + buildInputs = [ + alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support + libcanberra_kde libpulseaudio plasma-framework ]; + cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ]; } diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index db4cb75cc35c..4501324a8717 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support libkexiv2 ]; + buildInputs = [ kdelibs4support libkexiv2 ]; meta = { maintainers = [ lib.maintainers.fridh ]; license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index cf2fa2e6a10f..bbaad3a02f83 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,14 +1,15 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kparts, ktexteditor, kwidgetsaddons, libkomparediff2 + kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: mkDerivation { name = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kparts ktexteditor kwidgetsaddons libkomparediff2 + buildInputs = [ + kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index bd026c6f0395..5269941fa113 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -14,10 +14,10 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ + buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support - kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty + kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix new file mode 100644 index 000000000000..4bbee9c3ffa6 --- /dev/null +++ b/pkgs/applications/kde/kontact.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, + kcmutils, kcrash, kdbusaddons, kwindowsystem, + akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, + mailcommon, +}: + +mkDerivation { + name = "kontact"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtwebengine + kcmutils kcrash kdbusaddons kwindowsystem + akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit + mailcommon + ]; +} diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix new file mode 100644 index 000000000000..f2df628f3018 --- /dev/null +++ b/pkgs/applications/kde/kontactinterface.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kiconthemes, kparts, kwindowsystem, kxmlgui +}: + +mkDerivation { + name = "kontactinterface"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kiconthemes kparts kwindowsystem kxmlgui + ]; +} diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix new file mode 100644 index 000000000000..2f37a1bac0fd --- /dev/null +++ b/pkgs/applications/kde/korganizer.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtbase, qttools, + phonon, + knewstuff, + akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search, + calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs, + kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface, + kpimtextedit, pimcommon, +}: + +mkDerivation { + name = "korganizer"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + qtbase qttools + phonon + knewstuff + akonadi-calendar akonadi-contacts akonadi-notes akonadi-search + calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs + kholidays kidentitymanagement kldap kmailtransport kontactinterface + kpimtextedit pimcommon + ]; +} diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix new file mode 100644 index 000000000000..17c960d17626 --- /dev/null +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, +}: + +mkDerivation { + name = "kpimtextedit"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin + sonnet syntax-highlighting qttools + ]; + propagatedBuildInputs = [ ktextwidgets ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix new file mode 100644 index 000000000000..2b3dc5313d9a --- /dev/null +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qtdeclarative, +}: + +mkDerivation { + name = "kqtquickcharts"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix new file mode 100644 index 000000000000..b5a3834869db --- /dev/null +++ b/pkgs/applications/kde/ktnef.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcalcore, kcalutils, kcontacts, kdelibs4support +}: + +mkDerivation { + name = "ktnef"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kcalcore kcalutils kcontacts kdelibs4support + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix new file mode 100644 index 000000000000..69a1b9e99cbb --- /dev/null +++ b/pkgs/applications/kde/libgravatar.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon +}: + +mkDerivation { + name = "libgravatar"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kconfig kio ktextwidgets kwidgetsaddons pimcommon + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 383bd3b67037..70e3cb0e1956 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ libraw ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix new file mode 100644 index 000000000000..92716e40a34f --- /dev/null +++ b/pkgs/applications/kde/libkdepim.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion, + kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets, + kldap, kwallet, +}: + +mkDerivation { + name = "libkdepim"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion + kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap + kwallet + ]; +} diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 816d4168967c..8c8d244d6f6e 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ exiv2 ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index 3a28d8c2e8c3..c70d8407fc74 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -7,5 +7,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; + buildInputs = [ kconfig ki18n kservice kxmlgui ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix new file mode 100644 index 000000000000..0958a0e605f7 --- /dev/null +++ b/pkgs/applications/kde/libkleo.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels, + kpimtextedit, kwidgetsaddons, kwindowsystem +}: + +mkDerivation { + name = "libkleo"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels + kpimtextedit kwidgetsaddons kwindowsystem + ]; + propagatedBuildInputs = [ qgpgme ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix new file mode 100644 index 000000000000..dd33f759c313 --- /dev/null +++ b/pkgs/applications/kde/libksieve.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio, + kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon, + qtwebengine, syntax-highlighting, +}: + +mkDerivation { + name = "libksieve"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcompletion kiconthemes kidentitymanagement kio + kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon + qtwebengine + ]; + propagatedBuildInputs = [ syntax-highlighting ]; +} diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix new file mode 100644 index 000000000000..ee958d701b34 --- /dev/null +++ b/pkgs/applications/kde/mailcommon.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets, + kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap, + kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, +}: + +mkDerivation { + name = "mailcommon"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons + kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport + kwindowsystem mailimporter messagelib phonon + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix new file mode 100644 index 000000000000..f002ff0f3403 --- /dev/null +++ b/pkgs/applications/kde/mailimporter.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n, + kmime, kxmlgui, libkdepim +}: + +mkDerivation { + name = "mailimporter"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime + kxmlgui libkdepim + ]; +} diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix new file mode 100644 index 000000000000..aa637d440bd9 --- /dev/null +++ b/pkgs/applications/kde/mbox-importer.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "mbox-importer"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib + ]; + preHook = '' + set -x + ''; +} diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix new file mode 100644 index 000000000000..f12158a1f71e --- /dev/null +++ b/pkgs/applications/kde/messagelib.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, + grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, + kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, + kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, + pimcommon, qtwebengine, qtwebkit, syntax-highlighting +}: + +mkDerivation { + name = "messagelib"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs + kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap + kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit + syntax-highlighting + ]; + propagatedBuildInputs = [ + akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon + qtwebengine + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 1d44bb27fa3e..422968be35a5 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - qtscript, kconfig, kinit, karchive, + qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, shared_mime_info }: @@ -16,6 +16,6 @@ mkDerivation { buildInputs = [ shared_mime_info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 - karchive + karchive kcrash ]; } diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 99b69f45e1eb..64511aabf7c0 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -18,7 +18,7 @@ mkDerivation { ]; meta = { platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; + homepage = http://www.kde.org; license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix new file mode 100644 index 000000000000..c83df2e0e498 --- /dev/null +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit, + kmailtransport, pimcommon, libksieve +}: + +mkDerivation { + name = "pim-sieve-editor"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport + pimcommon libksieve + ]; +} diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix new file mode 100644 index 000000000000..02e9a47274b4 --- /dev/null +++ b/pkgs/applications/kde/pimcommon.nix @@ -0,0 +1,26 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, + kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin, + kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, + kwallet, kwindowsystem, libkdepim, qtwebengine +}: + +mkDerivation { + name = "pimcommon"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit + kwallet kwindowsystem libkdepim qtwebengine + ]; + propagatedBuildInputs = [ + akonadi akonadi-contacts kconfig kcontacts kimap + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index db1bf2aee659..6deec6aaabb4 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -11,10 +11,9 @@ mkDerivation { name = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n xcb-util-cursor ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications - kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras + buildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 66498b0d2804..ad7a73588b0a 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,2235 @@ { akonadi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz"; - sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d"; - name = "akonadi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-17.08.0.tar.xz"; + sha256 = "00mj3gvlv1cgb7dxzjym87404laxsk7insykbb12zj4wlhzakznp"; + name = "akonadi-17.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz"; - sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd"; - name = "akonadi-calendar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-17.08.0.tar.xz"; + sha256 = "0mv41pkn24rdbg5xyz7vxaihma02qry3sladgpffg27yw56xp5x4"; + name = "akonadi-calendar-17.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz"; - sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj"; - name = "akonadi-calendar-tools-17.04.2.tar.xz"; - }; - }; - akonadiconsole = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz"; - sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz"; - name = "akonadiconsole-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-tools-17.08.0.tar.xz"; + sha256 = "1vzmdgbn6hjjv74837s18kfif7s2gak5jbag2l1kqdj9lgwi4lv0"; + name = "akonadi-calendar-tools-17.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz"; - sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz"; - name = "akonadi-contacts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-contacts-17.08.0.tar.xz"; + sha256 = "0j49zf83bfzrxygdg98cijjjva96niv24312ng7f8hckm369zc91"; + name = "akonadi-contacts-17.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz"; - sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa"; - name = "akonadi-import-wizard-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-import-wizard-17.08.0.tar.xz"; + sha256 = "0hhi8l94fariz6q2zazxsqnm08scfqsc3sm8azklj24gbz59qzzf"; + name = "akonadi-import-wizard-17.08.0.tar.xz"; }; }; akonadi-mime = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz"; - sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld"; - name = "akonadi-mime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-mime-17.08.0.tar.xz"; + sha256 = "0lg0rqikgdbdvh44p52m7acw6ni5wi1rsgx93wn1nki4rhnsgndp"; + name = "akonadi-mime-17.08.0.tar.xz"; }; }; akonadi-notes = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz"; - sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg"; - name = "akonadi-notes-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-notes-17.08.0.tar.xz"; + sha256 = "1d17403bhbh7nk73vcq86dilfancb31fdz2al6pr7xrkxm5nql0v"; + name = "akonadi-notes-17.08.0.tar.xz"; }; }; akonadi-search = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz"; - sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh"; - name = "akonadi-search-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akonadi-search-17.08.0.tar.xz"; + sha256 = "1i6v4mvm2g0v4kzbs6rla9gf16lswg4xghsam9k1cpqpakkaqf84"; + name = "akonadi-search-17.08.0.tar.xz"; + }; + }; + akonadiconsole = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/akonadiconsole-17.08.0.tar.xz"; + sha256 = "0a0gvw6xn4wcl5hzxnv4170n1yq0ycmfs6nyff4x8fcj0ffl6rqv"; + name = "akonadiconsole-17.08.0.tar.xz"; }; }; akregator = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz"; - sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy"; - name = "akregator-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/akregator-17.08.0.tar.xz"; + sha256 = "16ss44md7vnz6nclhza7ygvfaqr8dpd2lq1cz4szm0qwwiciwxkc"; + name = "akregator-17.08.0.tar.xz"; }; }; analitza = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz"; - sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp"; - name = "analitza-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/analitza-17.08.0.tar.xz"; + sha256 = "1qmh4xc912bw5m07pnqdp6pmjiba6mirlwhgbl6wqvzi97cjrsxq"; + name = "analitza-17.08.0.tar.xz"; }; }; ark = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz"; - sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx"; - name = "ark-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ark-17.08.0.tar.xz"; + sha256 = "1d3p4y1bchnqza2xxmd7z3ys66373mgvdr8xa5z2n2pq55qnvrx1"; + name = "ark-17.08.0.tar.xz"; }; }; artikulate = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz"; - sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2"; - name = "artikulate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/artikulate-17.08.0.tar.xz"; + sha256 = "0gybg5aw8gbrmfg46985p2xmdz624vjc6rkkh2f2dvrijx9z82sf"; + name = "artikulate-17.08.0.tar.xz"; }; }; audiocd-kio = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz"; - sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi"; - name = "audiocd-kio-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/audiocd-kio-17.08.0.tar.xz"; + sha256 = "05h1rp7f3jqx9jzn3x48sdd0ycb0ksflyy8ncy9bb72ky3j3f986"; + name = "audiocd-kio-17.08.0.tar.xz"; }; }; baloo-widgets = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz"; - sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9"; - name = "baloo-widgets-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/baloo-widgets-17.08.0.tar.xz"; + sha256 = "0z5lpmca6w691ckyhhr99ky0fjli7sk8riarhrr65hk6zyf3djmx"; + name = "baloo-widgets-17.08.0.tar.xz"; }; }; blinken = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz"; - sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia"; - name = "blinken-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/blinken-17.08.0.tar.xz"; + sha256 = "0p2yx91sggn908i24lqjkd5lw5djidwdfybf6dvdz916bv2ypf90"; + name = "blinken-17.08.0.tar.xz"; }; }; blogilo = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz"; - sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric"; - name = "blogilo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/blogilo-17.08.0.tar.xz"; + sha256 = "1dabq57krzjkrs5xpgarisik66n0cvk097y9szxbmw1ghmw871cf"; + name = "blogilo-17.08.0.tar.xz"; }; }; bomber = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz"; - sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3"; - name = "bomber-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/bomber-17.08.0.tar.xz"; + sha256 = "0ydg1is0ayscj275177ivkzqdhc1mkqwbjfq5wdwiqdmh4p2dgzh"; + name = "bomber-17.08.0.tar.xz"; }; }; bovo = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz"; - sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77"; - name = "bovo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/bovo-17.08.0.tar.xz"; + sha256 = "1fl7cq27y3n0nzabh7xxwdipczww7pcck8nk2vrxzpnnwyzc4hjn"; + name = "bovo-17.08.0.tar.xz"; }; }; calendarsupport = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz"; - sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk"; - name = "calendarsupport-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/calendarsupport-17.08.0.tar.xz"; + sha256 = "01fw1ddd6xhv84557214ilj088cdczv26whl6q4wm7c4wyicrrxs"; + name = "calendarsupport-17.08.0.tar.xz"; }; }; cantor = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz"; - sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i"; - name = "cantor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/cantor-17.08.0.tar.xz"; + sha256 = "0mv7qx5zam6mcri3j3jqci70bxxzrf3f7vdpmsmwcm2w0isv02x0"; + name = "cantor-17.08.0.tar.xz"; }; }; cervisia = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz"; - sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg"; - name = "cervisia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/cervisia-17.08.0.tar.xz"; + sha256 = "0pz6qqq5nayw68z30gf0bxjm8lz0hn2cswvdyc0b505p2gkq1ika"; + name = "cervisia-17.08.0.tar.xz"; }; }; dolphin = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz"; - sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25"; - name = "dolphin-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/dolphin-17.08.0.tar.xz"; + sha256 = "1fxga83magv47jpmrbcyyxblxyws0n6mp8vjv8pa5jzwywsxg09r"; + name = "dolphin-17.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz"; - sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s"; - name = "dolphin-plugins-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/dolphin-plugins-17.08.0.tar.xz"; + sha256 = "1vb0flj4151d1h4x7rgfn79hcqk1pal9hxdi5wmkzjy3aj702gcc"; + name = "dolphin-plugins-17.08.0.tar.xz"; }; }; dragon = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz"; - sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry"; - name = "dragon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/dragon-17.08.0.tar.xz"; + sha256 = "0h9ysyjpcj8hlsbp622dzpzjvilad1qrjflhmx71gaan2dyq0jd0"; + name = "dragon-17.08.0.tar.xz"; }; }; eventviews = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz"; - sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6"; - name = "eventviews-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/eventviews-17.08.0.tar.xz"; + sha256 = "166jsnyv3xwhli931xwh18cy6alkj7w2lc3bqzkch0bc4gd2w8ba"; + name = "eventviews-17.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz"; - sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3"; - name = "ffmpegthumbs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ffmpegthumbs-17.08.0.tar.xz"; + sha256 = "1771abzrfifvw2c34vl1j0xl5j9lv9q2cwfyan3bzviwyyca0gka"; + name = "ffmpegthumbs-17.08.0.tar.xz"; }; }; filelight = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz"; - sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0"; - name = "filelight-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/filelight-17.08.0.tar.xz"; + sha256 = "1y6b705q04hjzdyy3k3dps9rgvaqlvy232f3m0qg1j9kjy0hs7kb"; + name = "filelight-17.08.0.tar.xz"; }; }; granatier = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz"; - sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z"; - name = "granatier-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/granatier-17.08.0.tar.xz"; + sha256 = "1i55hqgn69c1y03wwnm360bmw3v0nsn5wi1nd4p5na4vxcr7ly03"; + name = "granatier-17.08.0.tar.xz"; }; }; grantlee-editor = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz"; - sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b"; - name = "grantlee-editor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/grantlee-editor-17.08.0.tar.xz"; + sha256 = "1kvkbjicfnl8r13gzlb85d4c4allz6257285rmm3anhp12k84z31"; + name = "grantlee-editor-17.08.0.tar.xz"; }; }; grantleetheme = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz"; - sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5"; - name = "grantleetheme-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/grantleetheme-17.08.0.tar.xz"; + sha256 = "04q29qvibxzxi9s9jldjvnx8x7x76ybcy7964im303zhcf3djmm5"; + name = "grantleetheme-17.08.0.tar.xz"; }; }; gwenview = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz"; - sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra"; - name = "gwenview-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/gwenview-17.08.0.tar.xz"; + sha256 = "1xqma79v0sd48fsslblqaw5rbz80p2qi9rmwgv4adr1cd4n69f5i"; + name = "gwenview-17.08.0.tar.xz"; }; }; incidenceeditor = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz"; - sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784"; - name = "incidenceeditor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/incidenceeditor-17.08.0.tar.xz"; + sha256 = "0pl9qza8bmbr6f29iaq9afhr89nkap8yzf36qn0i0fvc2x1940wk"; + name = "incidenceeditor-17.08.0.tar.xz"; }; }; jovie = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz"; - sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg"; - name = "jovie-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/jovie-17.08.0.tar.xz"; + sha256 = "1q8l5xm93x2kacz8ay2ra6jg0q24r22y8lxfpqzb8l8sz7gy81qa"; + name = "jovie-17.08.0.tar.xz"; }; }; juk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz"; - sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll"; - name = "juk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/juk-17.08.0.tar.xz"; + sha256 = "0dzhn7x4r32smfil8v5afrl4d3xlx0c23f21rbj8gnnbiz3033iw"; + name = "juk-17.08.0.tar.xz"; }; }; k3b = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz"; - sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8"; - name = "k3b-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/k3b-17.08.0.tar.xz"; + sha256 = "1n0jvvd414mmfpljj1ja2ik7hcf3ih6i5ghcsq6irq6ijxibrkdd"; + name = "k3b-17.08.0.tar.xz"; }; }; kaccessible = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz"; - sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff"; - name = "kaccessible-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kaccessible-17.08.0.tar.xz"; + sha256 = "0xnlirxm5bp7wbvalml4z9l7yrnkxi7966dxb2a6n140xbnzy3f5"; + name = "kaccessible-17.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz"; - sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj"; - name = "kaccounts-integration-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kaccounts-integration-17.08.0.tar.xz"; + sha256 = "181324pacp8nvnzyivwr657qi4jsbi5c1hv7yi5m9z0lw0b0h515"; + name = "kaccounts-integration-17.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz"; - sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj"; - name = "kaccounts-providers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kaccounts-providers-17.08.0.tar.xz"; + sha256 = "1428vak366hkx54shpymsg6xk1f92hkz2hgbipim5rddgjqpa9w4"; + name = "kaccounts-providers-17.08.0.tar.xz"; }; }; kaddressbook = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz"; - sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6"; - name = "kaddressbook-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kaddressbook-17.08.0.tar.xz"; + sha256 = "1m6k5gadrq5l6grw9y677360lxxcvz4axhr0rkpamvf0vy92iy8w"; + name = "kaddressbook-17.08.0.tar.xz"; }; }; kajongg = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz"; - sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig"; - name = "kajongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kajongg-17.08.0.tar.xz"; + sha256 = "0nf1p3gm9mq4szq49wmc39hjk52v4x5x7fn35sgmfi0dprz9i8y1"; + name = "kajongg-17.08.0.tar.xz"; }; }; kalarm = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz"; - sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w"; - name = "kalarm-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kalarm-17.08.0.tar.xz"; + sha256 = "1680i011p15pra6cb95icz788v7qivc3l8d9fngw9hg03i33y118"; + name = "kalarm-17.08.0.tar.xz"; }; }; kalarmcal = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz"; - sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk"; - name = "kalarmcal-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kalarmcal-17.08.0.tar.xz"; + sha256 = "0wwb2xx6avjaqkfsf2jnxbk31i4dss3j1gp1rjb608slq8kpwyy0"; + name = "kalarmcal-17.08.0.tar.xz"; }; }; kalgebra = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz"; - sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f"; - name = "kalgebra-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kalgebra-17.08.0.tar.xz"; + sha256 = "1i8b9cv1qv8vhfbx0qa3ka08qgyyp6h474v9x504ypsx8124f8g4"; + name = "kalgebra-17.08.0.tar.xz"; }; }; kalzium = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz"; - sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06"; - name = "kalzium-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kalzium-17.08.0.tar.xz"; + sha256 = "01xvnczj6dhjx37f2i1dil31zc5bff25p3i0mk01dgnvzcq7cflf"; + name = "kalzium-17.08.0.tar.xz"; }; }; kamera = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz"; - sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6"; - name = "kamera-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kamera-17.08.0.tar.xz"; + sha256 = "14krfdwraffbhsqhmi0h91mmpxx4952vbmilbp6955psz7cn8xyi"; + name = "kamera-17.08.0.tar.xz"; }; }; kanagram = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz"; - sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk"; - name = "kanagram-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kanagram-17.08.0.tar.xz"; + sha256 = "1szksc9w22dzkwhsgpbd5xrrg1iwn13wdcdhhc5g2mcx1xgwksr0"; + name = "kanagram-17.08.0.tar.xz"; }; }; kapman = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz"; - sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry"; - name = "kapman-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kapman-17.08.0.tar.xz"; + sha256 = "042lczwbcb7nrbw2wx486mg9qmlx1kcxjdwab10gmy0hvx83p0m3"; + name = "kapman-17.08.0.tar.xz"; }; }; kapptemplate = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz"; - sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj"; - name = "kapptemplate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kapptemplate-17.08.0.tar.xz"; + sha256 = "1i2w06fb6i0b5yhawms9a0qmis1kz8hyyg8hhnfwcsb0frp4sp7s"; + name = "kapptemplate-17.08.0.tar.xz"; }; }; kate = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz"; - sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h"; - name = "kate-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kate-17.08.0.tar.xz"; + sha256 = "0zb6w346y5lz4bfvgvnkr9x1vkv6nblc2lrdx103jwbjwb3kjnpj"; + name = "kate-17.08.0.tar.xz"; }; }; katomic = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz"; - sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j"; - name = "katomic-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/katomic-17.08.0.tar.xz"; + sha256 = "0csnag857syf1966b8r1z8xhrcddy1r4qnk0lxgf326w1z33lyl3"; + name = "katomic-17.08.0.tar.xz"; }; }; kblackbox = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz"; - sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z"; - name = "kblackbox-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kblackbox-17.08.0.tar.xz"; + sha256 = "10n6an0m5q11i8jlg1v3fz5ib8mhwifalhkj3syda4wjnc6i98g0"; + name = "kblackbox-17.08.0.tar.xz"; }; }; kblocks = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz"; - sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298"; - name = "kblocks-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kblocks-17.08.0.tar.xz"; + sha256 = "0ahc5pyrhfx49pyyj5i7kp7jj5y9dkxd12xbrmv3hyqips1q83ds"; + name = "kblocks-17.08.0.tar.xz"; }; }; kblog = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz"; - sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9"; - name = "kblog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kblog-17.08.0.tar.xz"; + sha256 = "0hspjg73yjqsxykc2spsva4bc33bn0rxbdjn33fhzyz31n2cv6km"; + name = "kblog-17.08.0.tar.xz"; }; }; kbounce = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz"; - sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j"; - name = "kbounce-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kbounce-17.08.0.tar.xz"; + sha256 = "0269mfnzkvf25j60hj1mpg1wsjd2a90llcqxfzc9bi3kfvg9k11f"; + name = "kbounce-17.08.0.tar.xz"; }; }; kbreakout = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz"; - sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b"; - name = "kbreakout-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kbreakout-17.08.0.tar.xz"; + sha256 = "1vcknsahyaya6mk81mzbv56924k55yzhkfiv389bwj8gfg0983a0"; + name = "kbreakout-17.08.0.tar.xz"; }; }; kbruch = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz"; - sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby"; - name = "kbruch-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kbruch-17.08.0.tar.xz"; + sha256 = "0gdz4ayk7bpc3w0pw8a4k742hxp7qh6a0j5b21qfhjzlhbpb4y4r"; + name = "kbruch-17.08.0.tar.xz"; }; }; kcachegrind = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz"; - sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv"; - name = "kcachegrind-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcachegrind-17.08.0.tar.xz"; + sha256 = "0n0sj9vpawjanj92jkbkvb4njr6qy3v5j2npglg2skv1brqhn55h"; + name = "kcachegrind-17.08.0.tar.xz"; }; }; kcalc = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz"; - sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84"; - name = "kcalc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcalc-17.08.0.tar.xz"; + sha256 = "03xiwv8c86p3s640a35021z5varqkfrgpkrlc5gyxd2nnjldy9ky"; + name = "kcalc-17.08.0.tar.xz"; }; }; kcalcore = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz"; - sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn"; - name = "kcalcore-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcalcore-17.08.0.tar.xz"; + sha256 = "1vpyzbv6lv29ihzwrwd0nsb9vmy6iswka244fixa278218g2lfix"; + name = "kcalcore-17.08.0.tar.xz"; }; }; kcalutils = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz"; - sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp"; - name = "kcalutils-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcalutils-17.08.0.tar.xz"; + sha256 = "1s90arpxjnbzikpy1j1rcbvljcjgq5pgvmsr852r8qgw7s9dkpmh"; + name = "kcalutils-17.08.0.tar.xz"; }; }; kcharselect = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz"; - sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn"; - name = "kcharselect-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcharselect-17.08.0.tar.xz"; + sha256 = "16hgzm3v84xkq4s68cpz73b4vgw1sarlgab0f2qkacvggpa0gkb6"; + name = "kcharselect-17.08.0.tar.xz"; }; }; kcolorchooser = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz"; - sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn"; - name = "kcolorchooser-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcolorchooser-17.08.0.tar.xz"; + sha256 = "177v2wi0dwzydbi1xwqq34s38rlgqifirm6r4frbxzbxzi1bpvw0"; + name = "kcolorchooser-17.08.0.tar.xz"; }; }; kcontacts = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz"; - sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s"; - name = "kcontacts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcontacts-17.08.0.tar.xz"; + sha256 = "0852x0nindb8daczdhyiqahyqq0r60gmpyhsymccpz8jzirxlbfv"; + name = "kcontacts-17.08.0.tar.xz"; }; }; kcron = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz"; - sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx"; - name = "kcron-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kcron-17.08.0.tar.xz"; + sha256 = "0fmzikk0zyhf41k7mxwyzlxr67jg3ffjj0jilskzdq6ffsnc7m08"; + name = "kcron-17.08.0.tar.xz"; }; }; kdav = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz"; - sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w"; - name = "kdav-17.04.2.tar.xz"; - }; - }; - kdebugsettings = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz"; - sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh"; - name = "kdebugsettings-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdav-17.08.0.tar.xz"; + sha256 = "066hhcf8n6wnm4f76f24xq9hy0x9771kvbmappaicwnlza71v0i1"; + name = "kdav-17.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz"; - sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31"; - name = "kde-dev-scripts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-dev-scripts-17.08.0.tar.xz"; + sha256 = "1skvgaj54a9apvwbjwpzvqyk1cqg3mf8p0h2fyp0k1i1f3ig8qrb"; + name = "kde-dev-scripts-17.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz"; - sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7"; - name = "kde-dev-utils-17.04.2.tar.xz"; - }; - }; - kdeedu-data = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz"; - sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np"; - name = "kdeedu-data-17.04.2.tar.xz"; - }; - }; - kdegraphics-mobipocket = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz"; - sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6"; - name = "kdegraphics-mobipocket-17.04.2.tar.xz"; - }; - }; - kdegraphics-thumbnailers = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz"; - sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp"; - name = "kdegraphics-thumbnailers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-dev-utils-17.08.0.tar.xz"; + sha256 = "00xz7n5bjss2im106n7r8zncan9v1mxmlfl27if1wff0nflbnfcm"; + name = "kde-dev-utils-17.08.0.tar.xz"; }; }; kde-l10n-ar = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz"; - sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198"; - name = "kde-l10n-ar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ar-17.08.0.tar.xz"; + sha256 = "0jp0zcc8m0zmi342y8656z6gw93drnripfj0qbkblqj7fmqbgjf4"; + name = "kde-l10n-ar-17.08.0.tar.xz"; }; }; kde-l10n-ast = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz"; - sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk"; - name = "kde-l10n-ast-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ast-17.08.0.tar.xz"; + sha256 = "03pzn3pa39350njjww36mk6l809bnx332v1y0hic0rrpbnscmbfk"; + name = "kde-l10n-ast-17.08.0.tar.xz"; }; }; kde-l10n-bg = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz"; - sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4"; - name = "kde-l10n-bg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bg-17.08.0.tar.xz"; + sha256 = "15a14mwyi29pc66mx02axsham6mgqw7bmd54rinhafhwcdsdyhia"; + name = "kde-l10n-bg-17.08.0.tar.xz"; }; }; kde-l10n-bs = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz"; - sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7"; - name = "kde-l10n-bs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bs-17.08.0.tar.xz"; + sha256 = "17irsp0zdk66k66rg2an3bdx38y8d64zijh4fm7kr0nx3vm1gzxp"; + name = "kde-l10n-bs-17.08.0.tar.xz"; }; }; kde-l10n-ca = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz"; - sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv"; - name = "kde-l10n-ca-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca-17.08.0.tar.xz"; + sha256 = "0yhr0yrxxbzkp2aby7kfkscf4rrk12myhqqvcy4v1acqywqn3zrs"; + name = "kde-l10n-ca-17.08.0.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-17.04.2"; + version = "ca_valencia-17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz"; - sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f"; - name = "kde-l10n-ca_valencia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca@valencia-17.08.0.tar.xz"; + sha256 = "0khslngsws4z0frc93w0yj3lgi9164j94pknwzhiq6h39bdy5jha"; + name = "kde-l10n-ca_valencia-17.08.0.tar.xz"; }; }; kde-l10n-cs = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz"; - sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj"; - name = "kde-l10n-cs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-cs-17.08.0.tar.xz"; + sha256 = "0ia1lysymd87z1a7hcg95v30q8gwlx1f2m5brkh1s1fdkl4hf7zc"; + name = "kde-l10n-cs-17.08.0.tar.xz"; }; }; kde-l10n-da = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz"; - sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah"; - name = "kde-l10n-da-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-da-17.08.0.tar.xz"; + sha256 = "1fzmzhnsp6jfiahga685dnn8li24lhyq0pdvpbmx2fsq8izg449s"; + name = "kde-l10n-da-17.08.0.tar.xz"; }; }; kde-l10n-de = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz"; - sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb"; - name = "kde-l10n-de-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-de-17.08.0.tar.xz"; + sha256 = "1zaypk1y6bmpbrymds5iiq0gcc1fcja61fpm9iqc76s3x22walw3"; + name = "kde-l10n-de-17.08.0.tar.xz"; }; }; kde-l10n-el = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz"; - sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic"; - name = "kde-l10n-el-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-el-17.08.0.tar.xz"; + sha256 = "0440flgz1sfs8b8qrvzn2gh14z25pivvxgcv2kgsgb6lq9b98bhg"; + name = "kde-l10n-el-17.08.0.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-17.04.2"; + version = "en_GB-17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz"; - sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41"; - name = "kde-l10n-en_GB-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-en_GB-17.08.0.tar.xz"; + sha256 = "1w11hbr3sdrr724qvfh15ppyg0r4003110v876xqy2f2d5z2v9mq"; + name = "kde-l10n-en_GB-17.08.0.tar.xz"; }; }; kde-l10n-eo = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz"; - sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl"; - name = "kde-l10n-eo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eo-17.08.0.tar.xz"; + sha256 = "0w034zx2qmwimq5p8gr0dgh1d51bhwnqc1db9jszr0hv891fji8v"; + name = "kde-l10n-eo-17.08.0.tar.xz"; }; }; kde-l10n-es = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz"; - sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44"; - name = "kde-l10n-es-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-es-17.08.0.tar.xz"; + sha256 = "1428jqjqmxh1fql39af52f0g8ha7jlnmkpkb45x9k95cfbm0hccn"; + name = "kde-l10n-es-17.08.0.tar.xz"; }; }; kde-l10n-et = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz"; - sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4"; - name = "kde-l10n-et-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-et-17.08.0.tar.xz"; + sha256 = "0iqs6636jfxyhdiifx9nzxg1z7z4rb9parj93njhb6x34kpa6b4v"; + name = "kde-l10n-et-17.08.0.tar.xz"; }; }; kde-l10n-eu = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz"; - sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc"; - name = "kde-l10n-eu-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eu-17.08.0.tar.xz"; + sha256 = "1x3r1m0yivvasv7832v2my2nn8kgdfp8326dmjz1fcgs7cnnv4ab"; + name = "kde-l10n-eu-17.08.0.tar.xz"; }; }; kde-l10n-fa = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz"; - sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b"; - name = "kde-l10n-fa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fa-17.08.0.tar.xz"; + sha256 = "1kaibymfrpa5c6pmq3rkxnnl532s19bg60nzq0iirn3n0kgplwy2"; + name = "kde-l10n-fa-17.08.0.tar.xz"; }; }; kde-l10n-fi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz"; - sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b"; - name = "kde-l10n-fi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fi-17.08.0.tar.xz"; + sha256 = "0yml2hpg0b48rknik9kfhdgn6znwjqxg43gaglglm79d68a7xdng"; + name = "kde-l10n-fi-17.08.0.tar.xz"; }; }; kde-l10n-fr = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz"; - sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh"; - name = "kde-l10n-fr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fr-17.08.0.tar.xz"; + sha256 = "1r97zi8p1jha99r5k2qljrypmyzdrmpz0r60bv1b7nhx7m6ix503"; + name = "kde-l10n-fr-17.08.0.tar.xz"; }; }; kde-l10n-ga = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz"; - sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys"; - name = "kde-l10n-ga-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ga-17.08.0.tar.xz"; + sha256 = "1y43njj4k79mzcvhg8ycr7641js698kda762jffdzfl2navx2f7r"; + name = "kde-l10n-ga-17.08.0.tar.xz"; }; }; kde-l10n-gl = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz"; - sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch"; - name = "kde-l10n-gl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-gl-17.08.0.tar.xz"; + sha256 = "053x6v84bpa8cnl6v95kfks7b914b9jy1wd41lyxd9a8z5nh04yp"; + name = "kde-l10n-gl-17.08.0.tar.xz"; }; }; kde-l10n-he = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz"; - sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25"; - name = "kde-l10n-he-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-he-17.08.0.tar.xz"; + sha256 = "08fq8v7af2j2iqnwja3pznklizxib7v4zs22i359iql05iayd0wy"; + name = "kde-l10n-he-17.08.0.tar.xz"; }; }; kde-l10n-hi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz"; - sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf"; - name = "kde-l10n-hi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hi-17.08.0.tar.xz"; + sha256 = "0zizfvwiwix937iczh186w42ydsvyp3h4pyk2r05ds4hbz6jw4yd"; + name = "kde-l10n-hi-17.08.0.tar.xz"; }; }; kde-l10n-hr = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz"; - sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji"; - name = "kde-l10n-hr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hr-17.08.0.tar.xz"; + sha256 = "18fdby0dpgymrya63cks23k5nq4ni9n7nymvx65z7bn8h7r8cbmc"; + name = "kde-l10n-hr-17.08.0.tar.xz"; }; }; kde-l10n-hu = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz"; - sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s"; - name = "kde-l10n-hu-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hu-17.08.0.tar.xz"; + sha256 = "1gcqmf4vbmwah8yi78inb9miirs13r80wjfif5c8vblhvdmlbrc1"; + name = "kde-l10n-hu-17.08.0.tar.xz"; }; }; kde-l10n-ia = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz"; - sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p"; - name = "kde-l10n-ia-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ia-17.08.0.tar.xz"; + sha256 = "11ljcxwsq09885rdd3kszfchjdi4g3359b88rfsq4dn11bnmm50s"; + name = "kde-l10n-ia-17.08.0.tar.xz"; }; }; kde-l10n-id = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz"; - sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c"; - name = "kde-l10n-id-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-id-17.08.0.tar.xz"; + sha256 = "005563k8bdqzyhm3l231vlc96iwc4sg9f0932y9w1nmlxkh0n02f"; + name = "kde-l10n-id-17.08.0.tar.xz"; }; }; kde-l10n-is = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz"; - sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq"; - name = "kde-l10n-is-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-is-17.08.0.tar.xz"; + sha256 = "143zja0j77lgmkb34lycrdzkpsffzljmlmmiaisjpb1bj664sk9d"; + name = "kde-l10n-is-17.08.0.tar.xz"; }; }; kde-l10n-it = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz"; - sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k"; - name = "kde-l10n-it-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-it-17.08.0.tar.xz"; + sha256 = "0ppd16w8zdpslz8p6yrhw4dl7pm0i3a6wpin3kvqxaxd87vxzzvb"; + name = "kde-l10n-it-17.08.0.tar.xz"; }; }; kde-l10n-ja = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz"; - sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy"; - name = "kde-l10n-ja-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ja-17.08.0.tar.xz"; + sha256 = "0qq88f5gm3ifw1l5m2xq8x6ajqj6ngfpydbrz5ry62nz8mi0w1i0"; + name = "kde-l10n-ja-17.08.0.tar.xz"; }; }; kde-l10n-kk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz"; - sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5"; - name = "kde-l10n-kk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-kk-17.08.0.tar.xz"; + sha256 = "0w953g4hvhisawb3423c9dd1vin8zxk3643ilkrf3mlkx972ib5m"; + name = "kde-l10n-kk-17.08.0.tar.xz"; }; }; kde-l10n-km = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz"; - sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9"; - name = "kde-l10n-km-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-km-17.08.0.tar.xz"; + sha256 = "1xhmmnxsd0lcr68zz5x68cs4gxxlxm71p30zj3cm188dq756c9a9"; + name = "kde-l10n-km-17.08.0.tar.xz"; }; }; kde-l10n-ko = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz"; - sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a"; - name = "kde-l10n-ko-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ko-17.08.0.tar.xz"; + sha256 = "1c6arfbp06kmapxp8ass37sb250pbsvfhwjqn57yaya0hvf3my82"; + name = "kde-l10n-ko-17.08.0.tar.xz"; }; }; kde-l10n-lt = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz"; - sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w"; - name = "kde-l10n-lt-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lt-17.08.0.tar.xz"; + sha256 = "09cidww52igwav358a1f1gm7djcrpnl7d3wc11w2v7hn76cabjmx"; + name = "kde-l10n-lt-17.08.0.tar.xz"; }; }; kde-l10n-lv = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz"; - sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515"; - name = "kde-l10n-lv-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lv-17.08.0.tar.xz"; + sha256 = "148sfbalalp3calzgl4kga1bcj1sqgkwdgx07bsqza9q142z5xjs"; + name = "kde-l10n-lv-17.08.0.tar.xz"; }; }; kde-l10n-mr = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz"; - sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni"; - name = "kde-l10n-mr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-mr-17.08.0.tar.xz"; + sha256 = "1m8la1a1fyfm5k732hnm3ybxqmah7mdf6f3nhxisr3c2h3gxqysk"; + name = "kde-l10n-mr-17.08.0.tar.xz"; }; }; kde-l10n-nb = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz"; - sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni"; - name = "kde-l10n-nb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nb-17.08.0.tar.xz"; + sha256 = "13r7dzwbr1qggwbh4lbb45xy7qck04waxjsaj66d5zv7gw9hc2gp"; + name = "kde-l10n-nb-17.08.0.tar.xz"; }; }; kde-l10n-nds = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz"; - sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4"; - name = "kde-l10n-nds-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nds-17.08.0.tar.xz"; + sha256 = "19mrs2l6z6ypr1h4ppw0v588hj46nngzanlq5rcznimf9v1b4jwr"; + name = "kde-l10n-nds-17.08.0.tar.xz"; }; }; kde-l10n-nl = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz"; - sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx"; - name = "kde-l10n-nl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nl-17.08.0.tar.xz"; + sha256 = "1lvqjgjk2qfbvlkjyp0pkdp015dcxmc4db0zy077fy1vbrcclj54"; + name = "kde-l10n-nl-17.08.0.tar.xz"; }; }; kde-l10n-nn = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz"; - sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3"; - name = "kde-l10n-nn-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nn-17.08.0.tar.xz"; + sha256 = "1vk504hjrai30rbr7v9fkyf8yj4ms33ck7c32xk5jxq0avd3yyj7"; + name = "kde-l10n-nn-17.08.0.tar.xz"; }; }; kde-l10n-pa = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz"; - sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa"; - name = "kde-l10n-pa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pa-17.08.0.tar.xz"; + sha256 = "0vh52aqbd66mrb492d2h8gihbs6wql6q0yjvk0ixhhi2b9cykzi0"; + name = "kde-l10n-pa-17.08.0.tar.xz"; }; }; kde-l10n-pl = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz"; - sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n"; - name = "kde-l10n-pl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pl-17.08.0.tar.xz"; + sha256 = "1mfjjvm41cd4z1bvnrhpjbwcp2czw70mp3p3snyb7397d2c786f1"; + name = "kde-l10n-pl-17.08.0.tar.xz"; }; }; kde-l10n-pt = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz"; - sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi"; - name = "kde-l10n-pt-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt-17.08.0.tar.xz"; + sha256 = "1z44l4qa8ks9r7bwa7dgp43nlcymkdkz31jl7qvgy8c8lil8a6vy"; + name = "kde-l10n-pt-17.08.0.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-17.04.2"; + version = "pt_BR-17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz"; - sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm"; - name = "kde-l10n-pt_BR-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt_BR-17.08.0.tar.xz"; + sha256 = "1hgbw89f7slscc7cgfsxdk0l3y5szsqsidq9grj0j4v2v1qfy320"; + name = "kde-l10n-pt_BR-17.08.0.tar.xz"; }; }; kde-l10n-ro = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz"; - sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv"; - name = "kde-l10n-ro-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ro-17.08.0.tar.xz"; + sha256 = "0y3mpa1jckzl76yz3fal05dprpmch0m7y03q83yzgb6xdr021bds"; + name = "kde-l10n-ro-17.08.0.tar.xz"; }; }; kde-l10n-ru = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz"; - sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p"; - name = "kde-l10n-ru-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ru-17.08.0.tar.xz"; + sha256 = "0ixs6n9jz2i570i5qfd36pjg8jldlgsrwbdb8n82h9c9mjyc7if9"; + name = "kde-l10n-ru-17.08.0.tar.xz"; }; }; kde-l10n-sk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz"; - sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi"; - name = "kde-l10n-sk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sk-17.08.0.tar.xz"; + sha256 = "0g60hxlbck1rjjmwx0wvxzzgqjmi6wc1n5s6i2230150apas9dh1"; + name = "kde-l10n-sk-17.08.0.tar.xz"; }; }; kde-l10n-sl = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz"; - sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn"; - name = "kde-l10n-sl-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sl-17.08.0.tar.xz"; + sha256 = "0vs0kvyxb5yc0qwsdf9rg49gvzd5mwd9bag5mvwp4hcrcn3i7db0"; + name = "kde-l10n-sl-17.08.0.tar.xz"; }; }; kde-l10n-sr = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz"; - sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9"; - name = "kde-l10n-sr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sr-17.08.0.tar.xz"; + sha256 = "0wq1n8ygcz1jpxi3qf0q9qj07vb1p4agn1hjfyy4bjzm3kdy2jkw"; + name = "kde-l10n-sr-17.08.0.tar.xz"; }; }; kde-l10n-sv = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz"; - sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70"; - name = "kde-l10n-sv-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sv-17.08.0.tar.xz"; + sha256 = "09h9d65idax2d10gzwrff96a2si1anc827j2b9r1d559gx9imy0w"; + name = "kde-l10n-sv-17.08.0.tar.xz"; }; }; kde-l10n-tr = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz"; - sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278"; - name = "kde-l10n-tr-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-tr-17.08.0.tar.xz"; + sha256 = "1dg4l6cy2qn9zvspwf7hfn2p0aad3x3zq0jhipdh4n00gykwh3sm"; + name = "kde-l10n-tr-17.08.0.tar.xz"; }; }; kde-l10n-ug = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz"; - sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh"; - name = "kde-l10n-ug-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ug-17.08.0.tar.xz"; + sha256 = "00732l2qisn2kaal3k19f6bnf8ynxalfvmazapbcn3hbcig8cyi5"; + name = "kde-l10n-ug-17.08.0.tar.xz"; }; }; kde-l10n-uk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz"; - sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4"; - name = "kde-l10n-uk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-uk-17.08.0.tar.xz"; + sha256 = "10jrvzy4kfbcn0vcbyir967vhbmk05kzjc7sydx3mg98b0j6qicz"; + name = "kde-l10n-uk-17.08.0.tar.xz"; }; }; kde-l10n-wa = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz"; - sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3"; - name = "kde-l10n-wa-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-wa-17.08.0.tar.xz"; + sha256 = "0p595ra21jn72r46haiwi4h8a3gia96qv0lsdfsi8s6lyqqca0i1"; + name = "kde-l10n-wa-17.08.0.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-17.04.2"; + version = "zh_CN-17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz"; - sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw"; - name = "kde-l10n-zh_CN-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_CN-17.08.0.tar.xz"; + sha256 = "08fxsafnmzizfhr2i63p41jgkjgnkrb07s6mpdrxklkhafl8bmg8"; + name = "kde-l10n-zh_CN-17.08.0.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-17.04.2"; + version = "zh_TW-17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz"; - sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg"; - name = "kde-l10n-zh_TW-17.04.2.tar.xz"; - }; - }; - kdelibs = { - version = "4.14.33"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz"; - sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq"; - name = "kdelibs-4.14.33.tar.xz"; - }; - }; - kdenetwork-filesharing = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz"; - sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64"; - name = "kdenetwork-filesharing-17.04.2.tar.xz"; - }; - }; - kdenlive = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz"; - sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9"; - name = "kdenlive-17.04.2.tar.xz"; - }; - }; - kdepim-addons = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz"; - sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw"; - name = "kdepim-addons-17.04.2.tar.xz"; - }; - }; - kdepim-apps-libs = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz"; - sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15"; - name = "kdepim-apps-libs-17.04.2.tar.xz"; - }; - }; - kdepim-runtime = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz"; - sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92"; - name = "kdepim-runtime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_TW-17.08.0.tar.xz"; + sha256 = "04qq28sf2pjb4rc32j5j9cnhw0h4hpw69gikb5s06324mmmvap0f"; + name = "kde-l10n-zh_TW-17.08.0.tar.xz"; }; }; kde-runtime = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz"; - sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69"; - name = "kde-runtime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kde-runtime-17.08.0.tar.xz"; + sha256 = "14j61bsrrpajw5djk7aa49xid2lg51a886y3q1xdv3dnflmldm70"; + name = "kde-runtime-17.08.0.tar.xz"; + }; + }; + kdebugsettings = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdebugsettings-17.08.0.tar.xz"; + sha256 = "057z4bi9mlpdyb8giq5zsgm1fzfq7sz05a0p4is8cawlyjji8qd3"; + name = "kdebugsettings-17.08.0.tar.xz"; + }; + }; + kdeedu-data = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdeedu-data-17.08.0.tar.xz"; + sha256 = "1w5zvzgqa8jzvqkgc16sffj6fygrizqmy5lzmxhisnph8im5rxyp"; + name = "kdeedu-data-17.08.0.tar.xz"; + }; + }; + kdegraphics-mobipocket = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-mobipocket-17.08.0.tar.xz"; + sha256 = "1r66s3yay2pvy77pfa8g1s07iq4v2fiz9nl4lxhd8lvdg7jxa88i"; + name = "kdegraphics-mobipocket-17.08.0.tar.xz"; + }; + }; + kdegraphics-thumbnailers = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-thumbnailers-17.08.0.tar.xz"; + sha256 = "0cp2p5nmxxg09wfrhg7qzz781rbxyml42y6l42njqfphgxsyqs5h"; + name = "kdegraphics-thumbnailers-17.08.0.tar.xz"; + }; + }; + kdelibs = { + version = "4.14.35"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdelibs-4.14.35.tar.xz"; + sha256 = "00zkbamzqw1jmxc344dlwvprhdd59bblkj2yalxhc7fy11sbsclp"; + name = "kdelibs-4.14.35.tar.xz"; + }; + }; + kdenetwork-filesharing = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdenetwork-filesharing-17.08.0.tar.xz"; + sha256 = "0m4z3mf40sp874ml128489isqjihn5a92gpcn1wbx6j9d37g0aah"; + name = "kdenetwork-filesharing-17.08.0.tar.xz"; + }; + }; + kdenlive = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdenlive-17.08.0.tar.xz"; + sha256 = "0dnapnr7fdqf0ng99q7wvzyipvkpzb75xm379jynwv15x5isc7di"; + name = "kdenlive-17.08.0.tar.xz"; + }; + }; + kdepim-addons = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdepim-addons-17.08.0.tar.xz"; + sha256 = "0ksa8k1hssclq4q6q14gc9jjg7k8iy6fq2wsxv6i3yjvbslkiyzd"; + name = "kdepim-addons-17.08.0.tar.xz"; + }; + }; + kdepim-apps-libs = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdepim-apps-libs-17.08.0.tar.xz"; + sha256 = "0zlg5d4arf0qqdys5p30965868hwb24cj39h2xfbb4jqi7gh3nvv"; + name = "kdepim-apps-libs-17.08.0.tar.xz"; + }; + }; + kdepim-runtime = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/kdepim-runtime-17.08.0.tar.xz"; + sha256 = "0mdw7m16pl3z32ri0hng08apg045f0dhr3q68alq6cs743b74dy3"; + name = "kdepim-runtime-17.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz"; - sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j"; - name = "kdesdk-kioslaves-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdesdk-kioslaves-17.08.0.tar.xz"; + sha256 = "0jpbv0rjc5pw1ym74khdkg0jm5qhszamb5ahj0l7da9bphshdj3v"; + name = "kdesdk-kioslaves-17.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz"; - sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a"; - name = "kdesdk-thumbnailers-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdesdk-thumbnailers-17.08.0.tar.xz"; + sha256 = "09hh2m6mbblsj7a9wy9xpsl9irdw4agadwgrgpzi75ixdfwl998y"; + name = "kdesdk-thumbnailers-17.08.0.tar.xz"; }; }; kdf = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz"; - sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501"; - name = "kdf-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdf-17.08.0.tar.xz"; + sha256 = "1qqr4a65p9bxkmv6rnyy0qlg21nqi59zxaxg6p2qb35vy19n1izd"; + name = "kdf-17.08.0.tar.xz"; }; }; kdialog = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz"; - sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw"; - name = "kdialog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdialog-17.08.0.tar.xz"; + sha256 = "166q8nhxcnw4g727nq89vva7sidrg6jxi6v54rhdnlgqdvf1y5kb"; + name = "kdialog-17.08.0.tar.xz"; }; }; kdiamond = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz"; - sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr"; - name = "kdiamond-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kdiamond-17.08.0.tar.xz"; + sha256 = "0hz34w1anpihcb0wdx2kyp7ypi7ama48vjhax2520h5gaxfpy8lj"; + name = "kdiamond-17.08.0.tar.xz"; }; }; keditbookmarks = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz"; - sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc"; - name = "keditbookmarks-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/keditbookmarks-17.08.0.tar.xz"; + sha256 = "0l26chf97ak4vqil8v5ya62376j7hh0xgabbav5ay8i1d0sk6p6z"; + name = "keditbookmarks-17.08.0.tar.xz"; }; }; kfilereplace = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz"; - sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn"; - name = "kfilereplace-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kfilereplace-17.08.0.tar.xz"; + sha256 = "1a1hfjzv9vgfyf1n1ihr5rqzc5javpn4y7h70babl37s54i9k3xj"; + name = "kfilereplace-17.08.0.tar.xz"; }; }; kfind = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz"; - sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va"; - name = "kfind-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kfind-17.08.0.tar.xz"; + sha256 = "1ryl0xwpyww8sipignr8j3dfq79cf1apm47vc4r8dk1704qzm4v9"; + name = "kfind-17.08.0.tar.xz"; }; }; kfloppy = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz"; - sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42"; - name = "kfloppy-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kfloppy-17.08.0.tar.xz"; + sha256 = "1gyrgii897r4habi9kmls258pv40zs6hrgyfhcyqibl3vk4ndgfb"; + name = "kfloppy-17.08.0.tar.xz"; }; }; kfourinline = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz"; - sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr"; - name = "kfourinline-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kfourinline-17.08.0.tar.xz"; + sha256 = "02zbriz434n9xk5rrb3y0y76hrizbf0mq3pl679fa89jcqaml1fj"; + name = "kfourinline-17.08.0.tar.xz"; }; }; kgeography = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz"; - sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb"; - name = "kgeography-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kgeography-17.08.0.tar.xz"; + sha256 = "03xwpdngikjiml4kxbp0n893xzvb21h6cyj4xp09j19db9gj0jd7"; + name = "kgeography-17.08.0.tar.xz"; }; }; kget = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz"; - sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma"; - name = "kget-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kget-17.08.0.tar.xz"; + sha256 = "1h1svqyj2d8qpw65zidzk90smh0d4dbxzzsi8ar0hvgr8d0lq157"; + name = "kget-17.08.0.tar.xz"; }; }; kgoldrunner = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz"; - sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5"; - name = "kgoldrunner-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kgoldrunner-17.08.0.tar.xz"; + sha256 = "0iw7f8760fgy08g9pncnvfv8ynj673glfb8bf6hmwylpa3nddz54"; + name = "kgoldrunner-17.08.0.tar.xz"; }; }; kgpg = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz"; - sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx"; - name = "kgpg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kgpg-17.08.0.tar.xz"; + sha256 = "1kbndyswhx5l5s566gg22n8yqk372gpk53iiksizr6mrjx3wjvf8"; + name = "kgpg-17.08.0.tar.xz"; }; }; khangman = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz"; - sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w"; - name = "khangman-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/khangman-17.08.0.tar.xz"; + sha256 = "1wvz8p05lsmip65wcwsxzii6sgk48vqw8plghafd7x2dlbzwv3bi"; + name = "khangman-17.08.0.tar.xz"; }; }; khelpcenter = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz"; - sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c"; - name = "khelpcenter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/khelpcenter-17.08.0.tar.xz"; + sha256 = "00i9nq837z6khvz06bvfndv37vhpl72dg0mx9s8wnifni5nixshm"; + name = "khelpcenter-17.08.0.tar.xz"; }; }; kholidays = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz"; - sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9"; - name = "kholidays-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kholidays-17.08.0.tar.xz"; + sha256 = "1dyy03dcm6j0wrn71pxmdfhxph7hgvdnkcsrl0q6g2br01yjy7fl"; + name = "kholidays-17.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz"; - sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm"; - name = "kidentitymanagement-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kidentitymanagement-17.08.0.tar.xz"; + sha256 = "0xwnydrsw4g8ym415qi93hkhmghspwrdyzl5kw6vhl8xwm67h7i5"; + name = "kidentitymanagement-17.08.0.tar.xz"; }; }; kig = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz"; - sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p"; - name = "kig-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kig-17.08.0.tar.xz"; + sha256 = "1f7w40glwbpqv33alpssg8vapx7sw6q3wbdw22r3ivlrqfy3lfmb"; + name = "kig-17.08.0.tar.xz"; }; }; kigo = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz"; - sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi"; - name = "kigo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kigo-17.08.0.tar.xz"; + sha256 = "04d4dg9w57cl6hfhwxc7l6hfas19q02l4wszvqbnagci333nqbsm"; + name = "kigo-17.08.0.tar.xz"; }; }; killbots = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz"; - sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6"; - name = "killbots-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/killbots-17.08.0.tar.xz"; + sha256 = "1h5z310nvkn8dsamzifr4njwasyv9w32dy1i0qwkc6x8672n4xhi"; + name = "killbots-17.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz"; - sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz"; - name = "kimagemapeditor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kimagemapeditor-17.08.0.tar.xz"; + sha256 = "0klal67dzrr8l9x3xw4z54llwgf2r19xc2jfi4a8qmn3kqm2inmm"; + name = "kimagemapeditor-17.08.0.tar.xz"; }; }; kimap = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz"; - sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr"; - name = "kimap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kimap-17.08.0.tar.xz"; + sha256 = "0s2sfdlzaz6bj5rz077hnli500ddx53j6lvka1pyz7pc2qfj5lpp"; + name = "kimap-17.08.0.tar.xz"; }; }; kio-extras = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz"; - sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh"; - name = "kio-extras-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kio-extras-17.08.0.tar.xz"; + sha256 = "0yfg3jjzblrpsi0mc08sfg5lyzr4q4bqg23vha1b4wk323kx758f"; + name = "kio-extras-17.08.0.tar.xz"; }; }; kiriki = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz"; - sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4"; - name = "kiriki-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kiriki-17.08.0.tar.xz"; + sha256 = "10f7qydq97l65wrcxfvjvd0amal5achp6zdl33k04sx3dv62wb63"; + name = "kiriki-17.08.0.tar.xz"; }; }; kiten = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz"; - sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw"; - name = "kiten-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kiten-17.08.0.tar.xz"; + sha256 = "1j1qqz1vxgc8746qn9ss8p2qy8c099pfwscfsmd6fj3p04hm0xp7"; + name = "kiten-17.08.0.tar.xz"; }; }; kjumpingcube = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz"; - sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis"; - name = "kjumpingcube-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kjumpingcube-17.08.0.tar.xz"; + sha256 = "1a3lyyx7gx3brwyz3dzzf193088v510vjjr6vvlp7p1af0y5rxjp"; + name = "kjumpingcube-17.08.0.tar.xz"; }; }; kldap = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz"; - sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4"; - name = "kldap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kldap-17.08.0.tar.xz"; + sha256 = "1dn37m64sqp816c2mnjcd7vb58bl9zy3zpmf4zghyhnln4hljnjq"; + name = "kldap-17.08.0.tar.xz"; }; }; kleopatra = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz"; - sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8"; - name = "kleopatra-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kleopatra-17.08.0.tar.xz"; + sha256 = "0bx4bs2ssjhasbfhvjkhwf4p22wiyfrdkkazp79vs2i1z2anjsqm"; + name = "kleopatra-17.08.0.tar.xz"; }; }; klettres = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz"; - sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21"; - name = "klettres-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/klettres-17.08.0.tar.xz"; + sha256 = "12vsp99x2j7xndgm31lhjxcvzp9v4plxmzjr9yn7l72ayvgf5s61"; + name = "klettres-17.08.0.tar.xz"; }; }; klickety = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz"; - sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7"; - name = "klickety-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/klickety-17.08.0.tar.xz"; + sha256 = "1nsf7yiqp1i0hzh053qr6b3pb6p25nr6w0z5kv6jnjpcvis1w3dj"; + name = "klickety-17.08.0.tar.xz"; }; }; klines = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz"; - sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr"; - name = "klines-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/klines-17.08.0.tar.xz"; + sha256 = "1w9hyxy4fdf9cj7c97lx8553phdp2gcx3z0c2y6gb3ic6nign4x7"; + name = "klines-17.08.0.tar.xz"; }; }; klinkstatus = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz"; - sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8"; - name = "klinkstatus-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/klinkstatus-17.08.0.tar.xz"; + sha256 = "07zzi44x2s3sfnp373san27dbbcpcph2l6l7z5b31vmqbcr2fia1"; + name = "klinkstatus-17.08.0.tar.xz"; }; }; kmag = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz"; - sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0"; - name = "kmag-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmag-17.08.0.tar.xz"; + sha256 = "0fr4p707qhwnqz7nb52rh0xzrxwj5vxq64zpxcdxplapbhqczqkv"; + name = "kmag-17.08.0.tar.xz"; }; }; kmahjongg = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz"; - sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q"; - name = "kmahjongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmahjongg-17.08.0.tar.xz"; + sha256 = "0z6k2nc11h1y8qby9knwwzppnbsl6rw0x52a571ikidakm5jg2j8"; + name = "kmahjongg-17.08.0.tar.xz"; }; }; kmail = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz"; - sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l"; - name = "kmail-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmail-17.08.0.tar.xz"; + sha256 = "1vdypb5a9fswnw4z6bj1mjmcp1kdrb0sc9yxigrj572w4hg31hjp"; + name = "kmail-17.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz"; - sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv"; - name = "kmail-account-wizard-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmail-account-wizard-17.08.0.tar.xz"; + sha256 = "06f0fa727fxzjbxch18lhnch9krcly0crk7waciajg4jnmg1v77b"; + name = "kmail-account-wizard-17.08.0.tar.xz"; }; }; kmailtransport = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz"; - sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw"; - name = "kmailtransport-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmailtransport-17.08.0.tar.xz"; + sha256 = "1liqqrk5xpzaim8kj87acavry33m5pidx7ajmbmk2hb01dhiq20z"; + name = "kmailtransport-17.08.0.tar.xz"; }; }; kmbox = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz"; - sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys"; - name = "kmbox-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmbox-17.08.0.tar.xz"; + sha256 = "1cg9cl6a4z09adyyim7yahlg95slsw4zw4r9lqhqznmjr5nyf9bq"; + name = "kmbox-17.08.0.tar.xz"; }; }; kmime = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz"; - sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8"; - name = "kmime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmime-17.08.0.tar.xz"; + sha256 = "1k4xicq14i35f2x3xkkhqrs2darql5rw2i2j3zd73gkmd37gdrai"; + name = "kmime-17.08.0.tar.xz"; }; }; kmines = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz"; - sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8"; - name = "kmines-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmines-17.08.0.tar.xz"; + sha256 = "1wci2wrkj96ywwvvdpbjf4270qq8x7gdbppy9la860x5nvp34xvx"; + name = "kmines-17.08.0.tar.xz"; }; }; kmix = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz"; - sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2"; - name = "kmix-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmix-17.08.0.tar.xz"; + sha256 = "1s3hmg2wdav2mn9ddcp2lp147xz1k5y52jql0q2w65i5dzcpav3a"; + name = "kmix-17.08.0.tar.xz"; }; }; kmousetool = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz"; - sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30"; - name = "kmousetool-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmousetool-17.08.0.tar.xz"; + sha256 = "0287rgx7rgwa95zfhwl6754ia58scq86qd18max8yg6l5mwjny8v"; + name = "kmousetool-17.08.0.tar.xz"; }; }; kmouth = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz"; - sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw"; - name = "kmouth-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmouth-17.08.0.tar.xz"; + sha256 = "1gfh2akqxq4w9k8y4xpmafrn9q17c5xyc3f7vgl9r0h9jfrnndx8"; + name = "kmouth-17.08.0.tar.xz"; }; }; kmplot = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz"; - sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x"; - name = "kmplot-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kmplot-17.08.0.tar.xz"; + sha256 = "1bvx0298n3aa39qsnlzxv431w2ayhkinin1sj1indpjzs3qia8li"; + name = "kmplot-17.08.0.tar.xz"; }; }; knavalbattle = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz"; - sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52"; - name = "knavalbattle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/knavalbattle-17.08.0.tar.xz"; + sha256 = "1v52g5jr201cyvjdhd70vsjrxa75j95d8ssy5pqfvzdb0251pxdi"; + name = "knavalbattle-17.08.0.tar.xz"; }; }; knetwalk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz"; - sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d"; - name = "knetwalk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/knetwalk-17.08.0.tar.xz"; + sha256 = "0aiasbf6ww9ccqsamvn2kljyjh4bzxccp5clysglhmliv1g6qx44"; + name = "knetwalk-17.08.0.tar.xz"; }; }; knotes = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz"; - sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy"; - name = "knotes-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/knotes-17.08.0.tar.xz"; + sha256 = "07cbhgxsf1qdayzxvwv6ihlz1jfq3nn0csf1qscx7qj1a2jypcv6"; + name = "knotes-17.08.0.tar.xz"; }; }; kolf = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz"; - sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag"; - name = "kolf-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kolf-17.08.0.tar.xz"; + sha256 = "1y2dk5rfssnnl93wilmz3bkvk6jllyq3isy4aj6dp8v1qrisna0m"; + name = "kolf-17.08.0.tar.xz"; }; }; kollision = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz"; - sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j"; - name = "kollision-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kollision-17.08.0.tar.xz"; + sha256 = "1fqlxj4792g4k10pzfk53svvfp8kkaz126z7509qrwjngq8y4bji"; + name = "kollision-17.08.0.tar.xz"; }; }; kolourpaint = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz"; - sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s"; - name = "kolourpaint-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kolourpaint-17.08.0.tar.xz"; + sha256 = "15xm9hf9b2bq4s66pbiqpjhshjfx7xf3gvk3cfc01xibly442xc9"; + name = "kolourpaint-17.08.0.tar.xz"; }; }; kompare = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz"; - sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2"; - name = "kompare-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kompare-17.08.0.tar.xz"; + sha256 = "1rh71a152vnlhx7f5046ndlk4gb15p4jy7sqfrmnx1ssmi2vhs8g"; + name = "kompare-17.08.0.tar.xz"; }; }; konqueror = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz"; - sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq"; - name = "konqueror-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/konqueror-17.08.0.tar.xz"; + sha256 = "1ir47i0g48rabjh86xy426imw682wr6kff9cwvbf7lgl6gqkpafw"; + name = "konqueror-17.08.0.tar.xz"; }; }; konquest = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz"; - sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc"; - name = "konquest-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/konquest-17.08.0.tar.xz"; + sha256 = "1b6bw8ga4wjaa7zw344y8cb3hiylpcq5m3mj96hasri6jyd1lwp8"; + name = "konquest-17.08.0.tar.xz"; }; }; konsole = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz"; - sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl"; - name = "konsole-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/konsole-17.08.0.tar.xz"; + sha256 = "0il0hffq62plq7jdbq2a1y1djdb406639h2zz6jsmn6fbbrwxwh4"; + name = "konsole-17.08.0.tar.xz"; }; }; kontact = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz"; - sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv"; - name = "kontact-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kontact-17.08.0.tar.xz"; + sha256 = "0cs8sjq0dlhggly1kjcqsdsjxfg717mgjzg84ac64m2gdkk213sz"; + name = "kontact-17.08.0.tar.xz"; }; }; kontactinterface = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz"; - sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1"; - name = "kontactinterface-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kontactinterface-17.08.0.tar.xz"; + sha256 = "01zz7zah35wfpqkmz46jxjljys4ngkh5m94ldirjg95pfrcxlsnc"; + name = "kontactinterface-17.08.0.tar.xz"; }; }; kopete = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz"; - sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj"; - name = "kopete-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kopete-17.08.0.tar.xz"; + sha256 = "0f26ln78pxdj69rvsxpbzf8554hdwcij3z488pgv8j2h9j6pwgfd"; + name = "kopete-17.08.0.tar.xz"; }; }; korganizer = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz"; - sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r"; - name = "korganizer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/korganizer-17.08.0.tar.xz"; + sha256 = "0mqzbjyxb8625m2m2js8pqj8m9k8q1ali46wj96prfk1y9abnp5i"; + name = "korganizer-17.08.0.tar.xz"; }; }; kpat = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz"; - sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44"; - name = "kpat-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kpat-17.08.0.tar.xz"; + sha256 = "04phaqbbyys0zz7rqivifz620xmw32pvv2kkax3n37spsdiyaq5j"; + name = "kpat-17.08.0.tar.xz"; }; }; kpimtextedit = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz"; - sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39"; - name = "kpimtextedit-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kpimtextedit-17.08.0.tar.xz"; + sha256 = "01klpd4cqxq8cd0s32k9m44nly6w7ym41h385hw888xf356xsjpb"; + name = "kpimtextedit-17.08.0.tar.xz"; }; }; kppp = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz"; - sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8"; - name = "kppp-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kppp-17.08.0.tar.xz"; + sha256 = "1bzwsjw46vj36fwir0r6l26l1fr3mpj37g87wrg8zb3g9vz6ixnp"; + name = "kppp-17.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz"; - sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x"; - name = "kqtquickcharts-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kqtquickcharts-17.08.0.tar.xz"; + sha256 = "1g487xniyv6yic2wyvd3rxn0rn95anrr4djf10nglvlxzcx3fnrc"; + name = "kqtquickcharts-17.08.0.tar.xz"; }; }; krdc = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz"; - sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg"; - name = "krdc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/krdc-17.08.0.tar.xz"; + sha256 = "0hsp05nns2ddvg4md6lwywh8c58vxzrb8r4d512mlcvprm8w6qb4"; + name = "krdc-17.08.0.tar.xz"; }; }; kremotecontrol = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz"; - sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7"; - name = "kremotecontrol-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kremotecontrol-17.08.0.tar.xz"; + sha256 = "1vxb73zycw1d2spnkhv93ml1b1m8hw1g3lac77l1vq17g873ibg5"; + name = "kremotecontrol-17.08.0.tar.xz"; }; }; kreversi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz"; - sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b"; - name = "kreversi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kreversi-17.08.0.tar.xz"; + sha256 = "1wi6s3rjqbc6269x856ri2a6iirnx1p9pizkqpq8yma7lpzl59ss"; + name = "kreversi-17.08.0.tar.xz"; }; }; krfb = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz"; - sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z"; - name = "krfb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/krfb-17.08.0.tar.xz"; + sha256 = "0kyyl4zrrx4naj5nlczmc3fn0gbc7nrb42hm43hf4c0l5djsw4vj"; + name = "krfb-17.08.0.tar.xz"; }; }; kross-interpreters = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz"; - sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b"; - name = "kross-interpreters-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kross-interpreters-17.08.0.tar.xz"; + sha256 = "0k7p1c2lpknw0q45ahgld9pcxi5f3nsbl4hima10s6n3jf91d4v9"; + name = "kross-interpreters-17.08.0.tar.xz"; }; }; kruler = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz"; - sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f"; - name = "kruler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kruler-17.08.0.tar.xz"; + sha256 = "0rfmn3wh1k8xigpk07mcj2xd0jq85jm81ymaka0pjm8ka98njbr6"; + name = "kruler-17.08.0.tar.xz"; }; }; ksaneplugin = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz"; - sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg"; - name = "ksaneplugin-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksaneplugin-17.08.0.tar.xz"; + sha256 = "1dyifhfyzg7p8j8h45k8m4vkvrq7nbj07810j5r8hqcmbpbjw2m1"; + name = "ksaneplugin-17.08.0.tar.xz"; }; }; kscd = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz"; - sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x"; - name = "kscd-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kscd-17.08.0.tar.xz"; + sha256 = "0bc6npz4s4fn2vzm3xpm0si06ql9k6a9gx9b1ghxn5y2dy3hjshy"; + name = "kscd-17.08.0.tar.xz"; }; }; kshisen = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz"; - sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv"; - name = "kshisen-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kshisen-17.08.0.tar.xz"; + sha256 = "1b3q8fcm6pialqwljm2hwmk1k9fcwa77m55zxyb2wcyvgz9gpkjq"; + name = "kshisen-17.08.0.tar.xz"; }; }; ksirk = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz"; - sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb"; - name = "ksirk-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksirk-17.08.0.tar.xz"; + sha256 = "1qcbr7lrj1zdbyb7agf2afnc39lvinam48yrzxbv0ry62l965c82"; + name = "ksirk-17.08.0.tar.xz"; }; }; ksnakeduel = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz"; - sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5"; - name = "ksnakeduel-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksnakeduel-17.08.0.tar.xz"; + sha256 = "1vd9cspaxwxbs1lqbla292zwfyjj4giajx2n19m26x857xb6va0k"; + name = "ksnakeduel-17.08.0.tar.xz"; }; }; kspaceduel = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz"; - sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380"; - name = "kspaceduel-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kspaceduel-17.08.0.tar.xz"; + sha256 = "1y6nyyvig6y5s99bym21xyazxly0v7pdqygkwb3rq5152bf4xi78"; + name = "kspaceduel-17.08.0.tar.xz"; }; }; ksquares = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz"; - sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0"; - name = "ksquares-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksquares-17.08.0.tar.xz"; + sha256 = "0fmx2zj5qrqyxg1yf2pbl2a4fq96rm088m7hmiq85ha7i1dd0wbw"; + name = "ksquares-17.08.0.tar.xz"; }; }; kstars = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz"; - sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj"; - name = "kstars-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kstars-17.08.0.tar.xz"; + sha256 = "1k2rln20qw7rm7dxxyd3yrxbmpjhkpbqd0v82xfnqal6i3cx8xdb"; + name = "kstars-17.08.0.tar.xz"; }; }; ksudoku = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz"; - sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5"; - name = "ksudoku-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksudoku-17.08.0.tar.xz"; + sha256 = "1lysfddiy12fxnwampy3djbkrabfqch4vsvxn6hclpii8a6sx5nr"; + name = "ksudoku-17.08.0.tar.xz"; }; }; ksystemlog = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz"; - sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m"; - name = "ksystemlog-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ksystemlog-17.08.0.tar.xz"; + sha256 = "0n4387si8q8183rysmbdbyqs9d5x09qdrkd47g66bxn0w4qbwmkq"; + name = "ksystemlog-17.08.0.tar.xz"; }; }; kteatime = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz"; - sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb"; - name = "kteatime-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kteatime-17.08.0.tar.xz"; + sha256 = "17jxrivkmrwnwrw641slm756lpqk5vg8chadn797b1w3ddr7vwl7"; + name = "kteatime-17.08.0.tar.xz"; }; }; ktimer = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz"; - sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir"; - name = "ktimer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktimer-17.08.0.tar.xz"; + sha256 = "12aj0v1z3y797xs3bxqa3pd4z5k9bhjbpgp1v3kf87arpvrdb9q7"; + name = "ktimer-17.08.0.tar.xz"; }; }; ktnef = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz"; - sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj"; - name = "ktnef-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktnef-17.08.0.tar.xz"; + sha256 = "1j4yaxmz8kcar2hmsd39l7l757ca16fdzlvhljhjpii4br2lp17s"; + name = "ktnef-17.08.0.tar.xz"; }; }; ktouch = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz"; - sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r"; - name = "ktouch-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktouch-17.08.0.tar.xz"; + sha256 = "1g2kxdp0734yqz8044z7z1sgwyf0n7spql1r8vwzr6zisx6gy7pb"; + name = "ktouch-17.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz"; - sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg"; - name = "ktp-accounts-kcm-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-accounts-kcm-17.08.0.tar.xz"; + sha256 = "11z8g0pcv04lh70qx4gb5226h7wm7g7bm7n14mpw8xbcnlh2sax8"; + name = "ktp-accounts-kcm-17.08.0.tar.xz"; }; }; ktp-approver = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz"; - sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9"; - name = "ktp-approver-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-approver-17.08.0.tar.xz"; + sha256 = "03v2mz29r3lzwwa5bis8sn8zjjr7vdpq2f39fzkyvb3vjnkb0kh8"; + name = "ktp-approver-17.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz"; - sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49"; - name = "ktp-auth-handler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-auth-handler-17.08.0.tar.xz"; + sha256 = "1yj8cn4s0p1fdlcd1zn8ai2l1rfhzg2n3qny9s2q1jz1wnbhxj1z"; + name = "ktp-auth-handler-17.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz"; - sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7"; - name = "ktp-call-ui-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-call-ui-17.08.0.tar.xz"; + sha256 = "1vddjzcq0qy25f8qqwhck2icl9v6arihlg63fdr4bz05cifhmip4"; + name = "ktp-call-ui-17.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz"; - sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2"; - name = "ktp-common-internals-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-common-internals-17.08.0.tar.xz"; + sha256 = "1qw92sh1lhm3zmyj3jr4r1rhcnfbaipfnrr78bsfixdb784is7dk"; + name = "ktp-common-internals-17.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz"; - sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0"; - name = "ktp-contact-list-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-list-17.08.0.tar.xz"; + sha256 = "162fzvs8x63091arc7c4njwzz1xn5bgzai0bh57va4fzqhzxs012"; + name = "ktp-contact-list-17.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz"; - sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn"; - name = "ktp-contact-runner-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-runner-17.08.0.tar.xz"; + sha256 = "16j9ljcab4xmsjdbllr36a02s07w3xgpz0i4p0wzpwlfg42kb0nj"; + name = "ktp-contact-runner-17.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz"; - sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz"; - name = "ktp-desktop-applets-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-desktop-applets-17.08.0.tar.xz"; + sha256 = "1n0f5a5lfb3zn8h9dvqm4c6gs39pvlnglr7lvcgqmabhvncwdxbp"; + name = "ktp-desktop-applets-17.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz"; - sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz"; - name = "ktp-filetransfer-handler-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-filetransfer-handler-17.08.0.tar.xz"; + sha256 = "1jprbcc3cnz1h9491bbmfxs6rbq6plpl7mrkfha7p3f1qn72w0h0"; + name = "ktp-filetransfer-handler-17.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz"; - sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3"; - name = "ktp-kded-module-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-kded-module-17.08.0.tar.xz"; + sha256 = "1676s6w8wcwvbzgmg5vfw6i88smrzicgjbbg6q5k5hzp5xaxr8yk"; + name = "ktp-kded-module-17.08.0.tar.xz"; }; }; ktp-send-file = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz"; - sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57"; - name = "ktp-send-file-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-send-file-17.08.0.tar.xz"; + sha256 = "153v1yzhjxh1afkq5r7spp45f7lzj07x61ziv74ignpshm28a69l"; + name = "ktp-send-file-17.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz"; - sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa"; - name = "ktp-text-ui-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktp-text-ui-17.08.0.tar.xz"; + sha256 = "169lb6d07xra6v25wsdzmhbpj2lhbkjxdhvgyprwv3wlh7fyd6z2"; + name = "ktp-text-ui-17.08.0.tar.xz"; }; }; ktuberling = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz"; - sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym"; - name = "ktuberling-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/ktuberling-17.08.0.tar.xz"; + sha256 = "06iqdi5j7yywv4xfv6lciw8s80a1z41w0cw029l26r97yrm5qc3c"; + name = "ktuberling-17.08.0.tar.xz"; }; }; kturtle = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz"; - sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1"; - name = "kturtle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kturtle-17.08.0.tar.xz"; + sha256 = "0ds7n7bpg4m5av48k9nqjaka94jddrxqxn61dn54c8yxx8zwka1j"; + name = "kturtle-17.08.0.tar.xz"; }; }; kubrick = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz"; - sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh"; - name = "kubrick-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kubrick-17.08.0.tar.xz"; + sha256 = "1azzy536xwcpcf37hvkrvqg63l9jn67vsw1nxa68a7vh7pw104hi"; + name = "kubrick-17.08.0.tar.xz"; }; }; kwalletmanager = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz"; - sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw"; - name = "kwalletmanager-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kwalletmanager-17.08.0.tar.xz"; + sha256 = "03dam64smpw9fqpq4kqisn5kcwvwf2rl0x5jq1ws6pxdk72cn5wj"; + name = "kwalletmanager-17.08.0.tar.xz"; }; }; kwave = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz"; - sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j"; - name = "kwave-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kwave-17.08.0.tar.xz"; + sha256 = "0zqv5iqn3nzijvhlwx303dhjj0f9ha9fvg0infn9170vhcx2v2mn"; + name = "kwave-17.08.0.tar.xz"; }; }; kwordquiz = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz"; - sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz"; - name = "kwordquiz-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/kwordquiz-17.08.0.tar.xz"; + sha256 = "0mxvx4br53grsp48mx1z5vf9awlrbj6s7yipz75mj1cskzq103pb"; + name = "kwordquiz-17.08.0.tar.xz"; }; }; libgravatar = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz"; - sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis"; - name = "libgravatar-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libgravatar-17.08.0.tar.xz"; + sha256 = "1wijd89xpg82p36f4c5y3lphdpgisj66408idar7x4wfsz6x9ypj"; + name = "libgravatar-17.08.0.tar.xz"; }; }; libkcddb = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz"; - sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3"; - name = "libkcddb-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkcddb-17.08.0.tar.xz"; + sha256 = "0cxhjf80kncmwl8gflf8mawghqz0bdwqb3sjipwy241p1irisyb4"; + name = "libkcddb-17.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz"; - sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6"; - name = "libkcompactdisc-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkcompactdisc-17.08.0.tar.xz"; + sha256 = "16qa7mn9pxrghka56y4n3kg7i1wm9fp3njnpaczc5f8brl7fm8wk"; + name = "libkcompactdisc-17.08.0.tar.xz"; }; }; libkdcraw = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz"; - sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk"; - name = "libkdcraw-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkdcraw-17.08.0.tar.xz"; + sha256 = "0c76c055i2h4hwxp7xpnkpyn86mg8rs5z8wxzamc9yjynsym29k6"; + name = "libkdcraw-17.08.0.tar.xz"; }; }; libkdegames = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz"; - sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k"; - name = "libkdegames-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkdegames-17.08.0.tar.xz"; + sha256 = "0zhfr0pq4vb7ax2wlspkczrfnqfs9w78r2l77777yhgha0mvs5hl"; + name = "libkdegames-17.08.0.tar.xz"; }; }; libkdepim = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz"; - sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs"; - name = "libkdepim-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkdepim-17.08.0.tar.xz"; + sha256 = "0xf1r07hzqwnjjwkbi0a61dpmpsa33a33ac41rlaknclpvmgakxl"; + name = "libkdepim-17.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz"; - sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh"; - name = "libkeduvocdocument-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkeduvocdocument-17.08.0.tar.xz"; + sha256 = "1x779zxawd3zg341a5lph669afg8qnnbvrbblv9rd775bpygwkhj"; + name = "libkeduvocdocument-17.08.0.tar.xz"; }; }; libkexiv2 = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz"; - sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87"; - name = "libkexiv2-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkexiv2-17.08.0.tar.xz"; + sha256 = "02i1nm4ggj72kgk8j0qkgqrc5kh4dg4qa62bp8q5lgi27fxijhxy"; + name = "libkexiv2-17.08.0.tar.xz"; }; }; libkface = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz"; - sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y"; - name = "libkface-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkface-17.08.0.tar.xz"; + sha256 = "08k7ci77lry0z5178w5fm0rf0rvsvfcdlhs70xg3iwzbhha3crz7"; + name = "libkface-17.08.0.tar.xz"; }; }; libkgapi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz"; - sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s"; - name = "libkgapi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkgapi-17.08.0.tar.xz"; + sha256 = "1i0z16x77wmxk11w75kp1j6w6v00kr9knpryg7n3gpp4kbpnkj8c"; + name = "libkgapi-17.08.0.tar.xz"; }; }; libkgeomap = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz"; - sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p"; - name = "libkgeomap-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkgeomap-17.08.0.tar.xz"; + sha256 = "02njkvk9qvd6zycfa1s85mlc66jal5icg23dbh5vliiwq3xqlyix"; + name = "libkgeomap-17.08.0.tar.xz"; }; }; libkipi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz"; - sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny"; - name = "libkipi-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkipi-17.08.0.tar.xz"; + sha256 = "0z1vllhfimwp7dgf2hfxwhpvfg0j6kg6n7m166ji7nalb8p5avd4"; + name = "libkipi-17.08.0.tar.xz"; }; }; libkleo = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz"; - sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4"; - name = "libkleo-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkleo-17.08.0.tar.xz"; + sha256 = "0i747aq06yzl8rzznyrgwyypff4g5fdmdc1k5v63z99yf8rb0zqg"; + name = "libkleo-17.08.0.tar.xz"; }; }; libkmahjongg = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz"; - sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r"; - name = "libkmahjongg-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkmahjongg-17.08.0.tar.xz"; + sha256 = "0cya2gnqr8cjgw2abpnwvyqa243zjdr89h1dwvjyag8s0aw595af"; + name = "libkmahjongg-17.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz"; - sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz"; - name = "libkomparediff2-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libkomparediff2-17.08.0.tar.xz"; + sha256 = "0nrd6a5agvgmqcx5bvx11s4zal9ln6q6awavbyr5m1hvccch2k1r"; + name = "libkomparediff2-17.08.0.tar.xz"; }; }; libksane = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz"; - sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda"; - name = "libksane-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libksane-17.08.0.tar.xz"; + sha256 = "18s3d3m0ylbrrbf4vivc29lms9yz6ppkdb247kbmxxnwvzk867bl"; + name = "libksane-17.08.0.tar.xz"; }; }; libksieve = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz"; - sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1"; - name = "libksieve-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/libksieve-17.08.0.tar.xz"; + sha256 = "10864y6d473y93ikkw0kiz7rl85x2whb5c4ifl24w5njri3szl89"; + name = "libksieve-17.08.0.tar.xz"; }; }; lokalize = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz"; - sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn"; - name = "lokalize-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/lokalize-17.08.0.tar.xz"; + sha256 = "0aps3s5gbja1fngndfwbi21wg7kr8pr3l48hx5n4hgcpa4rxbf0n"; + name = "lokalize-17.08.0.tar.xz"; }; }; lskat = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz"; - sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j"; - name = "lskat-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/lskat-17.08.0.tar.xz"; + sha256 = "0xwbyfjlkfxccnmi4kmvrar1jds7976j1m2s8sd69knfccj43n6a"; + name = "lskat-17.08.0.tar.xz"; }; }; mailcommon = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz"; - sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk"; - name = "mailcommon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/mailcommon-17.08.0.tar.xz"; + sha256 = "1laqipa3mqyxzbx3xkg5jm6ah74a68fgyb37hjw52mkbf6jzqpsx"; + name = "mailcommon-17.08.0.tar.xz"; }; }; mailimporter = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz"; - sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh"; - name = "mailimporter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/mailimporter-17.08.0.tar.xz"; + sha256 = "11677y558xy0rdn5g63cpjl3nz1w5x38dfr0ky0nsylary9diwwn"; + name = "mailimporter-17.08.0.tar.xz"; }; }; marble = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz"; - sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09"; - name = "marble-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/marble-17.08.0.tar.xz"; + sha256 = "1qi4fiagxp2734myd2grg38sf9bdbfys46rhmn0jp8p39dqic4di"; + name = "marble-17.08.0.tar.xz"; }; }; mbox-importer = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz"; - sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca"; - name = "mbox-importer-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/mbox-importer-17.08.0.tar.xz"; + sha256 = "15iipvs5szfjnl1r0gfx30wr4rq1l5a74wywy8lm73ma9hgb0fpc"; + name = "mbox-importer-17.08.0.tar.xz"; }; }; messagelib = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz"; - sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv"; - name = "messagelib-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/messagelib-17.08.0.tar.xz"; + sha256 = "0qik1a4rka6qj28jdmdh5rk7m3p3gh27i0jcg9nxijrg7wz1hx98"; + name = "messagelib-17.08.0.tar.xz"; }; }; minuet = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz"; - sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g"; - name = "minuet-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/minuet-17.08.0.tar.xz"; + sha256 = "1f9pd9wzai2sqs87m70ywgqsn9azr2xnpaj2msii7cl2mn6km6wb"; + name = "minuet-17.08.0.tar.xz"; }; }; okteta = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz"; - sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40"; - name = "okteta-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/okteta-17.08.0.tar.xz"; + sha256 = "1f3041vn9p24avkj7svz9mb9sr5s5p16jvh9m7417svy307g1hii"; + name = "okteta-17.08.0.tar.xz"; }; }; okular = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz"; - sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf"; - name = "okular-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/okular-17.08.0.tar.xz"; + sha256 = "0fghjj149ji6p1hi7zlzfmgsp7zrwyhz3989ff2an9yx5qvmwayg"; + name = "okular-17.08.0.tar.xz"; }; }; palapeli = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz"; - sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd"; - name = "palapeli-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/palapeli-17.08.0.tar.xz"; + sha256 = "1gv4hfjj9b7bgfsvpmdydvb8pmbqwvm2s0f0ip8mjxnfcayig4xn"; + name = "palapeli-17.08.0.tar.xz"; }; }; parley = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz"; - sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj"; - name = "parley-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/parley-17.08.0.tar.xz"; + sha256 = "1qx10l0h4099w6xl5jnlp259glq0whqjsxl4b4a6kj4ddz55ysyr"; + name = "parley-17.08.0.tar.xz"; }; }; picmi = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz"; - sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5"; - name = "picmi-17.04.2.tar.xz"; - }; - }; - pimcommon = { - version = "17.04.2"; - src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz"; - sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg"; - name = "pimcommon-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/picmi-17.08.0.tar.xz"; + sha256 = "03cl8hbxa5kfb9ji24x2svp2ids0jwyam847zncrdkg72gjmnjlb"; + name = "picmi-17.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz"; - sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i"; - name = "pim-data-exporter-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/pim-data-exporter-17.08.0.tar.xz"; + sha256 = "01n9m8ssyla5rz9cg61fv0rhl4gz02488cghak7idb18an36lfak"; + name = "pim-data-exporter-17.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz"; - sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni"; - name = "pim-sieve-editor-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/pim-sieve-editor-17.08.0.tar.xz"; + sha256 = "0i3ry6hrdiz3wdjqw1b6mqrya3jxphrv9lx1px8grp0gs8ci0gc4"; + name = "pim-sieve-editor-17.08.0.tar.xz"; + }; + }; + pimcommon = { + version = "17.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.0/src/pimcommon-17.08.0.tar.xz"; + sha256 = "0vv3fxf6d9vx75gxn2lwmv43ifman5av9xxy17yzxsmvjpvf2mmv"; + name = "pimcommon-17.08.0.tar.xz"; }; }; poxml = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz"; - sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40"; - name = "poxml-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/poxml-17.08.0.tar.xz"; + sha256 = "1a68lddadm3iar64q4zfi4f0mp97zagfnfs3i1czdyq83hqp1c3x"; + name = "poxml-17.08.0.tar.xz"; }; }; print-manager = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz"; - sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj"; - name = "print-manager-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/print-manager-17.08.0.tar.xz"; + sha256 = "0cj8ijzl3xsxyrkcpigscqj84mza5lzwsaal586zqf1z2p8pabcx"; + name = "print-manager-17.08.0.tar.xz"; }; }; rocs = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz"; - sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j"; - name = "rocs-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/rocs-17.08.0.tar.xz"; + sha256 = "0cjz0n4bk21c6csqhr937dfyzhn8i8viy7h94pr3813vfwffd0mn"; + name = "rocs-17.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz"; - sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv"; - name = "signon-kwallet-extension-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/signon-kwallet-extension-17.08.0.tar.xz"; + sha256 = "0nzgjrr8hgc2pmiwx3cdp9pcgw25hvr0y7mkjllyh2cigcnbw6dg"; + name = "signon-kwallet-extension-17.08.0.tar.xz"; }; }; spectacle = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz"; - sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf"; - name = "spectacle-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/spectacle-17.08.0.tar.xz"; + sha256 = "1lmh53rhgbkg81xxk1dhcsxwh7shzlxvfqfs3zflq88ghm53fnzf"; + name = "spectacle-17.08.0.tar.xz"; }; }; step = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz"; - sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y"; - name = "step-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/step-17.08.0.tar.xz"; + sha256 = "0rqj6idzdlkljvfx6jwjlwc6ibpqmmb9w7fi4cax2h89s9fc4fqy"; + name = "step-17.08.0.tar.xz"; }; }; svgpart = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz"; - sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4"; - name = "svgpart-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/svgpart-17.08.0.tar.xz"; + sha256 = "0gqzhm6shsirkb2h933n5slhm5kwhvjrszqbdlpm7a28643r0jgq"; + name = "svgpart-17.08.0.tar.xz"; }; }; sweeper = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz"; - sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844"; - name = "sweeper-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/sweeper-17.08.0.tar.xz"; + sha256 = "0hxkf65jdy5qirrycr55v3v0d63x4bh3hd49wjvbh0qx4sbkazhs"; + name = "sweeper-17.08.0.tar.xz"; }; }; syndication = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz"; - sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq"; - name = "syndication-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/syndication-17.08.0.tar.xz"; + sha256 = "0z5jpygkphmq2xvmnnj8nyagcx320ngnjjqphwfymp14y8yp8cla"; + name = "syndication-17.08.0.tar.xz"; }; }; umbrello = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz"; - sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1"; - name = "umbrello-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/umbrello-17.08.0.tar.xz"; + sha256 = "09dnmafzqbhjymqpb8lcspaqwkprma11r4l0dhlqfmlzwbdhp9vg"; + name = "umbrello-17.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.04.2"; + version = "17.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz"; - sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015"; - name = "zeroconf-ioslave-17.04.2.tar.xz"; + url = "${mirror}/stable/applications/17.08.0/src/zeroconf-ioslave-17.08.0.tar.xz"; + sha256 = "16zw9gsd89qaadhlii5c5wjfd75c1jf9ivg55fmmfsqc5nqzjf4b"; + name = "zeroconf-ioslave-17.08.0.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix new file mode 100644 index 000000000000..42782d449d58 --- /dev/null +++ b/pkgs/applications/kde/syndication.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kio +}: + +mkDerivation { + name = "syndication"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kio ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 2c4bc0f21284..f87bd4c11ec4 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "abook-0.6.0pre2"; + name = "abook-0.6.1"; src = fetchurl { url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; - sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r"; + sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh"; }; patches = [ @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ ncurses readline ]; meta = { - homepage = "http://abook.sourceforge.net/"; + homepage = http://abook.sourceforge.net/; description = "Text-based addressbook program designed to use with mutt mail client"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix new file mode 100644 index 000000000000..50af18ca1fca --- /dev/null +++ b/pkgs/applications/misc/alacritty/default.nix @@ -0,0 +1,71 @@ +{ stdenv, + fetchFromGitHub, + rustPlatform, + cmake, + makeWrapper, + expat, + pkgconfig, + freetype, + fontconfig, + libX11, + gperf, + libXcursor, + libXxf86vm, + libXi, + xclip }: + +with rustPlatform; + +let + rpathLibs = [ + expat + freetype + fontconfig + libX11 + libXcursor + libXxf86vm + libXi + ]; +in + +buildRustPackage rec { + name = "alacritty-unstable-2017-07-25"; + + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f"; + sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl"; + }; + + depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx"; + + buildInputs = [ + cmake + makeWrapper + pkgconfig + ] ++ rpathLibs; + + patchPhase = '' + substituteInPlace copypasta/src/x11.rs \ + --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) + ''; + + installPhase = '' + mkdir -p $out/bin + for f in $(find target/release -maxdepth 1 -type f); do + cp $f $out/bin + done; + patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + ''; + + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "GPU-accelerated terminal emulator"; + homepage = https://github.com/jwilm/alacritty; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 854408e6e3e6..dd4858cfe2ad 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }: +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }: mkDerivation rec { name = "albert-${version}"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5"; + sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ qtbase qtsvg qtx11extras muparser ]; @@ -31,6 +31,11 @@ mkDerivation rec { rm "$out/lib" ''; + postInstall = '' + wrapProgram $out/bin/albert \ + --prefix XDG_DATA_DIRS : $out/share + ''; + meta = with lib; { homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 556c1db3c836..30b8a435f906 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec { name = "antfs-cli-unstable-2017-02-11"; meta = with stdenv.lib; { - homepage = "https://github.com/Tigge/antfs-cli"; + homepage = https://github.com/Tigge/antfs-cli; description = "Extracts FIT files from ANT-FS based sport watches"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index a07e0b6db61e..350a64ba3e41 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://naihe2010.github.io/apvlv/"; + homepage = http://naihe2010.github.io/apvlv/; description = "PDF viewer with Vim-like behaviour"; longDescription = '' apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix new file mode 100644 index 000000000000..acd5ae7dd73d --- /dev/null +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, curl, netcat, python, bind, iproute, bc, gitMinimal }: +let + version = "1.17.3"; + deps = lib.makeBinPath [ + curl + python + bind.dnsutils + iproute + bc + gitMinimal + ]; +in +stdenv.mkDerivation { + name = "bashSnippets-${version}"; + + src = fetchFromGitHub { + owner = "alexanderepstein"; + repo = "Bash-Snippets"; + rev = "v${version}"; + sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r"; + }; + + buildInputs = [ makeWrapper ]; + + patchPhase = '' + patchShebangs install.sh + substituteInPlace install.sh --replace /usr/local "$out" + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out"/bin "$out"/share/man/man1 + ./install.sh all + for file in "$out"/bin/*; do + wrapProgram "$file" --prefix PATH : "${deps}" + done + ''; + + meta = with lib; { + description = "A collection of small bash scripts for heavy terminal users"; + homepage = https://github.com/alexanderepstein/Bash-Snippets; + license = licenses.mit; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix new file mode 100644 index 000000000000..78ac55088a4c --- /dev/null +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, pythonPackages +, pkgconfig, autoreconfHook, rsync +, swig, qt4, fcgi +, bitcoin, procps, utillinux +}: +let + + version = "0.96.1"; + sitePackages = pythonPackages.python.sitePackages; + inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted; + +in mkPythonDerivation { + + name = "bitcoinarmory-${version}"; + + src = fetchFromGitHub { + owner = "goatpig"; + repo = "BitcoinArmory"; + rev = "v${version}"; + #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; + sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; + }; + + # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. + #patches = [ ./shutdown-fix.patch ]; + + buildInputs = [ + pkgconfig + autoreconfHook + swig + qt4 + fcgi + rsync # used by silly install script (TODO patch upstream) + ]; + + propagatedBuildInputs = [ + pyqt4 + psutil + twisted + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + makeWrapperArgs = [ + "--prefix PATH : ${bitcoin}/bin" # for `bitcoind` + "--prefix PATH : ${procps}/bin" # for `free` + "--prefix PATH : ${utillinux}/bin" # for `whereis` + "--suffix LD_LIBRARY_PATH : $out/lib" # for python bindings built as .so files + "--run cd\\ $out/lib/armory" # so that GUI resources can be loaded + ]; + + # auditTmpdir runs during fixupPhase, so patchelf before that + preFixup = '' + newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|') + patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB + ''; + + # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after + postFixup = '' + wrapPythonProgramsIn $out/lib/armory "$out $pythonPath" + ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory + ''; + + meta = { + description = "Bitcoin wallet with cold storage and multi-signature support"; + longDescription = '' + Armory is the most secure and full featured solution available for users + and institutions to generate and store Bitcoin private keys. This means + users never have to trust the Armory team and can use it with the Glacier + Protocol. Satoshi would be proud! + + Users are empowered with multiple encrypted Bitcoin wallets and permanent + one-time ‘paper backups’. Armory pioneered cold storage and distributed + multi-signature. Bitcoin cold storage is a system for securely storing + Bitcoins on a completely air-gapped offline computer. + + Maintainer's note: The original authors at https://bitcoinarmory.com/ + discontinued development. I elected instead to package GitHub user + @goatpig's fork, as it's the most active, at time of this writing. + ''; + homepage = https://github.com/goatpig/BitcoinArmory; + license = stdenv.lib.licenses.agpl3Plus; + maintainers = with stdenv.lib.maintainers; [ elitak ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index e67480fb3c7a..196db45d9057 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pygtk ]; meta = { - homepage = "http://bleachbit.sourceforge.net"; + homepage = http://bleachbit.sourceforge.net; description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 335d0031b32c..b831924d9cdf 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; - homepage = http://www.blender.org; + homepage = https://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 37cb027aa36c..6ca457cc1d37 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.3.0"; + version = "3.5.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; + sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv"; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ - src/{chardet,cherrypy,odf,routes} + src/odf ''; dontUseQmakeConfigure = true; @@ -49,11 +49,11 @@ 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 lxml mechanize netifaces pillow + apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead - chardet cherrypy odfpy routes + odfpy ]); installPhase = '' @@ -90,6 +90,9 @@ stdenv.mkDerivation rec { substituteAllInPlace $entry done + mkdir -p $out/share + cp -a man-pages $out/share/man + runHook postInstall ''; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 587a20b2704e..05c058f8a83e 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://cgg.bzatek.net/"; + homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index efe2b2863ace..1aeb45f1e206 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca"; + sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index be6989b7e33a..a46565eb76ba 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/cdrtools/; + homepage = https://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ gpl2 lgpl2 cddl ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 8f2d7c4f17f2..d4884bb1709e 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { monitoring, (over)clocking and fanspeed support for bitcoin and derivative coins. Do not use on multiple block chains at the same time! ''; - homepage = "https://github.com/ckolivas/cgminer"; + homepage = https://github.com/ckolivas/cgminer; license = licenses.gpl3; maintainers = [ maintainers.offline ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index e1ed03c428de..93d7717fa5c9 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -17,6 +17,6 @@ python3Packages.buildPythonApplication rec { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; maintainers = with lib.maintainers; [ mic92 ]; license = with lib.licenses; [gpl3 mit]; - homepage = "https://github.com/chrisallenlane/cheat"; + homepage = https://github.com/chrisallenlane/cheat; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index cdde212275d7..860a1d186f71 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://github.com/dpayne/cli-visualizer"; + homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 08f654cdec4f..de18a211c450 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Offline conference schedule viewer"; - homepage = "http://www.toastfreeware.priv.at/confclerk"; + homepage = http://www.toastfreeware.priv.at/confclerk; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ehmry ]; inherit (qt4.meta) platforms; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 48e08be54748..985a418e1582 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { feel of the old cathode tube screens. It has been designed to be eye-candy, customizable, and reasonably lightweight. ''; - homepage = "https://github.com/Swordifish90/cool-retro-term"; + homepage = https://github.com/Swordifish90/cool-retro-term; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch new file mode 100644 index 000000000000..f21105763de9 --- /dev/null +++ b/pkgs/applications/misc/copyq/cmake-modules.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d910299e..69888477 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -99,6 +99,7 @@ endif() + + # Qt modules + if (WITH_QT5) ++ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script) + qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules}) + else() + set(QT_USE_QTNETWORK TRUE) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 7461f6853f47..4fd30c547b5c 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: +{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git +, webkitSupport ? true +}: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "2.9.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; + sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; }; + patches = [ + ./cmake-modules.patch + ]; + nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 libXfixes libXtst ]; + + buildInputs = [ + git qt5.full libXfixes libXtst + ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; meta = with stdenv.lib; { homepage = https://hluk.github.io/CopyQ; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 6b22f3b27ee8..fefa45760d5c 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://ctodo.apakoh.dk/"; + homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index e33edfb0a440..3fb669072955 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { name = "cura-${version}"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp"; + sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd"; }; buildInputs = [ qtbase ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ]; + cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://github.com/Ultimaker/Cura"; + homepage = https://github.com/Ultimaker/Cura; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 08df0cc3e903..ce7109dd6fcd 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm"; + sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://github.com/Ultimaker/CuraEngine"; + homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index e145bbe22e78..1e024a16e81c 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 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/"; + homepage = https://github.com/linuxdeepin/deepin-terminal/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 907c9d612b85..53344595f783 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { cmakeFlags = "-DQT5BUILD=true"; meta = { - homepage = "http://dfilemanager.sourceforge.net/"; + homepage = http://dfilemanager.sourceforge.net/; description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 60bd5134e8ac..cfe76701cebb 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { ++ [ keybinder ]; meta = with stdenv.lib; { - homepage = http://launchpad.net/dockbar/; + homepage = https://launchpad.net/dockbar/; description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 221bd3c4bf5e..919ad10fa706 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,32 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, which, perl -, cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto -, librsvg +, pkgconfig, which, perl, gtk2, xrandr +, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver +, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "knopwob"; + owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk"; + sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b"; }; - patches = [(fetchpatch { - name = "add-svg-support.patch"; - url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch"; - sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x"; - })]; - nativeBuildInputs = [ perl pkgconfig which ]; buildInputs = [ - cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext - libXinerama libnotify libxdg_basedir pango xproto librsvg + cairo dbus gdk_pixbuf glib libX11 libXScrnSaver + libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 95cae316a711..4b81bfd53f50 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://eaglemode.sourceforge.net"; + homepage = http://eaglemode.sourceforge.net; description = "Zoomable User Interface"; license = licenses.gpl3; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 34f403fda892..4aaa5f1ff67d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.8.3"; + version = "2.9.0"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1"; + sha256 = "1lida5phq0c1lxnk75d9jsps0vw4zy7saaxhv0q4kv76rk2b3fhv"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix new file mode 100644 index 000000000000..65df422599ca --- /dev/null +++ b/pkgs/applications/misc/ephemeralpg/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, postgresql, makeWrapper }: +stdenv.mkDerivation rec { + name = "ephemeralpg-${version}"; + version = "2.2"; + src = fetchurl { + url = "http://ephemeralpg.org/code/${name}.tar.gz"; + sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz"; + }; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out + PREFIX=$out make install + wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin + ''; + meta = { + description = ''Run tests on an isolated, temporary PostgreSQL database.''; + license = stdenv.lib.licenses.isc; + homepage = http://ephemeralpg.org/; + }; +} diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix new file mode 100644 index 000000000000..23b2a57ea33e --- /dev/null +++ b/pkgs/applications/misc/et/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }: + +stdenv.mkDerivation rec { + name = "et-${version}"; + version = "2017-03-04"; + + src = fetchFromGitHub { + owner = "geistesk"; + repo = "et"; + rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6"; + sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s"; + }; + + buildInputs = [ libnotify gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig ]; + + installPhase = '' + mkdir -p $out/bin + cp et $out/bin + cp et-status.sh $out/bin/et-status + ''; + + meta = with stdenv.lib; { + description = "Minimal libnotify-based (egg) timer for GNU/Linux"; + homepage = https://github.com/geistesk/et; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 386601f39bbc..6344f40a2911 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Terminal emulator"; - homepage = "http://www.eterm.org"; + homepage = http://www.eterm.org; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch new file mode 100644 index 000000000000..68a16b196fa3 --- /dev/null +++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch @@ -0,0 +1,157 @@ +diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc +new file mode 100644 +index 0000000..1bd9bb5 +--- /dev/null ++++ b/colorer/configs/base/hrc/nix.hrc +@@ -0,0 +1,132 @@ ++ ++ ++ ++ ++ ++ ++ ++ Nix ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc +index 11e493b..2a67263 100644 +--- a/colorer/configs/base/hrc/proto.hrc ++++ b/colorer/configs/base/hrc/proto.hrc +@@ -156,6 +156,14 @@ + + /\.(w?lua)$/i + ++ ++ ++ /\.(nix)$/i ++ ++ ++ ++ ++ + + + /\.(rb|rbw|ruby|rake)$/i diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 87709ec102bf..1097780723ec 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,21 +2,23 @@ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: stdenv.mkDerivation rec { - rev = "ab240373f69824c56e9255d452b689cff3b1ecfb"; - build = "2017-05-09-${builtins.substring 0 10 rev}"; + rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed"; + build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q"; + sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ]; + patches = [ ./add-nix-syntax-highlighting.patch ]; + postPatch = '' echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An orthodox file manager"; - homepage = http://github.com/elfmz/far2l; + homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 2b193ef42cd2..6cfd1e05279e 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation { makeFlags = "INSTALLDIR=$(out)"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6 + patchPhase = '' # don't try to use ccache substituteInPlace makefiles/arch/desktop.mk \ --replace "CCACHE = " "# CCACHE = " - + substituteInPlace fbreader/desktop/Makefile \ --replace "/usr/share" "$out/share" ''; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 88475dd761e1..5cd8f572ad48 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl.dev}"; meta = { - homepage = "http://www.fetchmail.info/"; + homepage = http://www.fetchmail.info/; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 053cdd059916..add46f8871d5 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -42,12 +42,12 @@ stdenv.mkDerivation { postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = { - homepage = "http://finalterm.org"; + homepage = http://finalterm.org; description = "A new breed of terminal emulator"; longDescription = '' Final Term is a new breed of terminal emulator. diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 23d0d682176b..f70042884a8a 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Database administration tool for Firebird RDBMS"; - homepage = "https://github.com/mariuz/flamerobin"; + homepage = https://github.com/mariuz/flamerobin; license = licenses.bsdOriginal; maintainers = with maintainers; [ uralbash ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 950ce210c063..939b38ca29f7 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://wammu.eu/gammu/"; + homepage = https://wammu.eu/gammu/; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7585ef6710a3..cef8640d958f 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/girara/; + homepage = https://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' girara is a library that implements a GTK+ based VIM-like user interface diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 8654e7f3a261..b9cbf8064a07 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: with stdenv.lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; @@ -20,23 +20,23 @@ stdenv.mkDerivation rec { # Makefiles are patched to fix references to `/usr/X11R6' and to add # `-lX11' to make sure libX11's store path is in the RPATH. patchPhase = '' - echo "patching makefiles..." - for i in Makefile src/Makefile server/Makefile - do - sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" - done ''; + echo "patching makefiles..." + for i in Makefile src/Makefile server/Makefile + do + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" + done + ''; - installPhase = '' - make DESTDIR=$out install - ''; + makeFlags = [ "STRIP=-s" ]; + installFlags = [ "DESTDIR=$(out)" ]; - meta = { + meta = { description = "Themeable process stack of system monitors"; - longDescription = - '' GKrellM is a single process stack of system monitors which supports - applying themes to match its appearance to your window manager, Gtk, - or any other theme. - ''; + longDescription = '' + GKrellM is a single process stack of system monitors which + supports applying themes to match its appearance to your window + manager, Gtk, or any other theme. + ''; homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 0b6ebe06b88a..509a54881cce 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { programs that need to ask a user's password to run another program as another user. ''; - homepage = "http://www.nongnu.org/gksu/"; + homepage = http://www.nongnu.org/gksu/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 6c712db01a5a..3be2704896ed 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; - homepage = "http://sourceforge.net/projects/gmrun/"; + homepage = https://sourceforge.net/projects/gmrun/; license = "GPL"; maintainers = []; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index a86cf268801d..dfe61b57b43d 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; - homepage = "https://gmtp.sourceforge.io"; + homepage = https://gmtp.sourceforge.io; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.pbogdan ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix index c4f8be88bb51..e2cf8245ce67 100644 --- a/pkgs/applications/misc/gnome15/default.nix +++ b/pkgs/applications/misc/gnome15/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of tools for configuring the Logitech G15 keyboard"; license = licenses.gpl3; - homepage = "https://gnome15.org/"; + homepage = https://gnome15.org/; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix new file mode 100644 index 000000000000..68b494927915 --- /dev/null +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub +, armadillo +, boost +, cmake +, glog +, gmock +, openssl +, google-gflags +, gnuradio +, orc +, pkgconfig +, pythonPackages +, uhd +}: + +stdenv.mkDerivation rec { + name = "gnss-sdr-${version}"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "gnss-sdr"; + repo = "gnss-sdr"; + rev = "v${version}"; + sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + }; + + buildInputs = [ + armadillo + boost.dev + cmake + glog + gmock + openssl.dev + google-gflags + gnuradio + orc + pkgconfig + pythonPackages.Mako + + # UHD support is optional, but gnuradio is built with it, so there's + # nothing to be gained by leaving it out. + uhd + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DGFlags_ROOT_DIR=${google-gflags}/lib" + "-DGLOG_INCLUDE_DIR=${glog}/include" + + # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as + # armadillo is built using both, so skip checking for them. + "-DBLAS=YES" + "-DLAPACK=YES" + + # Similarly, it doesn't actually use gfortran despite checking for + # its presence. + "-DGFORTRAN=YES" + ]; + + meta = with stdenv.lib; { + description = "An open source Global Navigation Satellite Systems software-defined receiver"; + homepage = http://gnss-sdr.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 8218285c5fbb..e10cb30d1874 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do + for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do wrapProgram "$file" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index cc8dbde273b6..db2b453913f4 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s "${gnuradio}"/bin/* $out/bin/ - for file in "$out"/bin/*; do + for file in $(find $out/bin -type f -executable); do wrapProgram "$file" \ --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ + (map (path: "$(toPythonPath ${path})") extraPackages)} \ --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} done diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 4322b4088436..7315c0a8d724 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -3,43 +3,43 @@ GEM specs: charlock_holmes (0.7.3) diff-lcs (1.3) - gemojione (3.2.0) + gemojione (3.3.0) json - github-markup (1.6.0) + github-markup (1.6.1) gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.1.1) + gollum (4.1.2) gemojione (~> 3.2) - gollum-lib (~> 4.0, >= 4.0.1) + gollum-lib (>= 4.2.7) kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) useragent (~> 0.16.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.5) + gollum-lib (4.2.7) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 2.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 2.1) sanitize (~> 2.1) stringex (~> 2.6) json (2.1.0) kramdown (1.9.0) mime-types (2.99.3) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) mustache (0.99.8) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) posix-spawn (0.3.13) rack (1.6.8) rack-protection (1.5.3) rack - rouge (2.0.7) + rouge (2.1.1) sanitize (2.1.0) nokogiri (>= 1.4.4) sinatra (1.4.8) @@ -47,7 +47,7 @@ GEM rack-protection (~> 1.4) tilt (>= 1.3, < 3) stringex (2.7.1) - tilt (2.0.7) + tilt (2.0.8) useragent (0.16.8) PLATFORMS @@ -57,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.15.0 + 1.15.3 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 160b38463b6a..4ad32c5fd7f5 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, Git-powered wiki"; - homepage = "https://github.com/gollum/gollum"; + homepage = https://github.com/gollum/gollum; license = licenses.mit; maintainers = with maintainers; [ jgillich primeos ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 2ad724b2bc7a..cff774d7daa0 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -16,22 +16,24 @@ version = "1.3"; }; gemojione = { + dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; github-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; @@ -40,14 +42,16 @@ version = "2.8.1"; }; gollum = { + dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; @@ -56,12 +60,13 @@ version = "1.0.1"; }; gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; type = "gem"; }; - version = "4.2.5"; + version = "4.2.7"; }; json = { source = { @@ -90,10 +95,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; mustache = { source = { @@ -104,12 +109,13 @@ version = "0.99.8"; }; nokogiri = { + dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; type = "gem"; }; - version = "1.6.8.1"; + version = "1.8.0"; }; posix-spawn = { source = { @@ -128,6 +134,7 @@ version = "1.6.8"; }; rack-protection = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -138,12 +145,13 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.1"; }; sanitize = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; @@ -152,6 +160,7 @@ version = "2.1.0"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -170,10 +179,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.8"; }; useragent = { source = { diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index fe58fa92d07b..4143f6fde559 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -19,11 +19,11 @@ in stdenv.mkDerivation { --replace "alias echo=/bin/echo" "" substituteInPlace ./src/config.c \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \ + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \ --replace "/usr/bin/vi" "vi" substituteInPlace ./mdp.1 \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" ''; # we add symlinks to the binary and man page with the name 'gpg-mdp', in case # the completely unrelated program also named 'mdp' is already installed. diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index ace89cd8a21b..0911fbace449 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.3"; + version = "1.5.4"; - src = fetchurl { - # gpgbabel.org makes it hard to get the source tarball automatically, so - # get it from elsewhere. - url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; + src = fetchFromGitHub { + owner = "gpsbabel"; + repo = "gpsbabel"; + rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi"; }; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qt4 which ] + buildInputs = [ zlib qtbase which ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { # The raymarine and gtm tests fail on i686 despite -ffloat-store. + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. - + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test"; + + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test" + # The arc-project test fails on aarch64. + + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 07fcf31ed263..a51ec8c1b044 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Application for viewing, editing and converting GPS coordinate data"; - homepage = http://activityworkshop.net/software/gpsprune/; + homepage = https://activityworkshop.net/software/gpsprune/; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 16147715705e..6da16545aa71 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp"; + sha256 = "0jk99yhrms1wzqpcnsjydcl2nysidv639s2j7l53yp60g0zz8174"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 3fda4d8881af..5ad03c88c64f 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Some of the code comes from the Cutesdr project, with a BSD license, but # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; - platforms = platforms.linux; # should work on Darwin / OS X too + platforms = platforms.linux; # should work on Darwin / macOS too maintainers = with maintainers; [ bjornfor the-kenny fpletz ]; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 5db5b25947e6..85d95c7b3f92 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK+-based audio CD player/ripper"; - homepage = "http://nostatic.org/grip"; + homepage = http://nostatic.org/grip; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index e92cd4cdaccd..1b8257ca5e59 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb }: +{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }: stdenv.mkDerivation rec { name = "hackrf-${version}"; - version = "2015.07.2"; + version = "2017.02.1"; src = fetchgit { url = "git://github.com/mossmann/hackrf"; rev = "refs/tags/v${version}"; - sha256 = "1mn11yz6hbkmvrbxj5vnp78m5dsny96821a9ffpvbdcwx3s2p23m"; + sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv"; }; buildInputs = [ - cmake pkgconfig libusb + cmake pkgconfig libusb fftwSinglePrec ]; - + + cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; + preConfigure = '' - cd host + cd host ''; - + meta = with stdenv.lib; { description = "An open source SDR platform"; homepage = http://greatscottgadgets.com/hackrf/; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 481e21079518..dc771fc2d5e4 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/donnemartin/haxor-news"; + homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix new file mode 100644 index 000000000000..0b679617243d --- /dev/null +++ b/pkgs/applications/misc/houdini/default.nix @@ -0,0 +1,14 @@ +{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: + +let + houdini-runtime = callPackage ./runtime.nix { }; +in buildFHSUserEnv rec { + name = "houdini-${houdini-runtime.version}"; + + extraBuildCommands = '' + mkdir -p $out/usr/lib/sesi + ''; + + runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; +} + diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix new file mode 100644 index 000000000000..b3ce98895e6f --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -0,0 +1,86 @@ +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }: + +let + ld_library_path = builtins.concatStringsSep ":" [ + "${stdenv.cc.cc.lib}/lib64" + "/run/opengl-driver/lib" + (stdenv.lib.makeLibraryPath [ + mesa_glu + xorg.libXmu + xorg.libXi + xorg.libXext + xorg.libX11 + xorg.libXrender + xorg.libXcursor + xorg.libXfixes + xorg.libXrender + xorg.libXcomposite + xorg.libXdamage + xorg.libXtst + alsaLib + fontconfig + libSM + libICE + zlib + libpng + dbus + ]) + ]; + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + version = "16.0.671"; + name = "houdini-runtime-${version}"; + src = requireFile rec { + name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; + sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r"; + message = '' + This nix expression requires that ${name} is already part of the store. + Download it from https://sidefx.com and add it to the nix store with: + + nix-prefetch-url + + This can't be done automatically because you need to create an account on + their website and agree to their license terms before you can download + it. That's what you get for using proprietary software. + ''; + }; + + buildInputs = [ bc ]; + installPhase = '' + patchShebangs houdini.install + mkdir -p $out + sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install + ./houdini.install --install-houdini \ + --no-install-menus \ + --no-install-bin-symlink \ + --auto-install \ + --no-root-check \ + --accept-EULA \ + $out + echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt + sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe + sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup + echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh + echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh + echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh + echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh + ''; + postFixup = '' + INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" + for BIN in $(find $out/bin -type f -executable); do + if patchelf $BIN 2>/dev/null ; then + echo "Patching ELF $BIN" + patchelf --set-interpreter "$INTERPRETER" "$BIN" + fi + done + ''; + meta = { + description = "3D animation application software"; + homepage = https://sidefx.com; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.canndrew ]; + }; +} + diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 78f3c2f391b9..ba04bd5c39de 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ncurses ]; meta = { - homepage = "https://github.com/dvorka/hstr"; + homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 27757e4e31ae..2b0be1c9030d 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.25.1"; + version = "0.26"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz"; + sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index ff832d4961f5..240983b3c716 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; - sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } { @@ -35,15 +35,6 @@ sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; }; } - { - goPackagePath = "github.com/bep/inflect"; - fetch = { - type = "git"; - url = "https://github.com/bep/inflect"; - rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; - sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; - }; - } { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { @@ -76,8 +67,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; - sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; + rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; + sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; }; } { @@ -85,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/fortytw2/leaktest"; - rev = "7dad53304f9614c1c365755c1176a8e876fee3e8"; - sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m"; + rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; + sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; }; } { @@ -103,8 +94,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; + sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; }; } { @@ -112,8 +103,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc"; - sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb"; + rev = "8aac2701530899b64bdea735a1de8da899815220"; + sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6"; }; } { @@ -143,6 +134,15 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } + { + goPackagePath = "github.com/jdkato/prose"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/prose"; + rev = "c24611cae00c16858e611ef77226dd2f7502759f"; + sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + }; + } { goPackagePath = "github.com/kardianos/osext"; fetch = { @@ -152,15 +152,6 @@ sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; - }; - } { goPackagePath = "github.com/kyokomi/emoji"; fetch = { @@ -175,8 +166,17 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; - sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; + rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; + sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + }; + } + { + goPackagePath = "github.com/markbates/inflect"; + fetch = { + type = "git"; + url = "https://github.com/markbates/inflect"; + rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; + sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; }; } { @@ -184,8 +184,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "f809cc9d384e2f7f3985a28a899237b892f35719"; - sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd"; + rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; + sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } { @@ -220,26 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; - sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "a5f8514e29e90a859e93871b1582e5c81f466f82"; - sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd"; + rev = "69d355db5304c0f7f809a2edc054553e7142f016"; + sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; }; } { @@ -247,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; - sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; + rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; + sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; }; } { @@ -283,8 +265,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; - sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; + rev = "34594c771f2c18301dc152640ad40ece28795373"; + sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; }; } { @@ -328,8 +310,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; - sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; + rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; + sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; }; } { @@ -337,8 +319,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; - sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; + rev = "05e8a0eda380579888eb53c394909df027f06991"; + sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; }; } { @@ -350,15 +332,6 @@ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "850760c427c516be930bc91280636328f1a62286"; - sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; - }; - } { goPackagePath = "golang.org/x/image"; fetch = { @@ -373,8 +346,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; - sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; + rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; + sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; }; } { @@ -382,8 +355,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; + rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; + sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; }; } { @@ -391,8 +364,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; - sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; + rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; + sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; }; } { @@ -400,8 +373,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; + rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; + sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; }; } ] diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index bce5b6cf5897..e27b9dc43eb7 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; - homepage = "http://ikiwiki.info/"; + homepage = http://ikiwiki.info/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index d26ad94648aa..ed8573b88507 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jbidwatcher"; - version = "2.5.2"; + version = "2.5.6"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; - sha256 = "07w75ryn8inm5i1829gabr8lifbycz40ynzsyaw22yzqk5if1n9l"; + sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr"; }; buildInputs = [ java ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.jbidwatcher.com/"; + homepage = http://www.jbidwatcher.com/; description = "Monitor and snipe Ebay auctions"; license = "LGPL"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b53a49d584d6..e03abb8bf95a 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 = "12275"; + version = "12545"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a"; + sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix deleted file mode 100644 index 486d3fb7ddf7..000000000000 --- a/pkgs/applications/misc/k3b/wrapper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }: - -let - binPath = lib.makeBinPath [ cdrtools ]; -in symlinkJoin { - name = "k3b-${k3b-original.version}"; - - paths = [ k3b-original ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/k3b \ - --prefix PATH ':' ${binPath} - ''; -} diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 2a4793bfe09c..b37d12c362f5 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "kanboard-${version}"; - version = "1.0.44"; + version = "1.0.46"; src = fetchzip { url = "https://kanboard.net/${name}.zip"; - sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn"; + sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a"; }; dontBuild = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Kanban project management software"; - homepage = "https://kanboard.net"; + homepage = https://kanboard.net; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 5e43486b0752..e64632d529b1 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -1,14 +1,17 @@ { stdenv, buildEnv, fetchFromGitHub, mono }: let - version = "1.8.4.1"; + version = "1.8.4.2"; drv = stdenv.mkDerivation { name = "keepasshttp-${version}"; src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; - rev = "${version}"; - sha256 = "1074yv0pmzdwfwkx9fh7n2igdqwsyxypv55khkyng6synbv2p2fd"; + #rev = "${version}"; + # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff + # afterwards and didn't move the tag), hence reference by commitid + rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; + sha256 = "0bkzxggbqx7sql3sp46bqham6r457in0vrgh3ai3lw2jrw79pwmh"; }; meta = { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 57f6cfc4c4b4..e36fbfa0f3f9 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.35"; + version = "2.36"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz"; + sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 030b1d326e1d..f6814119b5a7 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = http://www.keepassx.org/; + homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b88291194eb6..6ae86486b47b 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 + cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras , withKeePassHTTP ? true }: @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; }; - cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); + cmakeFlags = [ + "-DWITH_GUI_TESTS=ON" + "-DWITH_XC_AUTOTYPE=ON" + "-DWITH_XC_YUBIKEY=ON" + ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); doCheck = true; checkPhase = '' @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { make test ARGS+="-E testgui --output-on-failure" ''; - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ]; + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; 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."; diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index d0bddbc16102..ed706b138cc5 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = http://www.keepassx.org/; + homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 1b2cf94d173d..e013754e097e 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,4 +1,5 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras }: let version = "0.6.0"; in @@ -14,7 +15,8 @@ mkDerivation { buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem + qtx11extras ]; meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index b537c378a71f..f0c86fb67dbe 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { It allows you to focus on specific skills and exercises, on both theory and aural training. The different activities can be customized to meet your needs ''; - homepage = "http://www.lenmus.org/"; + homepage = http://www.lenmus.org/; license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 0d5ee9790875..964617e20f1e 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; - homepage = "http://www.lyx.org"; + homepage = http://www.lyx.org; license = licenses.gpl2Plus; maintainers = [ maintainers.vcunat ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 5d7a89060fab..787f97ac1b11 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.95"; + version = "0.7.97"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m"; + sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index a2c521817572..38888b0ebdc6 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.95"; + version = "0.7.97"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m"; + sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index b8ccbe77cf5b..9f98376a51bc 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; - homepage = http://github.com/yuejia/Milu; + homepage = https://github.com/yuejia/Milu; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 391440f86229..c95f935b8555 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,16 +6,16 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.2.3"; + version = "2.4.2"; # fetchgit used to ensure submodules are available src = fetchgit { url = "git://github.com/irtimmer/moonlight-embedded"; rev = "refs/tags/v${version}"; - sha256 = "0m1114dsz44rvq402b4v5ib2cwj2vbasir0l8vi0q5iymwmsvxj4"; + sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ cmake perl ]; buildInputs = [ diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 8e39c258333a..24a8b0c46a64 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2 ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; - homepage = "https://github.com/EliasOenal/multimon-ng"; + homepage = https://github.com/EliasOenal/multimon-ng; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a3e5f99eef66..da5f3c3bf128 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; postInstall = '' diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index 2acb15b6a0b7..55cd17c2c0b5 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Free opensource web browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index f64fbe8528b6..74e7c694ea46 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Build system for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 9db681bf5c19..536dbbe80d32 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Cascading Style Sheets library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index 9287ee9a0841..71445fd17a0c 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Document Object Model library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index ef319e950894..3e9210589ea9 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "HTML5 parser library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index 44f644e162b9..040f1c558839 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "BMP Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index 234bb43798e6..c627a769bbb5 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "CSS parser and selection library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index 09ec6c6ecc34..a834d77c8eb1 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "GIF Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index 9d931d6bea2e..a18f91ba2647 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Generalised utility library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix index 275c2cccaefa..ed9433b9f570 100644 --- a/pkgs/applications/misc/netsurf/libparserutils/default.nix +++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Parser building library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index b2057e1889fa..63052e080a5a 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "UTF8 Processing library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index edcc45ca0fa3..509cbeb4503f 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "String internment library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix index 0985a1825201..971e16848ae7 100644 --- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = http://www.netsurf-browser.org/; description = "Generator for JavaScript bindings for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index a6bcff066262..04f10de3d274 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; - homepage = "https://nixcloud.io/tour"; + homepage = https://nixcloud.io/tour; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix new file mode 100644 index 000000000000..dd27409742f2 --- /dev/null +++ b/pkgs/applications/misc/nnn/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "nnn-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "nnn"; + rev = "v${version}"; + sha256 = "0w9i9vwyqgsi64b5mk4rhmr5gvnnb24c98321r0j5hb0ghdcp96s"; + }; + + configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline ]; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "Small ncurses-based file browser forked from noice"; + homepage = https://github.com/jarun/nnn; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 45b704a5f47a..7c8eab9f11e8 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -54,13 +54,13 @@ let in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk"; + sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2"; }; # We need old Tornado @@ -69,7 +69,7 @@ in pythonPackages.buildPythonApplication rec { semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future + scandir chainmap future dateutil ]; buildInputs = with pythonPackages; [ nose mock ddt ]; @@ -90,13 +90,14 @@ in pythonPackages.buildPythonApplication rec { -e 's,werkzeug>=[^"]*,werkzeug,g' \ -e 's,psutil>=[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ + -e 's,future>=[^"]*,future,g' \ setup.py ''; checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = "http://octoprint.org/"; + homepage = http://octoprint.org/; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 8bc4a22bc923..c09e8d2f5e66 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,22 +12,17 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.17"; + version = "1.20"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh"; + sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767"; }; patches = [ ./m33-fio-one-library.patch - # Fix incompatibility with new OctoPrint - (fetchpatch { - url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch"; - sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d"; - }) ]; postPatch = '' @@ -39,7 +34,7 @@ let ''; meta = with stdenv.lib; { - homepage = "https://github.com/donovan6000/M33-Fio"; + homepage = https://github.com/donovan6000/M33-Fio; description = "OctoPrint plugin for the Micro 3D printer"; platforms = platforms.all; license = licenses.gpl3; @@ -59,7 +54,7 @@ let }; meta = with stdenv.lib; { - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; description = "Show printers status in window title"; platforms = platforms.all; license = licenses.agpl3; @@ -69,17 +64,17 @@ let stlviewer = buildPlugin rec { name = "OctoPrint-STLViewer-${version}"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; rev = "v${version}"; - sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi"; + sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0"; }; meta = with stdenv.lib; { - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + homepage = https://github.com/jneilliii/Octoprint-STLViewer; description = "A simple stl viewer tab for OctoPrint"; platforms = platforms.all; license = licenses.agpl3; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix new file mode 100644 index 000000000000..0aba5106387d --- /dev/null +++ b/pkgs/applications/misc/ola/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd +, perl, python3, python3Packages +}: + +stdenv.mkDerivation rec { + name = "ola-${version}"; + version = "0.10.5"; + + src = fetchFromGitHub { + owner = "OpenLightingProject"; + repo = "ola"; + rev = version; + sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; + }; + + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; + propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ]; + + configureFlags = [ "--enable-python-libs" ]; + + meta = with stdenv.lib; { + description = "A framework for controlling entertainment lighting equipment."; + maintainers = [ maintainers.globin ]; + licenses = with licenses; [ lgpl21 gpl2Plus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 1985b6448846..000af950bf12 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "make install prefix=$out"; meta = { - homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; + homepage = http://fabrice.thiroux.free.fr/openbox-menu_en.html; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' Openbox-menu is a pipemenu for Openbox window manager. It provides a diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 5016acfff124..be355652ecea 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to edit resource files (BRF)"; - homepage = "https://github.com/cfcohen/openbrf"; + homepage = https://github.com/cfcohen/openbrf; maintainers = with stdenv.lib.maintainers; [ abbradar ]; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 696232c9f8d6..056649ad3d26 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.kragniz ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; - homepage = "http://opencpn.org/"; + homepage = https://opencpn.org/; }; } diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index aceeae87d085..148dd427fbc7 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +let + libfm' = libfm.override { inherit withGtk3; }; + gtk = if withGtk3 then gtk3 else gtk2; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "pcmanfm-1.2.5"; src = fetchurl { @@ -7,10 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; - buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + + configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { - homepage = "http://blog.lxde.org/?cat=28/"; + homepage = http://blog.lxde.org/?cat=28/; license = licenses.gpl2Plus; description = "File manager with GTK+ interface"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 87c4df3446ed..65366607c50c 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }: +{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation { name = "pcmanx-gtk2-1.3"; @@ -7,14 +7,14 @@ stdenv.mkDerivation { sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; }; - buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; + buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ]; preConfigure = '' ./autogen.sh ''; meta = with stdenv.lib; { - homepage = "http://pcman.ptt.cc"; + homepage = http://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; maintainers = [ maintainers.mingchuan ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 919935a41ee5..ba4a57a191c3 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/PdfMod"; + homepage = https://wiki.gnome.org/Apps/PdfMod; description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index fba7b6371f67..15313befb628 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }: +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; @@ -22,11 +22,28 @@ stdenv.mkDerivation rec { "--with-libxslt=${libxslt.dev}" ]; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; - homepage = http://www.pgadmin.org; + homepage = https://www.pgadmin.org; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar wmertens ]; platforms = platforms.unix; }; + + postFixup = let + desktopItem = makeDesktopItem { + name = "pgAdmin"; + desktopName = "pgAdmin III"; + genericName = "SQL Administration"; + exec = "pgadmin3"; + icon = "pgAdmin3"; + type = "Application"; + categories = "Application;Development;"; + mimeType = "text/html"; + }; + in '' + mkdir -p $out/share/pixmaps; + cp pgadmin/include/images/pgAdmin3.png $out/share/pixmaps/; + cp -rv ${desktopItem}/share/applications $out/share/ + ''; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 026a1289fb61..e88a49740745 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,6 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm +, xcbutilwm, xcbutilxrm, fetchpatch # optional packages-- override the variables ending in 'Support' to enable or # disable modules @@ -32,13 +32,21 @@ stdenv.mkDerivation rec { description = "A fast and easy-to-use tool for creatin status bars."; longDescription = '' Polybar aims to help users build beautiful and highly customizable - status bars for their desktop environment, without the need of + status bars for their desktop environment, without the need of having a black belt in shell scripting. - ''; + ''; license = licenses.mit; 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/postage/default.nix b/pkgs/applications/misc/postage/default.nix new file mode 100644 index 000000000000..17f718182e2e --- /dev/null +++ b/pkgs/applications/misc/postage/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : + +stdenv.mkDerivation rec { + name = "postage-${version}"; + version = "3.2.17"; + + src = fetchFromGitHub { + owner = "workflowproducts"; + repo = "postage"; + rev = "eV${version}"; + sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl"; + }; + + buildInputs = [ postgresql openssl ]; + + meta = with stdenv.lib; { + description = "A fast replacement for PGAdmin"; + longDescription = '' + At the heart of Postage is a modern, fast, event-based C-binary, built in + the style of NGINX and Node.js. This heart makes Postage as fast as any + PostgreSQL interface can hope to be. + ''; + homepage = http://www.workflowproducts.com/postage.html; + license = licenses.asl20; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index b6d46cf9ed13..0cd0d29e2f3a 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://posterazor.sourceforge.net/"; + homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix new file mode 100644 index 000000000000..cbbac11424ec --- /dev/null +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, qmake +, coreutils, xdg_utils, bash +, perl, makeWrapper, perlPackages }: + +let + version = "1.4"; +in stdenv.mkDerivation rec { + name = "qdirstat-${version}"; + + src = fetchFromGitHub { + owner = "shundhammer"; + repo = "qdirstat"; + rev = "${version}"; + sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; + }; + + nativeBuildInputs = [ qmake makeWrapper ]; + + buildInputs = [ perl ]; + + preBuild = '' + substituteInPlace scripts/scripts.pro \ + --replace /bin/true ${coreutils}/bin/true \ + --replace /usr/bin $out/bin + substituteInPlace src/src.pro \ + --replace /usr/bin $out/bin \ + --replace /usr/share $out/share + for i in doc/doc.pro doc/stats/stats.pro + do + substituteInPlace $i \ + --replace /usr/share $out/share + done + + for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp + do + substituteInPlace $i \ + --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open + done + for i in src/Cleanup.cpp src/cleanup-config-page.ui + do + substituteInPlace $i \ + --replace /bin/bash ${bash}/bin/bash \ + --replace /bin/sh ${bash}/bin/sh + done + substituteInPlace src/StdCleanup.cpp \ + --replace /bin/bash ${bash}/bin/bash + ''; + + postInstall = '' + wrapProgram $out/bin/qdirstat-cache-writer \ + --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}" + ''; + + meta = with stdenv.lib; { + description = "Graphical disk usage analyzer"; + homepage = src.meta.homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix new file mode 100644 index 000000000000..60a8cf2c6cd1 --- /dev/null +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, libsndfile, libmad +}: + +mkDerivation rec { + name = "qlcplus-${version}"; + version = "4.11.0"; + + src = fetchFromGitHub { + owner = "mcallegari"; + repo = "qlcplus"; + rev = "QLC+_${version}"; + sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + ]; + + qmakeFlags = [ "INSTALLROOT=$(out)" ]; + + postPatch = '' + patchShebangs . + sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \ + -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \ + -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \ + variables.pri + ''; + + meta = with stdenv.lib; { + description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; + maintainers = [ maintainers.globin ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 1a3f1399fe76..5cbf94114357 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://launchpad.net/qpdfview"; + homepage = https://launchpad.net/qpdfview; updateWalker = true; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index e8ab85121dac..f283c250b5bd 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { description = "A Traybar Application for Syncthing written in C++"; longDescription = '' A cross-platform status bar for Syncthing. - Currently supports OS X, Windows and Linux. + Currently supports macOS, Windows and Linux. Written in C++ with Qt. ''; license = licenses.lgpl3; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index f378c3529363..f3198085b9ab 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "File manager with minimalistic curses interface"; - homepage = "http://ranger.nongnu.org/"; + homepage = http://ranger.nongnu.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 0ba850a34607..8bbfbaf7cf0e 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -72,7 +72,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = "http://redisdesktop.com/"; + homepage = http://redisdesktop.com/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 64f4c1aab482..76593eba5fc4 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://robomongo.org/"; + homepage = https://robomongo.org/; description = "Query GUI for mongodb"; platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix new file mode 100644 index 000000000000..f872e8008363 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "urxvt-autocomplete-all-the-things-${version}"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Vifon"; + repo = "autocomplete-ALL-the-things"; + rev = version; + sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + cp autocomplete-ALL-the-things $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "urxvt plugin allowing user to easily complete arbitrary text"; + homepage = "https://github.com/Vifon/autocomplete-ALL-the-things"; + license = licenses.gpl3; + maintainers = with maintainers; [ nickhu ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix index f81709b97390..4f4319af6cbd 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Change the urxvt font size on the fly"; - homepage = "https://github.com/majutsushi/urxvt-font-size"; + homepage = https://github.com/majutsushi/urxvt-font-size; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix index 0c95acd72057..13e005014f10 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = "https://github.com/effigies/urxvt-perl"; + homepage = https://github.com/effigies/urxvt-perl; license = licenses.gpl3; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 82c4f310352d..544789e865b5 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = "https://github.com/muennich/urxvt-perls"; + homepage = https://github.com/muennich/urxvt-perls; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 194bb8397fb5..68be8b738de6 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; - homepage = "https://github.com/mina86/urxvt-tabbedex"; + homepage = https://github.com/mina86/urxvt-tabbedex; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix index 8b9ffb2c8c8a..f4a41a89e1c4 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "urxvt plugin that allows to switch color themes during runtime"; - homepage = "https://github.com/felixr/urxvt-theme-switch"; + homepage = https://github.com/felixr/urxvt-theme-switch; license = "CCBYNC"; maintainers = with maintainers; [ garbas ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix index 000828ddb7fd..2f2c20558031 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; - homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; + homepage = https://aur.archlinux.org/packages/urxvt-vtwheel; license = licenses.mit; maintainers = with maintainers; [ danbst ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index f3939d3b6eba..281f2176833a 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { inherit description; - homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; + homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ maintainers.mornfall ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 66e40befe7c0..17798bb01e2d 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7"; + sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 19fc62d12380..1ed6e4d70c93 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/andmarti1424/sc-im"; + homepage = https://github.com/andmarti1424/sc-im; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index 4908769bef6e..fc63745ebb84 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MySQL database management for Mac OS X"; + description = "MySQL database management for macOS"; homepage = http://www.sequelpro.com/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index 3bb97463e5da..712b5a7e750f 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Doom editor"; - homepage = "http://slade.mancubus.net/"; + homepage = http://slade.mancubus.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/sqlmap/default.nix b/pkgs/applications/misc/sqlmap/default.nix new file mode 100644 index 000000000000..f9150eb33af4 --- /dev/null +++ b/pkgs/applications/misc/sqlmap/default.nix @@ -0,0 +1,19 @@ +{ stdenv, pythonPackages, pkgs }: + +pythonPackages.buildPythonPackage { + name = "sqlmap-1.1"; + + disabled = pythonPackages.isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sqlmap/sqlmap-1.1.tar.gz"; + sha256 = "0px72p52w76cylr68i69kz0kagmbrslgx2221yi77322fih0mngi"; + }; + + meta = with pkgs.stdenv.lib; { + homepage = "http://sqlmap.org"; + license = licenses.gpl2; + description = "Automatic SQL injection and database takeover tool"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9b3dc84bcbd5..16d6ca2e26fa 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let patches' = if isNull patches then [] else patches; +let patches' = if patches == null then [] else patches; in stdenv.mkDerivation rec { name = "st-0.7"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [viric andsild]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index 4d9f0ef3f8d5..ab890c8db718 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix new file mode 100644 index 000000000000..05e34cc5c305 --- /dev/null +++ b/pkgs/applications/misc/st/xst.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: + +with stdenv.lib; + +let + version = "0.7.1"; + name = "xst-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + owner = "neeasade"; + repo = "xst"; + rev = "v${version}"; + sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; + }; + + buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = https://github.com/neeasade/xst; + description = "Simple terminal fork that can load config from Xresources"; + license = licenses.mit; + maintainers = maintainers.vyp; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 0fe94b07450c..ebb50e685da7 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/seenaburns/stag"; + homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index fa160c51fe23..8be792c673c0 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML documents and web site compiler"; - homepage = "https://zoggy.github.io/stog/"; + homepage = https://zoggy.github.io/stog/; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 8e3b0e747ae1..2cdf047a10fc 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -4,22 +4,22 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "1dl6zmic8bv17f3ib8by66c2fj7izlnv9dh2cfa2m0ipkxk930vk"; + sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd"; }; - setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; - server = "${caddy.bin}/bin/caddy"; linkcheck = "${linkchecker}/bin/linkchecker"; nativeBuildInputs = [ asciidoctor ]; + outputs = [ "out" "lib" "themes" ]; + propagatedBuildInputs = [ file lessc @@ -30,39 +30,42 @@ stdenv.mkDerivation rec { (python27.withPackages (ps: [ ps.parsimonious ])) ]; - outputs = [ "out" "lib" ]; - installPhase = '' mkdir $out - install -D -m 777 styx.sh $out/bin/styx + install -D -m 777 src/styx.sh $out/bin/styx - mkdir -p $out/share/styx - cp -r scaffold $out/share/styx - cp -r nix $out/share/styx + mkdir -p $out/share/styx-src + cp -r ./* $out/share/styx-src mkdir -p $out/share/doc/styx - asciidoctor doc/index.adoc -o $out/share/doc/styx/index.html - asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html - asciidoctor doc/library.adoc -o $out/share/doc/styx/library.html - cp -r doc/highlight $out/share/doc/styx/ - cp -r doc/imgs $out/share/doc/styx/ - cp -r tools $out/share + asciidoctor src/doc/index.adoc -o $out/share/doc/styx/index.html + asciidoctor src/doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html + asciidoctor src/doc/library.adoc -o $out/share/doc/styx/library.html + cp -r src/doc/highlight $out/share/doc/styx/ + cp -r src/doc/imgs $out/share/doc/styx/ substituteAllInPlace $out/bin/styx substituteAllInPlace $out/share/doc/styx/index.html substituteAllInPlace $out/share/doc/styx/styx-themes.html substituteAllInPlace $out/share/doc/styx/library.html + mkdir -p $out/share/styx/scaffold + cp -r src/scaffold $out/share/styx + cp -r src/tools $out/share/styx + mkdir $lib - cp -r lib/* $lib + cp -r src/lib/* $lib + + mkdir $themes + cp -r themes/* $themes ''; meta = with stdenv.lib; { - description = "Nix based static site generator"; - maintainers = with maintainers; [ ericsagnes ]; - homepage = https://styx-static.github.io/styx-site/; + description = "Nix based static site generator"; + maintainers = with maintainers; [ ericsagnes ]; + homepage = https://styx-static.github.io/styx-site/; downloadPage = https://github.com/styx-static/styx/; - platforms = platforms.all; - license = licenses.mit; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix deleted file mode 100644 index e0bea3b23b6b..000000000000 --- a/pkgs/applications/misc/styx/themes.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ fetchFromGitHub, stdenv }: - -let - - mkThemeDrv = args: stdenv.mkDerivation { - name = "styx-theme-${args.themeName}-${args.version}"; - - src = fetchFromGitHub ({ - owner = "styx-static"; - repo = "styx-theme-${args.themeName}"; - } // args.src); - - installPhase = '' - mkdir $out - cp -r * $out/ - ''; - - preferLocalBuild = true; - - meta = with stdenv.lib; { - maintainer = with maintainers; [ ericsagnes ]; - description = "${args.themeName} theme for styx"; - platforms = platforms.all; - } // args.meta; - }; - -in -{ - agency = mkThemeDrv rec { - themeName = "agency"; - version = "0.6.0"; - src = { - rev = "v${version}"; - sha256 = "1i9bajzgmxd3ffvgic6wwnqijsgkfr2mfdijkgw9yf3bxcdq5cb6"; - }; - meta = { - license = stdenv.lib.licenses.asl20; - longDescription = '' - Agency Theme is a one page portfolio for companies and freelancers. - This theme features several content sections, a responsive portfolio - grid with hover effects, full page portfolio item modals, a timeline, - and a contact form. - ''; - }; - }; - - generic-templates = mkThemeDrv rec { - themeName = "generic-templates"; - version = "0.6.0"; - src = { - rev = "v${version}"; - sha256 = "0wr2687pffczn0sns1xvqxr2gpf5v9j64zbj6q9f7km6bq0zpiiy"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - hyde = mkThemeDrv rec { - themeName = "hyde"; - version = "0.6.0"; - src = { - rev = "v${version}"; - sha256 = "0yca76p297ymxd049fkcpw8bca5b9yvv36707z31jbijriy50zxb"; - }; - meta = { - license = stdenv.lib.licenses.mit; - longDescription = '' - Port of the Jekyll Hyde theme to styx; Hyde is a brazen two-column - Styx theme that pairs a prominent sidebar with uncomplicated content. - ''; - }; - }; - - orbit = mkThemeDrv rec { - themeName = "orbit"; - version = "0.6.0"; - src = { - rev = "v${version}"; - sha256 = "0qdx1r7dcycr5hzl9ix70pl4xf0426ghpi1lgh61zdpdhcch0xfi"; - }; - meta = { - license = stdenv.lib.licenses.cc-by-30; - longDescription = '' - Orbit is a free resume/CV template designed for developers. - ''; - }; - }; - - showcase = mkThemeDrv rec { - themeName = "showcase"; - version = "0.6.0"; - src = { - rev = "v${version}"; - sha256 = "1jfhw49yag8l1zr69l01y1p4p88waig3xv3b6c3mfxc8jrchp7pb"; - }; - meta = { - license = stdenv.lib.licenses.mit; - longDescription = '' - Theme that show most of styx functionalities with a basic design. - ''; - }; - }; -} diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index dd1218282d85..8102375479be 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -27,6 +27,6 @@ mkDerivation { jailbreak = true; description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; - homepage = "https://github.com/NorfairKing/super-user-spark"; + homepage = https://github.com/NorfairKing/super-user-spark; maintainers = [ stdenv.lib.maintainers.badi ]; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 62e66e4ad38e..009eb488d7b4 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -61,7 +61,7 @@ let dontStrip = true; meta = { - homepage = "http://www.sweethome3d.com/index.jsp"; + homepage = http://www.sweethome3d.com/index.jsp; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 7dbf1e8f2a31..37623caa1d4e 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -50,7 +50,7 @@ let dontStrip = true; meta = { - homepage = "http://www.sweethome3d.com/index.jsp"; + homepage = http://www.sweethome3d.com/index.jsp; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix new file mode 100644 index 000000000000..f9d1039a292e --- /dev/null +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: + +buildGoPackage rec { + name = "syncthing-tray-${version}"; + version = "0.7"; + + goPackagePath = "github.com/alex2108/syncthing-tray"; + + src = fetchFromGitHub { + owner = "alex2108"; + repo = "syncthing-tray"; + rev = "v${version}"; + sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ pkgconfig libappindicator-gtk3 ]; + + meta = with stdenv.lib; { + description = "Simple application tray for syncthing"; + homepage = https://github.com/alex2108/syncthing-tray; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/applications/misc/syncthing-tray/deps.nix new file mode 100644 index 000000000000..1103146ed1b7 --- /dev/null +++ b/pkgs/applications/misc/syncthing-tray/deps.nix @@ -0,0 +1,93 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/alex2108/systray"; + fetch = { + type = "git"; + url = "https://github.com/alex2108/systray"; + rev = "40e874866be2dc2c57ab031bcbde27a76b90721a"; + sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q"; + }; + } + { + goPackagePath = "github.com/getlantern/context"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/context"; + rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; + sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; + }; + } + { + goPackagePath = "github.com/getlantern/errors"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/errors"; + rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6"; + sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3"; + }; + } + { + goPackagePath = "github.com/getlantern/golog"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/golog"; + rev = "cca714f7feb5df8e455f409b549d384441ac4578"; + sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; + }; + } + { + goPackagePath = "github.com/getlantern/hex"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hex"; + rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; + sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; + }; + } + { + goPackagePath = "github.com/getlantern/hidden"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hidden"; + rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; + sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; + }; + } + { + goPackagePath = "github.com/getlantern/ops"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/ops"; + rev = "b70875f5d689a9438bca72aefd7142a2af889b18"; + sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7"; + }; + } + { + goPackagePath = "github.com/getlantern/stack"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/stack"; + rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b"; + sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; + sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; + }; + } + { + goPackagePath = "github.com/toqueteos/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/toqueteos/webbrowser"; + rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792"; + sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2"; + }; + } +] diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 9ae6bfae1166..89d493bcd016 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; + patches = [ ./openssl-1.1.patch ]; + postPatch = '' ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Share one mouse and keyboard between multiple computers"; - homepage = "http://synergy-project.org/"; + homepage = http://synergy-project.org/; license = licenses.gpl2; maintainers = [ maintainers.aszlig ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch new file mode 100644 index 000000000000..56dc6112844e --- /dev/null +++ b/pkgs/applications/misc/synergy/openssl-1.1.patch @@ -0,0 +1,18 @@ +--- a/src/lib/net/SecureSocket.cpp 2017-07-22 19:33:22.442645291 +0200 ++++ b/src/lib/net/SecureSocket.cpp 2017-07-22 19:36:25.632595581 +0200 +@@ -805,9 +805,14 @@ + showCipherStackDesc(sStack); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release +- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead ++ // of OpenSSL, it's not visible + STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; ++#else ++ // Use SSL_get_client_ciphers() for newer versions ++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); ++#endif + if (cStack == NULL) { + LOG((CLOG_DEBUG1 "remote cipher list not available")); + } diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 2a199843cb3b..2b0573f2d2d1 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "kde_locale=\${out}/share/locale"; meta = { - homepage = "http://www.taskjuggler.org"; + homepage = http://www.taskjuggler.org; license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index ae0b46d056fe..1b3ca7dfc03c 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ taskwarrior perl ncurses ]; meta = { - homepage = "https://github.com/mjheagle8/tasknc"; + homepage = https://github.com/mjheagle8/tasknc; description = "A ncurses wrapper around taskwarrior"; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; # Cannot test others diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 333ed411941b..8c7bd107c8ae 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tasksh-${version}"; - version = "1.1.0"; + version = "1.2.0"; enableParallelBuilding = true; src = fetchurl { url = "http://taskwarrior.org/download/${name}.tar.gz"; - sha256 = "0900nzfgvhcc106pl68d0v0qszvdc34yi59mw70b34b2gmkwdxzf"; + sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 841e0a494e48..74ef55ee8cc8 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/share/bash-completion/completions" ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/" - mkdir -p "$out/etc/fish/completions" - ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/" + mkdir -p "$out/share/fish/vendor_completions.d" + ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index d9046c55e12a..47cea34d4a54 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier < - #include - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 4e2a2f84b968..c20ce2cca306 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 = "26.0.0.131"; + version = "26.0.0.151"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s"; + sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bb4f9a1371b1..e80cfdbc904e 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 = "1lr8yc1inj0r0znak4rq37c9r0jhmag0ny9dqxng2jpgqq7mkp2g"; - sha256bin64 = "1yyw7i50jkgkwrgp4by83m0xwsi44bkxsyw47lrqbfzask3zazbm"; - version = "60.0.3112.40"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; + version = "60.0.3112.78"; }; dev = { - sha256 = "1xhv32bxiwz56gcbw47syl88a54x5gira4drh378zp8cwgh9pz4z"; - sha256bin64 = "18k3wml6yl2qghhnxb2w2d0k2397i0829nk0sqc38qz2sjbbvzna"; - version = "61.0.3135.4"; + sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq"; + sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1"; + version = "61.0.3163.25"; }; stable = { - sha256 = "1naqlxz9w07nlnwxkmxwf9jnxvmagj88xcjqh9r873a26wsypyl3"; - sha256bin64 = "1h086irdsjs27n7ch54hy7zbiypc4swr8wnxjha1q39wc1bpc7hl"; - version = "59.0.3071.109"; + sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl"; + sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk"; + version = "60.0.3112.90"; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index a54e5e0c3701..b056bdedb41e 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-ssl"; meta = with stdenv.lib; { - homepage = http://www.dillo.org/; + homepage = https://www.dillo.org/; description = "A fast graphical web browser with a small footprint"; longDescription = '' Dillo is a small, fast web browser, tailored for older machines. diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index bd5f757738d4..0aacbd2565b9 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 967fd1e1595c..79f56413f4cf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "55.0b2"; + version = "56.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f"; + sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f"; + sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70"; + sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c"; + sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11"; + sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd"; + sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c"; + sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5"; + sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7"; + sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993"; + sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb"; + sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a"; + sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58"; + sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d"; + sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc"; + sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d"; + sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c"; + sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5"; + sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac"; + sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54"; + sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d"; + sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539"; + sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2"; + sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397"; + sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7"; + sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371"; + sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e"; + sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c"; + sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272"; + sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db"; + sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df"; + sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7"; + sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4"; + sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de"; + sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13"; + sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c"; + sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9"; + sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3"; + sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911"; + sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad"; + sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd"; + sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94"; + sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff"; + sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4"; + sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189"; + sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84"; + sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543"; + sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85"; + sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70"; + sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849"; + sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce"; + sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77"; + sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126"; + sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa"; + sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb"; + sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914"; + sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05"; + sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b"; + sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef"; + sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1"; + sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288"; + sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5"; + sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0"; + sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c"; + sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8"; + sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008"; + sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6"; + sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004"; + sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa"; + sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc"; + sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e"; + sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e"; + sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7"; + sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d"; + sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc"; + sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c"; + sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b"; + sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a"; + sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039"; + sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593"; + sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79"; + sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2"; + sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124"; + sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4"; + sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d"; + sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183"; + sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0"; + sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d"; + sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327"; + sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3"; + sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d"; + sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a"; + sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a"; + sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd"; + sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8"; + sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc"; + sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f"; + sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487"; + sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517"; + sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5"; + sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2"; + sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477"; + sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b"; + sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba"; + sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c"; + sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a"; + sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75"; + sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2"; + sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4"; + sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247"; + sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64"; + sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe"; + sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738"; + sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d"; + sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32"; + sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153"; + sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5"; + sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e"; + sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7"; + sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644"; + sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde"; + sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22"; + sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd"; + sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102"; + sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90"; + sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779"; + sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918"; + sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65"; + sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814"; + sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b"; + sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7"; + sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c"; + sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b"; + sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c"; + sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37"; + sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e"; + sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2"; + sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27"; + sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098"; + sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757"; + sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e"; + sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7"; + sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca"; + sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b"; + sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248"; + sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937"; + sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c"; + sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f"; + sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0"; + sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747"; + sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510"; + sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d"; + sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4"; + sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57"; + sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086"; + sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c"; + sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389"; + sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b"; + sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0"; + sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6"; + sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea"; + sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f"; + sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106"; + sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071"; + sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48"; + sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b"; + sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4"; + sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7"; + sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97"; + sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c"; + sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35"; + sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556"; + sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9"; + sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9"; + sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21"; + sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156"; + sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d"; + sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd"; + sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65"; + sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21"; + sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea"; + sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef"; + sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458"; + sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4"; + sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7"; + sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29"; + sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e"; + sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7"; + sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb"; + sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19"; + sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a436cd46a11e..2da11eac98d1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "55.0b2"; + version = "56.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2"; + sha512 = "42b7889e0358946f0852079433eb84ac49b88eacd5baa1213082fff71a8bb2b060b50b6356c20cb2b59ebeaffc245f04ed086a4fe466886f5865c857f99b9ce4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4"; + sha512 = "c784881efa9b4ebb8e5a892a4d9fed02f85f541461e6fc8065d9a6a8db629636e00eaea7d1cb009005de829387a4c5614465e696ecba66af2516cfbff35f6d82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78"; + sha512 = "8440277fcbf3b927ee5bddeb572d55ef2f23997016f8cd5b21e88d969cd863a3ed7076d9cacdec4939e58ec2bc706099a322336c2fd4b796435165d55f206112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b"; + sha512 = "4cc24cf7ae84bdb9520ebd6816a46c6311ea92dc50c2fd8fdbb4eb2384bb45357b9dbef641ffd5be1ff4fcbbd23b2fbe53d68136717fdd3031564309cffbc2ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7"; + sha512 = "2d0d1f5fbff86c7e0f53ed4c721e6b2e1bc8169aa5a2c75f4752347614da669b3d097e68e62b0b53373c408818ea01fc9716a7a0b1932f6ba7273d6f31fb99aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975"; + sha512 = "fc7f099bb283540974eff2dfbec5fb212b3a27aa09be8d04ff847d99fa37183435f296cae389fe4161c436d3005935acbdbe00373c54cc5d18b140f26c3d829b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66"; + sha512 = "557ddac93830536ace4fba1ab634e1eee14fa3c09c3dd95a16c169437f8c255d5eee4ee54791d8fa1f97123b9ebbf91a57cb70cb4fdb61b8805c2252f1640329"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74"; + sha512 = "420b8d556a0b6364e48eb04eab3e29a63c63f52942384c0d9ae19532754b51c98bb0b8d19c871c92d8d9127cd289dd0a74c30e7167d86e32d378a7820bcee184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b"; + sha512 = "b63385545d6d006e0febe92a835ad4b809a24bcc9c44d356bdfb2338819e6430d0c73922a45fcbd6fc076362794daf7a68a9662aecab6e610a518ac604757910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac"; + sha512 = "3d4754940f51a21bc3e881bc454349ed9bd6cec84395566d76d1dccd8c8464cb8e485f35d1e920c7ec0ec93304c16d3d323a94a00f3ffffaf5fdbce46da24da4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b"; + sha512 = "fe16eb336eaadca6c73ef1655011ec8acfa3d4166f21909ffba109fd90190810b66ef3519d172b0f963f41776616ab41b25dceb8f9a6b775c8df5f305f6f1555"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c"; + sha512 = "17b0a958074d4db010410fc2278a8a2a4777fa68c8796b28f70d0b65ffc341de283ea6b89410c5228482cb920ca21031784d4e7a3afc01c8ed0b0412bbca8cfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e"; + sha512 = "536f92ea3b7b390414bbc9178d855fb3783d5659ff165d6846b5233dc9e46fd46323783342f939b8daa2489be4df7f3f33859f629437693dcfd3fdd982192905"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616"; + sha512 = "f7b36fcba699aef0438192bbcc13cb6426b69036f1256c07422e78df45220960dd122f9eaf62984041c142f2fc16f858561d9efaa509852696d0c869f097df8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b"; + sha512 = "6c4abfb4873d08ff30ed48612e536106522dd39921da4e3303d752f468e64552a77a65631474e2e2342d1f6dc4ed94ba74b2c6c0bd15dc559468195c2ff3e95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f"; + sha512 = "be8c3a83f0d74f7860603ba0665cac831d787eacc427f8bd42ea118409ae9f1866a75ce06a4bf88c732847e9df5cdaef33ccd25d9dcfb5b6795af2bb5f83c971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291"; + sha512 = "a5473c8f20f36d755ec01feaaf62281f199041b1bc938c7477bc4205c488265457fba6d204f7dddcc67f37e1c92ae2bd312a8406a3aea0a34e50ed3dda364a20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a"; + sha512 = "0408c697dc971b6eb5225a3038a79c18fad96a75ed87e3f061665d00baf27c05e060835b3b77393bd50247c1a13ffc2314805460bf5d5f881ad0a48ceeb090fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a"; + sha512 = "1c93a760f4847163841dded76414669bc94aafddcd4b1b366f72db92e10575dbd52612ff5c906449dff510ae108f13cf39e6e836071c1d4b173dd211a98bc874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d"; + sha512 = "622bd1d9399e6be83c1d03a8a99b31ae1561c45a2bd1a62677c0298408125cb54df7e76df7b26ab741590ac7dfde9e0df0c3b8e202e0267ef775705b73fd4299"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf"; + sha512 = "c716d48bf2ba9eb8e2ba6d15d96a0378478937594376da77699e4239ca7b410d8088b97eb7a2076f05611348b6376c5fd1219166ab81d84022f958b1febae751"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27"; + sha512 = "b19aa13d69cbbc5d63e4e6f819d6ad888a686a07a6b62b8ee2c745fc8fb4d7340dfbd3fc31b2a7e4f23be1e187a15455e0a5a3a9065b759e574f7c9c756917dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c"; + sha512 = "613dc9d25997f80927b6b7b850fdf9b4287497bff2446a490274faf99a4fabd2b2b6140bce560f8edb5dc1f3da09a9a855547afcbace3ffcf2172befca74a0e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268"; + sha512 = "c0f5506e770d57bd5f5bbe84c89126e835833c059dd064b2b4af3aa31514d0223cd3b3bbc23fd99828c9dd07bbe63eab89415667ba1b269a2db2c90d165f492c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b"; + sha512 = "ff63cea657e4e78caf74a0382624accc1f4f4870af36a8b425df305e71a84d605bc2fe2c91636130053092518763fb2ad0eb2e2c73ff443b1c05fe0c31f892c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40"; + sha512 = "00c89d9dce0deffb2fa536172e040f4f75f170c8427aa3bffd5c1bc526af45b439c28e1973db1a3ce459e5fdee40a0c817b5580b9cfc68f85259cc27feea6b09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a"; + sha512 = "6aa8d504e2aaf86dbae7f637921e8e354f63e98f59be261f80256544cc5568c6f8c616fc72948bdc1d30cff62dd36513c838fae9207a8b7eadd7b20e5fa017aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b"; + sha512 = "ac3494d7704c2962cd4c00d5fce1fa9581f0565dd5f6dd90eec1638237956f8204dc68b590ce75e5ce6961d786a7e722d5ad0dccf036bfd51ffac530a8f56519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a"; + sha512 = "6fdbb08c25feec44b38e6b4beafde422fc04bfc1c54e049a1b863c8fa4954a2b1ebfa5a4d26c507e83b446d2b836d922f4c6cbb71f77cf616c7088470e73bcc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba"; + sha512 = "317b05efdf3e14b907d7240d8102a2a826d2906a52bf83ecbef8f184d813af7b764521b2c884e70e29f50c23074b41d4887dfbab9b6fcbdb54c022cf2d16ccff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05"; + sha512 = "7a81f3320c8adb613f80074a95cc877589eeb8b5ea47408fe526641059ac3c70c8b6a381db2f8b1c575acd2aaa857499277ee6a0b0e294038c4d29800bbd469b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8"; + sha512 = "86a5c82dab2766fa00991409fe28f81ec0d2ed0ac67b9854c5a78e55677e58b223edc13a4e122397eecc34b46bd5dac80d3e61d3f35eaf1a49ca544193de3a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6"; + sha512 = "349863d7a8a3b2637296422fa750f72fc14df88c944c06f8ad1e8dbb3215a7d5106a331691712127a5229a48eebb090c750b9fece25da5c34261e9ee64c2eec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b"; + sha512 = "83687fd94ef6ce5def8dc427b08e50b1c0a41f97b81c6d7ffb83863aecd3f97f3c3f6301a4d5f5c1ea8833d72e41d67955bd4664502e6cf75b4b327e98fe0552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397"; + sha512 = "2527eb06212a1e1063f91fc59af54ec427ef1d23ca9d1f1f4232be964679ad33bcfbf7acda4e3c3ced32f584761f7f506c2744552877fe3db35a36387d995263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef"; + sha512 = "7a64a19cd37c1059fd338790d8aed3b9d0f9319ff8075567b98f721a2c3f2cac9dd09f5a678bd8f4792580bef2558a858bfc6ce33afb8bbd8c40afc3f85cceb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f"; + sha512 = "8b29fe1838e333ac3704994865bf61b11b99b8f91b46fffea30047232b8bee3589f4f27ca392a64abcdb902042ddb4cd0860dba97577a062f21f4cd994d63366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1"; + sha512 = "979009a44710a0206a035bd752b2c61f2178a354a692b327028cd5896a18ae4357955303dbea9326393bd993e9b088fd587d82917fc89c93a45275bdce3f3079"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3"; + sha512 = "8a6826171d549fc69cd63e6916e9c4abe10c76d0f1c149e6282c48e6f6895726d41714e8c83b4a5128bd9790bb45f186bc4dfee03f06e22d18be859cf31cad66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b"; + sha512 = "8009c5297c726346ab7c24bb88ad4a7a4466dd19f01a526e1786887115600b06b37a2b80449ac1ae207f2f4c07b6a2343f349a7c314c7b7d1e934769bde47a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c"; + sha512 = "329ed99e9553ccf99f5cc0d1f69c1c1aa931ad12720c2d3f340e2e139d35f142d97fe8ca43f1ea80b2d366379d46f8ca0ccc2e774ba9f9f1ee1b67599e794627"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060"; + sha512 = "f2623131ed9451d74ade849c33bb04b38ba3d555e06ee45a5b82ca4f6eefe55a4797e5d53231916bbe3589ac277387a103aa9675a32ca372af53b4778cb44133"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681"; + sha512 = "33f35fbf42679b48911ab20189d470daae6c31f767fb0359ce674ddd72150013dbeadc9a3a73a116a4d39b725cc54622b3fd19e84e5b388edbe2efb9231e53af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d"; + sha512 = "4ef717da1b5ada94ab5d41d529605de22270f5d9f037b7bf3f19703cde55b6757fe396c087692faa0fbc500a60a4a6562f8fbb9c36e3deb859601c967c68f112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b"; + sha512 = "2bdb5e05436c24c0c4b856f2d2feffc32165240b2b7943ea5a7c93f46b1068eb21bdeac2605ab35d40ce596c9aaabd8809523a3cf768615eb6c03d9661ab815d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46"; + sha512 = "81cdebd0af73a7b8983e2de296f12244a6b0a92be865d0fbe089d74af127663cc3003e822bf525316bb14664ccfa3412b7424069d1b7abd17ce1e54cd5f66c7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5"; + sha512 = "f4f0e9009478904018eed8fcb6da30fa5607b5b00ee7521aa290dd13ae52e616e5903ea22e6e40f87340e3740b3d415b53bfd415ad288d601ced9318585667f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20"; + sha512 = "75da4e9be3ecce3227a3a914d9e5da90de8d4abcf49a4eb1c119d842a97a6cb789b703d3199ede4ca03502fc9e0a940c1829c85eea6adb7fbb4456d71838c39f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169"; + sha512 = "6a3d0d38f257571c865295a6b3542c1bdb8de2344c5402b8f46a85adfeb367444fd1c693611f7b0fe7160a7552086d0d2b0247fa7757d19df1eb8375f2655b06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b"; + sha512 = "650239200182d14069faf4557ccd02f155af0c954e1aee11909c648067421fc27f8334fb038a60eb9c0fc661edc0bd43e7a87ce345a4580bbfde798c5ed301cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a"; + sha512 = "da783d020fec47024e27049a163c415ad050e65d0194324bcbd1faf9005b03fe02c2e1349855c8e00301a13a5507ce3bfce58506f375a4276fb912dece622229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147"; + sha512 = "4934648edf61441922dae1703ea70b5c670e798955891961432709ec04feb46280ee8cd924f37ebe4244f069d3d3f9d6dea71d09100fe7e11652e30a9c16508f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac"; + sha512 = "82f28e1309b49921e735f0bc3818664c912877ff6608161f7ce86ee821857e321cbea7db52b8e640fe989d5b52c2b5069506b0af68e6fb89660b79e7c5cda95e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50"; + sha512 = "befd1cda746b5c795584e066883835d16cdbfbac14e5e919140fb0ff2d695f0f793f7f27fcb60f2d98ba9c9df0f2c3323b72decc6aab8b40e64d7fc2a9b01314"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb"; + sha512 = "c302d0da1baeb0c96e134c40b97c1fc095223c45916496074857a39a16f8505c929a6eb2d73cfd679b99298b305c061734426177d5c7f72e616c3cc792179e67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2"; + sha512 = "0318de8cfa51d459cf852a073d064fd3a129c081897a35bc2e1e456bf5149b305a80f2a01389f271c844db786c4ce00feea6b011ab3c7fe0f5102b73a65bfb8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df"; + sha512 = "747fcd8849372aec24c6a0c25a9e8df28d1afd6255f60be64d050204fd72bfed385f11dc3ca6d721bfe05b13d13b0b0b45343c75a7bba5950042d5984ffbb831"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916"; + sha512 = "102a20ffef4e3720f0cec2ec9d5803a8f5abbd66c99195729929225acbe292f92f4e505119f1207a5d0d1b0a148b3b484bb22174acfd6d6d79b464ad3c61be70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725"; + sha512 = "23e3efe3f8fd80907e685090f82305cac2be37c7f8a38c840b392d3f5eb7ba3a607bbb35c4a6c6191c401c6247d1f8c4ba2b32cc857c848aa8d4d380e41c6808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf"; + sha512 = "9b784af41d5be080cefeeaeb4519bf0f25a9c201853fe078cd91e6074c678cad8ba69c1bf2c1dd018f41dc6c645dd3b7bafebd402a04f2fda93a05a0019b1d94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0"; + sha512 = "d61f3668ba4c7187b00fdef5a3bc46601c90a148be468ce021a42b3218f9a30bd8f4780e80fedd98d7e1133ea0e899ef02dcf2d715688a6e384aa7db542337bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63"; + sha512 = "79d34cc870eb41c5d709d52b16b448b7e2d6f35877957e2173cdaa6f66dc889fa489258cf7b0bed1e7e87b187199eba799396e65bdcfcbf1d0ec0b258b2665f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1"; + sha512 = "9fcf038b2f891d62ed7b26fec3bcdbecbcf530756f38887c4f1a71c58cb2fc82af9320b03cfbdb5762c80eae7620fa0116f32d22fca5186e7a1b2738ad0d71d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca"; + sha512 = "cfa9eef24205cec3d1b4a6ce58f4814d33d9806ae885702d3c0ea96994126ad9d79caa7551780f3581db0de7802f7e4cc666fd9d5bd55dc7da64fe4d5dbadc2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a"; + sha512 = "0be1321aa5aba417b5ef27c1b6ddbbf10d915cfb3ebc6f70a7473f31284a4f6ecd7ad61ef27156fa8b6008598b0aae3b3b272ae4f0db2ff477083e037616efd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc"; + sha512 = "ea25f3df7053cb85b3cef5b3428c1e023e6631c7fb836421e5afb9794913057feac1083e08385ec595c7fe9ab578aa5c8728dff9f338f4d1aff09697c0985c60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7"; + sha512 = "6eb487bff2f942fc7c319551eb2558973235cf05cb47e5a8b7273c0cd2d9162ae96345aa3dcd38710d4169f84fbb5ff28aa16277d98a4aa0864c9608f98b8f89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366"; + sha512 = "20587b5fa98ac42adc9b83c704c5c9eda0bd2b0c40475b71d11f289c14c5df3e7811c4b4661d82baa99436ef143dd8185d2fc30bfdb8eb4c64ff72c5986c3df5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45"; + sha512 = "c231055deea74c29c30a79be5e592cc5ce21aacbc3bb53d8d7a35ff5f6ddf7624e6d4f3257c7fc2c99bcd2f22359c38ce10508f31b786bed90c9f68c3e916c6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7"; + sha512 = "092bcdfcb26c272dfdcea1a8b05745fec1d6d41c6b8ed930f44d7bbd83cb190857ec58e084ab602ee2499ef73743a4a6582e1f53b59151285978a9a1e64f2d35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5"; + sha512 = "31d2ba332a534e7d8763a7413bdd24643313712635d050183aee8524612a9f122a5acbf89c674d69dc609897942f3613c9cf8fac7b92e1c22863cb54fbc0aa70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0"; + sha512 = "4180fc65b77aed5c93d6622da562e9fe7a6bc7af70747795bb37427e822c1e007b1be6fb3d50a12fc3f90e459d2e687403cb3f2df7320d6381795149977f6a1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8"; + sha512 = "2d2defaee8947f5177603f60e21499aa4f192ac8a6ae53060d51bcc418654cb95cb20fdfebc052fdcfb397109b868a35c6ba8419886a499736e5655784607693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238"; + sha512 = "05da355fd644ced4c3aaf54e2f6f1a11f07d2952edf9511c60fb699e4bf5ba195044387d2687b4fa3a5b5413dda3d91acd6ffb28ba6e2b7210ed00ae5bcd2eac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167"; + sha512 = "dd2bd357d4652008b5f07d318b32383d8d30c6324482aa7fb52c3e821d4b3ac162ec26e5f521f661416356b87d013ed50da9612eb43b5fc3b95e37cdc25fdfa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f"; + sha512 = "ef8cf533b848e7e6bd0859506b964632ab9497bb70755f957c5ab61d64c87ecba173cb871e35b35e090682d34b424ee90514062a429deac68bfaafe561195b51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b"; + sha512 = "ee6a95e2a69980170adaf7c60dd23764deeb86f171142985733e967f8ad7e842a58ebddad5e828ab308872f40955a3e53bba1f818b38b075f531289fdbea795c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5"; + sha512 = "fa4287dc50567a52441f583eb0e12c4de4064a51b12e80c195f1a583dcbcae51f4b8b45804080c2437999123581f24a490df25cb27aa563e47ae05a135a21748"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050"; + sha512 = "d4110c9bc7eed9f037145afb5399a88565e0d94430ac56cc8ba8aa3640ceaecef0fb31cae7add7e893b6f223dffee62578f5243cba944cb157328a6d69768b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826"; + sha512 = "bb06ac7d7a6f38e67061a83d6eb76b86a45a37f3c77e805dced9db8c6329c404acefc4e688d8a05c962f911996617a1430b66d2dca0334bd861ba841775b2225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74"; + sha512 = "8fc6940edb2a41e9bc2a0474a3302434a754a185a5c71be3b702112a5683e348dc9045ad95f7c0babdaabbd5737ac8954238b6db81b870fb0987626fc4e4ce6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65"; + sha512 = "2c0da802929f7961b517ce6028fbdbb4191e0387ff175cee08663581539d7dfba71617304f2b7fcc3045f8e30a3427a7a5d749bb641c18a90ec515cbc8dd1437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752"; + sha512 = "92f51e7aef94bab43fd58b16f17cc3a9086ff754d039783e2829adb3dc5df2d9e39256221ba1576299da79c17b735f0f51046edefb4886a022cc23314a831b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14"; + sha512 = "2e9806909a770d44da18b381d428ce2ca27d0808fe1d39e698c0ce5cf48505ef248f236f8f38ff66fe5d98dadaf516d0c62f3071dc1ddb0955356a9bae3a8af6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f"; + sha512 = "bea6475ad949b4dd35dcbee67e4d1a8d462cd04eaa8ed637b8dc7b7dd386c7eb51d7e7469282bd3d5ad368cb50adc16a888421a1bb6ebed2d6b8892c96f30c8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9"; + sha512 = "37db9e889edeecc36bdc313941f96abaa96c8a584a58f2b43abcaa8843cd5fd25d4abbb345c567f129f34d67eafb1d5c2cebbf3c4ca9139a8f9377f847a7ebc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3"; + sha512 = "15f011ea725e90c2750ed7949a33109f08f44816d722762c6e3692d2570d2bb4671c861dc20a8b0b091bb0b00c11baee6bf449dba818dd5fffeaacda9fee08b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75"; + sha512 = "5313c9dbedee7483215285d3909568e988fdf13ce6039d2eefcbf75754a644136a155f442112e7e19df9983d83ce349dfe5eececa4b45971db72fb2fbed80f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7"; + sha512 = "4a127bdd6284fe3b8eea6ce8f5b22cb46f5e1ac066186cbd90afbd8419ed7d0d31b786f210c0a3c0fe2a2b327e2cf6b2f73b45a829b9c5d092eb2e048178da82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260"; + sha512 = "755842ae826e377e33c767971c43a62ac6953f58ff2d23f0109e13bfaf608757603902d2576665f605192e1094504eb02df0636b5f666ea84eacf956ddee2841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724"; + sha512 = "34d5f4446ae341433b0aefd7a76d3e9d6125c60d28480eb70ecfba5d7a7060e1dcc085b088eaa7ecd7d0e6814be8ed9fead537c46b404426976ba21d2d9436d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4"; + sha512 = "272544bd42a3d22f3598884c906d1ba31df7e4b4debd55aa02110a05af74a0544e5c7fcff8937c9671b25c1637f8de399fe82eb0798ddbe40618b4a020c9c53e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b"; + sha512 = "ad0aa5402a6ffd28516d428e6f11a8aa84c68291f6722bd35776b27a8359b70466833f504db181ac5d13f8f3ba9fb87df118b5a82b473ad9a5c752b76cf1ccc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182"; + sha512 = "348779865bf610de937e073b364e2e384792bda2d5d6932187717f9ab1af547efe6483fc6b09e9bd72bd3bad908507d3bd67c13d196dc7e1857f6f658dfd6361"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1"; + sha512 = "3c444d575c000b34f8c536a48688f35166bda3b9702841c9f023430089919cb9c368ab0507e4949e3258a50fd3915fe21963e3c39a29644d4313698e9ec8ceb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187"; + sha512 = "f42a579de711981143832279c2dada8aa915ede2f9e601fc4d5c15b2c6497dda9c6d651fc6b9865e7827dc4f4b2da944f245dc97a73db27ec8b7aab74ee17f9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14"; + sha512 = "8075a2593835c69f9e2b97b0fd311355cfab0257351684e0c4dd2c3fa8105aa63a946dcf196f4dc3256883fb360c4474560be1846cc06b23058da5d87935e658"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144"; + sha512 = "18247733d65e0cf282b38ac1b52370b9e0053951d726c283adf4b52738dad9633f9a670a65dd1fbf6d84802ed4cfee26adf19c05abcfe1787c3cab3d11ba7794"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea"; + sha512 = "a15777a29eddc3dcd3d9e7de970faaa10321ad991eb82956887533c9a414b6dc0e6eec6797996b5b1c286c387c5a8b01df28fbb4a5efa485712ed8c9477ccffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59"; + sha512 = "5a2d3cdb707ccd9c663613e177832318517e66de05e825da66935a3756a07cd2aaeae6adb196cd6a305202a3b4990e6dde1b7e4b30144023fcf9e4b77c55f0ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d"; + sha512 = "08d9e6cc8a58895569667f42b6684cf342d2bc015a49f7a5ccf09f26384e7194833a3c0380385d8d0d4b1ad104c74f549ff94d03dcaf7f97cd9722e454a3a14f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556"; + sha512 = "327e8ed170e1d571eae445b1206c83a7c25b4c09437d7d96f88fca5d95946ed0fe1c9c44a3776490e339050f9ac050378e9fd79819409e4432feb2d1e130ec89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98"; + sha512 = "ca96078fe9eb12c9acdbb315addca23aca87a923d51edeace03263ced2eab68a985030360a36af8f4843aa4f2af02609ad39517689a9ef219d29080f12605f34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5"; + sha512 = "92fd642c41c4b5874e02829c155f6ee7a1f11779b35f43c446bacc36febdfdb415e7d30e6039c4f70df3fd7635a9f187863b249e2a352b60796d1c0bec300d9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472"; + sha512 = "c3ecd61ffe1177d786491eda2c776bdc136a36e756d083aebbd3add157d27f4c736fe953e2065956a13203acfe95ebfa4eb0a65c8518423b34a74ceac8248d80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee"; + sha512 = "bb21a47a80862251a8d5120133bbdad67490572d794f1a7d76ffba77f8cdc9029066c176f2b423b8ec49342b390c35d95c29039044165b874cde42a852eca727"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885"; + sha512 = "fc9342c239310ccc8231b25707e5a7598cd4d77aad3990feed5c48750c677c3fe4354279cc39cf367a872f25c9ba95c805cff9193d13aff801d95b9c5d5f70a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e"; + sha512 = "3f8da7b739effdf144d2b2d104d27501575452fa20a07419910dc8fa8f2b8a92ef421c3d774e8032a2f234ca95c55efd28e8d99347f7afcdc59f5eaa5dc6ff29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b"; + sha512 = "1c1f8a7886de815c14da3586e9dfee316f05ad9943e9c952ca44b098786a0f721a89e9ee566f2bc08c664636558006cfefe5823053dc4f23065e636056b3b5c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9"; + sha512 = "9992fb1ccf287e3858ac6686a43b7515370f8043fa2c2fcc814bb1ba49106f1b83fe8d8abc72df43f3008b8cea56f97254e0360a0cc4808e923515bca53dc3ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a"; + sha512 = "e6c99e5533e988c10615286bf3bbb588ac9854ddff12690537cbe64cf209ad5512649690463f61b7d08bcb57ef246191c8c4d697f6de80248fd8eb72e0518c0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d"; + sha512 = "92cee85be1caee2c9221dae96a5989aeec61451ba3ea6923c7ef713a56b168d871f78bf993685f1e6e56cf13b47aae067070eb9f08d58304722ecc57663b89b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec"; + sha512 = "7491a8d2523dcee7c7b9e2ae7ff43edf179cea94dd078d447cb8346ccc1a2053ba01edb5083a8b616e67fb5c53b88ce8c63ea9efa0ddd309a104750360c27ad9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585"; + sha512 = "32bc1d2d6e0702360296accc324836a61cc68611cdaf01abee71d151f02044d467b985e4ea998bed6a8bfd30fe9fff30f55b271a15c9cd3ff94f493b3157a2b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b"; + sha512 = "fa09fd3afcefc4df3854f599d5077652561b7763dd54c0a95db2107b19146c74152f9059fc9e54844c9b31ec26e1392534dadf1ae592aaa170ba3bb8ef8ed0e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e"; + sha512 = "1d95c37d13df3b04f21780fe9cf95b70115adb4f647a720083ed00e6bfcbdaf26f62e9a265cc524b852a7c44b68fa4d37ac08db070eeec1fc3cfaba1fe83184b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d"; + sha512 = "09b6f11cba4862647d37278ebd7f9f2e8105e0392130b6d30f722f3d06c75f108abc509354a7bcf1da4d4709af76dacbb66a56d5a7d0733a4f2287202a40351b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714"; + sha512 = "0461eb469f6e1ddd9f32f3a970b6afae3e551d72f14397d1f6955defff87d8ecf2bf2cff47a84f7989f23c4943466b09ab47bae1bc2849691fad87ce8f62c318"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0"; + sha512 = "d5864881455d7ca5cc9dcf032e5ab786f6e7e9cf900aae7ba40061dc0df526c29767e792515e35c7bdfcbf71b9163d85a7b80e03b0865d36e5d5dc524c4ebd05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15"; + sha512 = "4a16209388b1ff42c355a8b0af3c9340035854deea138ebc206cfbc610ac07e18b7099f18c67d59f45104a754919ad3ce65975f94fb2fd8c1b22389c7af676a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3"; + sha512 = "df195bf219be42563df30fd59504b1721d77db945adee200e8c8b9af7aceeb3ab2a4f2a3cb5a1707a862441f580a3d6cb02beb0bae5ef8cf677c0b20da2b3e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381"; + sha512 = "9d5d54c44c019de98838ee5dceec8632d5944ea00d88de42c983e7b01e14b1a3e7fc390a16a60bb4fc00333bf862a58efe8079c9b57b2957c4020e49bcba0bb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd"; + sha512 = "3e02e852544d0f78d2e842ec38cce1d9e43440d04fd4b8e43932ae184b43a8e3ffa21a85c76d0d506235f871b695cbbe277d07d4ee3eef2c997843e5a170af89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4"; + sha512 = "b9d1450d16ca587ba9fbf4000bdfd528ba3932785b63e948211f6f1fbbdcfce7898739ec6aa2d76a3464a1802393f45841167598f5a933b3800940d432a6b12b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989"; + sha512 = "68de6b9772aa4caa43f48025e145c70bd685a0f14bfc87de0668d6617f8f38be7871528e30a79ae42d86c998f8a36ee3455b4434bfaf76fd86760a3150eb6ac1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f"; + sha512 = "a1b1476ceb14e9a8732a5d52e114f3413d012538b4d41e601a6824b2c71346c5e1bef236c3b02a2104859b431fbe1bcf9d2c9ed9d5a616a6b17db8dbf58185d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5"; + sha512 = "b063e2b73a0a8bebd7476b60b0a15fa3a80d6aa5fa51b68aa7bc964d21278ecbdac306ba2be1df06bdb205c396e5cc1253adef47ad395720e1938cbe30208f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17"; + sha512 = "8a60c7640e7adda279b33d3c5e8c3981bd197118d38adcee7d9c053902680e329533c256c7361f2c7626f55d3550de193997e7212055338da8959b821c95289f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6"; + sha512 = "9845de20dab7f981f3762c983244f1c812768a40ef7fbea61f12df2fba80fd6664166d1376559a73edf6783b558d443b95f2840207ef4b6653012f2bfcb50fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a"; + sha512 = "21ed69aa109aa0931b6a3fade415df4347e3a387ddd8efa2dd0789c7bba5f74d1242b59df2641d8b968cb2edad19b24a370fcbf322d382ff60c7f7bfb3565b70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185"; + sha512 = "2e04e3f247cd3941748c71c63f35a7a328b7920f9ebec417a7b48457ca6b4c900e14139fc921a1e6a9dd5e9d766a35a5241849f20a5e1abd3ee96fdbb28ed48e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2"; + sha512 = "4d129d34f70069fb82f50dfe9987192b2f32186f6b9ec7497abafde3c02c65724ffefdef360cc27c39bcc77117bc373a516703dde68af5b1907713060cceeecf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605"; + sha512 = "41f29605f42672f0c178b5efcd3f20f647647c84a0b6a0cf814712758b41aed844517452c421592d6d44a7f2b1924eeae71092bce70c1862517cf776fc563739"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4"; + sha512 = "4004eb49e097e9e5e135b2d6d13a637a7c8eabcc8b181c068d8fc2b6991129820ceab18a13e4e3054b8486b9a0a3a6fa4a3246d4af21e51052438dc77bdf230b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656"; + sha512 = "b66153345fb4e611a476275fcb43d4742468fc83e1a109b30aebdbf86b8e661d06f29c950a265d4e929f949415f902f80ad5d418f3fd9a0c310d2ba7d7b8dd86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b"; + sha512 = "446760799bc1b453e1f1d1be21076cd7164f96a2d2628e8e6d48304d2c03df939e43ef66b97405196a9879eeb07deb728985d7c4fd0c021558121627d5f94145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3"; + sha512 = "73fa828925f54f3bf1447e81230543909bbe5af400ffad5c1af54ea20aa8f24a7c7c98d75e92e391a9b5f2bba41fec85a54f161528a0aac418e2bba8b63954a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7"; + sha512 = "bf5f891911d699de47349b6dc8ef1fea3d4e6ff1ea243e50b615035ddee991d94f57bc2eb191bac15e899c63037c976adb051f8c03a10fa0b170041b36f79a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531"; + sha512 = "e840ce4d1fdc373b22f3b8b6b33ed86ed19721d5f8fb52dd550f75d71ee6204d0baaf4856f090a710c622c5279944421f0efbba0bede9350055a4cba95e5bef1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262"; + sha512 = "139d7d9d831cd89b3f9db005b1e93908c5a0d3e7bc77923cd2ea78ae3443c26fb8458c3ddb5055f381f99e9851002c0929f058869aaedea2accb2f616917b1df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f"; + sha512 = "7e121659835fb0b175f5b19fa3a6049285ff8ad87309572eed8616e3f418591311dce94f724ff6bdac34bc5480f656fbe54b1202d900d7bd73f034fd06f766f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77"; + sha512 = "db9f64ae24566a158bb27525ea5f6623a433f4c59b78601d289d42d8b8d128ad8957cef953ed27f6af93b91cb01752cc010af398869693940030a3ef8534a903"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747"; + sha512 = "413933af7bcd519529140a6609d0ce179140477bada96bbd5863f4f5159dd322ca0951b5e5401afdd1865e5f1aeb01ce6c535b121a002d8cf00db55c2a2fbdb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80"; + sha512 = "6ba6a3f75ecff44391690b5f720159e86095eb7c5cae34bec0e9986071a8a4bc31cd03941c46ba40852fa6689f0b241d117f76ffefbef9c85c519bbcfb4246c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a"; + sha512 = "489893f4dedad8a3ac628454bdd2452aede7f37748d4af32b2ad5a1d1da4703c19c9718811d3ab6eb47becf4be60bb18c3c97476983a70cb135136839504616e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044"; + sha512 = "d2e45cdccd321f8056e7b092f07cfc5da8150b96ec4d9eacb42c391c2b38ec4ab38f9467c4f5fab7608da606d2d87b94c20b5306cd4aaf881aec353348fc7574"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20"; + sha512 = "06cdbd6010fe2e0017dbaa9c0bd8b84a6133d607837afc3eb35488bbd0459c0ebee50e4352afa218bde546315cf0aeee3a34b9dfc00b03fbf6f6e3c205735030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6"; + sha512 = "d2944780c51ae3641ae51d34e082222692352c75b1c85bfad15cf97b3083fea3b8f3f39938d35bd6d452d102321d1b598c30e85fa576eac32bc623e37e36c432"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519"; + sha512 = "eae250b6981a4b932dfab0cce9f31fea9ae32ffdee5021346362ad3151421948db9781cf8b98b2c77becb4541047d7d0cdbbda731aa24b7827374078a575ba55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c"; + sha512 = "fd5f9e8f999b173decebffa5f449ff0681b5ce7258b56dffd909d86364567b3e53238159648ca12a6c76ab5abf5903a6fd82207e8e5c8ae657aa6a0c650b1f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf"; + sha512 = "22f0e3b45877de32edde2f351d9434a9d6676c51bc70233c289386fa752ad5768d2fab202f74f2c62ffcb1fec2e2d318041689352d93f8dd13608e9243191b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe"; + sha512 = "631bb19fc65075b18e4c88d60b5a76e39d8a7516a44c2df5375668ca86775e577cd60e5b9e445073a47c9d117d7e96d9e8a5b2422749e0dd3622530abe21aa42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e"; + sha512 = "ae267046c3a6ca584c85f5a8d4da3516957313cc68e554fef796fdab92a2d450effa15efcbca5686f46a4dfd6ad1f61bba529d9cbacff0e65a857052b95ecba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b"; + sha512 = "db979def47bdc8b13060aeb2f0741c4e28d5e1bf0480703f26c0d7e5cef48c10e3d75260fdc6699668cfa3374de5ee25b150f3d5e0857ce801aeb187a8e7c4d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7"; + sha512 = "a703df8a6c1a381a281ebb9bf4008637009da5f66194a4f85afbf2ae980de5a118e0ffdd35aea7e8521026140f2c003afce8ea1c906ab90c1db7aa4025d03be0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84"; + sha512 = "ba9015d716e0d15b36cf7e83a28d99310a87cb2242b9e920ba8fa9112567cd0de1dab1cb8fad6ec26f381ea1cddc0b40b4c41d91450c1c76124b3c53869bc27d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479"; + sha512 = "12c4a7dada07fb6a643675d5f504cb76e00489879fe3f2ac2e9647e053fd508b18c56f2aca172aa12988cab6672c75179e7366cb43791a443ef70dc88d0897f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1"; + sha512 = "f6c93dfdc19487c1d61fba8a001680b9556ffed9599d4875e3e13e8df07dd49ce266c545aae9718e2657425815c643b803c170b620fb28c7e2727e92fcae0b91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8"; + sha512 = "eab3ac3f2afbc091a0fc02a6fd6e0bdc2dc232e06019d2b7ad3004aaa069f7afb1d4a89b7b0932e80589eeb262ee3e0b54f75ec09e2d09f58481d08c85bc7b09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052"; + sha512 = "99c3905d7b081407c6b044aca8c238e00ff2b6a4ef1cd24813746efc862a50fe7f2f3ebc79cf2f436e95cb3214894d991f8c1b003e52b70b2865970daf55c148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4"; + sha512 = "e391c752eee676f298ff37d086edaece84578e0bafb099f4ed8e0790d64de9ba64f4cf15c4218b70d519507f767572af7fd269b93d1766d2fc76a7fbd8a09848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34"; + sha512 = "99be4ca9b8178d6ed7d7f1c7ed466bc7113087faf7256064ccc0638366c554a7443b5ec83bb85b00689d2d4787f04268dd736eb62261cad69927d68ca6b83061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39"; + sha512 = "de3eb748339672383aa8ac01cb2494bbfcf08e1f694a5505ea2407374e44cb339f857c2a45f72da3831e0f800ac2b78ad159cf3c795244c0b7ac13c2cad50240"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14"; + sha512 = "bc45d70e14ec14122e45dc62a1b3acadc5a3de2a9ad6bb70d848c2952ced6ef3032a336579504fcf474bc3f12f7b8eeb6c92e529053ff3592a167b999bbe67cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716"; + sha512 = "91d846d406acc1e453a09b5de1fea0760564478a680511afc54e40c5dacaed602f8ab942dd77f25c1d89a507b867126969c36c0098763eaac10f047912cf83f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371"; + sha512 = "5c20abd276309d82e772989dbc8c8daa6997bddb67d794cb39c0af364407d57ba9d28054116af38d5b42ec339c16eefdf3266355560460b64957504833c7936a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60"; + sha512 = "470f2e471aedff4520ecbfda764710181cb6cf044204968f14f68bfc34f07a07a8b6e80d4dfe6f0abb1b4a79a5ec5169e552a3588eef7265df9d3bb91da731a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5"; + sha512 = "3487002948274414166cbf1527be353e9bc2267c672c2d14d731c162684e323543c5b54a43bf1f66353337e3df30fd45dbc90f0dfa8e07d8c4d77883ba1ea909"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e"; + sha512 = "7f1b57fae5a4a8981a2b5fe1ade023e1845af866ebf60f56d88c3cf8c9fdeb42aa1c48f5a3f8f535aa310d7f53ea2afb3787cacb8a211649be9ecfec0d7a1451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d"; + sha512 = "a73cfe38beacfc621cd10373a774b4ec517ea336e0249b7abd5500a9838fb3ff7b903f64c82fe3a8cc91f89f2bddcdb2d16fb41617a0be69eed67c47f8f5cca9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872"; + sha512 = "f18d20b7ccf069b843dd9acd3bb46c2d41408b319ac32114aaada886d43cb679b4624512637b1202fac9977d1a657deeb7dc662623e69c2e04b558ae0ca0ec39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20"; + sha512 = "4ac1c79dce2a208c461a6a8bbd447aa4aa40b8dfd3bd1b8bf3dec3fe5610f8bb51d65052ea23f81d0792f6a4d6b49ae0cec1e82199e8b7c94788290073bb7681"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3"; + sha512 = "d5c0c9fa140ec72b805f5aae8374cd0f56d21973fea5ab14f68040f38d15ed32d0c7542456eaf40f100006d79acd006cbcde1cecae81efca5097ad25d6d3171a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b"; + sha512 = "c5cd6793ac43b865c025f64c1cc10e2771be1e0ff6578258aac3cc433545228949c6bf33fc2764cf7272f76026549857124b535ffc64018879a7b7afd534f05e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b"; + sha512 = "5fc23876fa9cea6ea3209bacea4ea3975e7979c0ed0ee023857288ab286a4d6366c7267fea5ca7a4a5d4ee11287af490fb6bfb7e287d0f3ab70bae715e2ae049"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855"; + sha512 = "db1c80a5dcfa6aff3b9e8abf2a89946cf13a7ba045124bc37dacd761011ad3757319dac52a084a7b79acc0a1a813ae0d4507045c7cea01c3d06d0c6fb89579bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b"; + sha512 = "3b73fd94fbd37d486a4bc2b0c874101dca703cd0561e6b8bc19c4c3297c6fe6aabcec3d4274c361d6eb40f3851f262ac6b87d4efc6d025a236b90bf9c3c41e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5"; + sha512 = "b827604905e7a0883d6e6d12295707c23077f2e7605b10084fcd9bf927a61401169e4b786d88e119f65b173d832cdeffe9163ad1b5522e2cc1b49693f4065f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5"; + sha512 = "7dd79aa34c6645459de8c8a6d54f050d381a048a960da3d44238ec6d5579fe9856052a167e861bb72c4b73946836ef66f4b5cc9a2aa6894f7d59a8545583cd46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9"; + sha512 = "8bb836b634363a5ab120cb7fe94de9d8e7a0a66fe0b78443bd3b65fc6c9225b3bceb42539e9cd0bc424115a24938c809a36149a70796a854f4f76f009946f628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6"; + sha512 = "5f9c4eccc27acff2e6bd388c4e8bda7813550de17747f7bac13c3d72d58babbc1f63051053cbffd9a670af0a317a2e81ec3ad77f1a04a969f8333fd87d6f2f29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89"; + sha512 = "b05172f35cd062bc21125ee6230135c30afc3865612088c2bcc7e6e013817452a4dd9e5d269a8b2ebeb144d0c0864a155e40bf59312fa7cff7ee3da7d80ba55a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95"; + sha512 = "06e2ae2b1d3c1c06225fb24cf9a7148e80b56a2359c218ac55a04c4a21d0ebcb13c357bb455157ecdeff7b1fe9a0841a73b4facbc4a53e7529793d5f1a3ff70e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746"; + sha512 = "bc8cca21ae9a19a0a345e08a304d4a9964e448b3787ff9d61985082d9e04ada1709924020842f8fa68ef7238ac551f575a5540e1a2254ca7f54f9fc403c25e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0"; + sha512 = "d4b02d24bd952c67d298ed8fd27e7565d6ab9533d8acd69aa9a1dfe2573471378480523092c01f929f25e81cb43817bc4c0c1dbff88031439b0a358c5bec9eb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f"; + sha512 = "6db32dfb929b7939a2f54e198fc6bde10cb0aa2d9b1e39156ea1dba35ec7957fa87e5c7ffe1adbcf9ce0fb2d16eb324a8a6e49a6ff304bc369c52e91d050c714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0"; + sha512 = "7cb643e9a6d920b813e7c2e12e17b5b1ee135178e208bf152eba388c9e68389d3e90425a86d45597253c729562bbd2c4b582d86d2ed2aadaf0780a08ed787421"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439"; + sha512 = "254e006f0ce5dad4d1b7681fcf8569b7e7735e9b534f626d517c58f33da483c9de00990d77530fbc3147b2a26c5bf8c0834e7c029ee632890ca98e14328207f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f"; + sha512 = "30dd152aab923fbc4398fec06d5558aa1abd0d9c690ad4ded7d1695fa4355e5046c4279c450e856c87e32699354d657279958ce1b7c01d646e89faed1acc142f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81"; + sha512 = "f2d7bbb0cff7e0d0c77dfa42bdd268c06dfe1b5d3135baf4e095dd9f36e25f8bbfb3f06851eef314816d53e5118da6a719c45071542e54d9e4798b2d13b06580"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/pkgs/applications/networking/browsers/firefox-bin/firefox.key index 9169c4f9c44e..bd27ce85c94f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/firefox.key +++ b/pkgs/applications/networking/browsers/firefox-bin/firefox.key @@ -1,63 +1,254 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCz -PQpH6BoA73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxR -tWq5rCH48LnltKPamPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuuc -B4GNxXMgswZ7GTZO3VBDVEw5GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEn -dUB2oDMsSAoS/dZcl8F4otqfR1pXg618cU06omvq5yguWLDRV327BLmezYK0prD3 -P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLzK+7hok5kBxhsdMsdTZLd4tVR -jXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfslTmo7BgvmjZvAH5Z -asaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnypUPaJ2sBu -blnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin -CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZ -suv1TA+Mn111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQAB -tC9Nb3ppbGxhIFNvZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29t -PokCOAQTAQIAIgUCValABAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ -Ybe1JtmPA1NQqg//Rr6/V7uLqrIwx0UFknyNJasRJZhUkYxdGsLD18zO0Na8Ve3Q -sYpOC3ojpqaFUzpqm6KNv8eXfd/Ku7j3WGr9kPkbjZNghvy6V5Lva4JkxO6LMxKk -JYqiqF2o1Gfda8NfcK08GFy4C0L8zNwlADvmdMo4382tmHNGbTTft7BeVaRrE9xW -9eGmGQ2jYOsjxb5MsadAdZUuK8IC95ZHlUDR3gH9KqhfbQWp5Bo924Kiv+f2JUzN -rrG98eOm1Qb8F9rePzZ2DOYRJyOe4p8Gpl+kojCXNntkJgcwJ1a1yRE6wy9RzpeB -lCeoQuLS92MNne+deQZUskTZFoYXUadf6vbdfqL0nuPCKdl9lhef1QNwE30IRymt -6fhJCFffFQjGdeMfSiCHgcI8ichQbrzhBCGGR3bAHan9c2EbQ+puqG3Aa0YjX6Db -GJjWOI6A61bqSPepLCMVaXqV2mZEIaZWdZkOHjnRrU6CJdXG/+D4m1YBZwYM60eJ -kNu4eMMwMFnRsHiWf7bhqKptwuk8HyIGp2o4j8iqrFRVJEbK/ctdhA3H1AlKug9f -NrfwCfqhNCSBju97V03U26j04JMn9nrZ2UEGbpty+8ONTb38WX5/oC61BgwV8Ki4 -6Lwyb7fImUzz8jE83pjh7s3+NCKvvbH+VfT12f+V/fsphN3EwGwJPTC3fX25Ag0E -ValA9AEQAK/z677fpoVUj4zQz0g60wVWf+1y2lGb8iFYICmvrJyaEra5SRkyihYA -1WmEzhN4T//tHw3UIfe646+GkY3eIQW2jY9DM2XaElmMN8k/v54nbn5oD7rNEyCT -FTvCOq5d74HH1vw96Lzay1vy45E7jPWvqfg9Se8KAnzElohTJjizyhU+0QbmPHnQ -lY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdLPhcFB1scc25iFqh9IAKUGDur8jQ+SDHC -jgQlkFOg3rbqtaUOnVHPohfrBM90ZNwuneFgQY7ZFSUidCimp/EN4CXnzgjDYXUU -A42S8G86+G4KAJC22gRQo4mcVmehwHTH0glfLmUK7TEu29A1KWNL3R/R7Zdyajjp -CvUaK2A0Abj3ZE2BSDbJrVlbBVfy5kfPdZjhd3wUWqFaDHiVcImcjZRWPncllhcy -6fhqEy3ELZrkezpJjnARsVkij3GXz6oX+HVULne2w0dkTXydR6muZI/GeNtrLHmA -8B3/0/TllmLy8ChmYZVIKZ8zt1ghq3f+hFTXgtZil7eBewZgA6L+EXXK6dZj14lb -e6CMS2kungTX9stU1s42I+WRbiqiLpAxCX6qcLBOWrJwsOep2nvu5bhrPHptSfRh -F4Vs1xteVFckCWhcLgdYi/Je1XBEM+AAVa0k1FiywCg7MqlG6toLABEBAAGJBEQE -GAECAA8FAlWpQPQCGwIFCQPCZwACKQkQYbe1JtmPA1PBXSAEGQECAAYFAlWpQPQA -CgkQHGnE5V6ZBdsvxQ/6A62ZteN0b/TVfSJ51SdG66amwe2rpRX4UdSw7ifxo3qh -gEICQmXR5c09qXwl17MFJWM3FhGrbxnA5KGgeWGtqrPup4QZPKU+l2Ea2QLSJSiB -q5QqqEgZvR14Lhr/hCGhBAq9s/xbp8fbKNJj/uWiZ+uTPbt5T5rgKJ4+g3B6DNO1 -rH7F70OLrd32mxZs4pSxngHRAyiMPB59yQVDsVMha0JTqC+P96itUzvnInc/9mwE -0EMiBtpDTkoBwbJVPnuv+7FjkOLn5s5u3RLH9fe8z1xnV0fPC0/ndrlNiuBpAn3z -VCsWasvW18Vz8K+CQY8Sw0Jw75edBgFoz2QMFxHfDpMJefvMadB7mdte1lKk/Im9 -KFFH8Idh9b6zD0a/+Ooujukx6QpFfAVhe2sT2CIm2nmMAuAZI2cCt7SC+REn9n9M -SuIWxN8YTE3qgAUB6F3ea0O0hGlLl+z5UOfX0bNAs+ebx/P6PczJtDzeqpmRb0QX -qo55JWXLvmXT/fgjF7fNTTLsyCtV+xH6ZFKGpvGJGJMHApEbz2a0hy12RZH58eI1 -ueN3Tzn8nI57+oYSsqFw/QgcdGXDonLGJsPVzIpQRg92/GXSukWF+MsCjVOilHRS -Y1wfPPmJ7+kMQ4rdXpjAhwNYJc1ff5N+omCxCKoFgYsCXlFCHFKs4JwRbTdd3Mku -qBAAlBlIjym8NyJIBltfWckuhQTX4BiBltGPNga9CpQsml519EePuLtoe5H0fTUp -4UYbL0ZzyJImQE2uw/hMNZ36bA057YtHOoP4FcPUwv6wsl5JC87UR1XFhAXb5xSU -0qdi3hWh0hm772X6CBlM8lM6GtT/fDZkSGNXMQaIs1X/O9vf8wGg+HwLJcaCvybI -4w7w1K0R7WjWZlJXutCZf8hRc0d88W/qSZYooKD9q2S7foqaJhySIaF11sH5ETvV -P3oCfGVIVhKWb0Tp2jXPXlXLeRAQA8S+4B1o5XHiM+J3SNXhPQHRGQ3VGcDn45it -g3F4xQX2Qvo4SV42NMYd6TykM/dIfQyJDOVg3CT3+nqfjCknf94SNvyZprHEPmpc -DeseoPMw8kjKNwDwPXFLxBRntPgnqVXDcNN41OH2kqx4jF7FLlRmwNpB2mFVH8xe -VuRm7h2WZRsaEoqvivhzRtESVA2um5Eg763CVTcNYlK6MD/iy8JzbMuZBrlOHr58 -HKDdcOy1W0z2quESGoqrwA995IgPav/1DSpyuJPNc/oUTWlhpYshqYKoflezAyKj -30+UzC3R/mY03ri6zUvCgXHNgZlKUsM3VEXk6h5oDuaXniHLLzuxjTBVrILnGYgH -SFRP80L/knz+o4Uvq4wj7NHnruc5fP1foFxRNsMt40yRJfU= -=D+jC ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.5 +Comment: Hostname: keyserver.mozilla.org + +mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCzPQpH6BoA +73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxRtWq5rCH48LnltKPa +mPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuucB4GNxXMgswZ7GTZO3VBDVEw5 +GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEndUB2oDMsSAoS/dZcl8F4otqfR1pXg618 +cU06omvq5yguWLDRV327BLmezYK0prD3P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLz +K+7hok5kBxhsdMsdTZLd4tVRjXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfs +lTmo7BgvmjZvAH5ZasaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnyp +UPaJ2sBublnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin +CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZsuv1TA+M +n111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQABtC9Nb3ppbGxhIFNv +ZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29tPohGBBARAgAGBQJVrP9LAAoJ +EHYlQD1/DRWxU2QAoOOFRbkbIU1zKP2i3jy/6VKHkYEgAJ9N6f9Gmjm1/vtSrvjjlxWzzQQr +kIhGBBARAgAGBQJVrTrjAAoJEMNOV0fiPdZ3BbkAoJUNHEqNv9dioaGMEIpiFtDjEm44AJ9U +inMTfAYsL9yb15SdJWe/56VCcoheBBARCAAGBQJWBldjAAoJEAJasBBrF+oerNYA/13MQehk +3AfkljGi252/cU6i1VOFpCuOeT7lK2c5unGcAP0WZjIDJgaHijtrF4MKCZbUnz37Vxm0OcU8 +qcGkYUwHi4heBBARCgAGBQJVrSz+AAoJEPCp59zTnkUulAYA/31nYhIpb7sVigone8OvFO19 +xtkR9/vy5+iKeYCVlvZtAP9rZ85ymuNYNqX06t+ruDqG2RfdUhJ6aD5IND+KD5ve7IkBHAQQ +AQIABgUCVaz9fgAKCRCzxalYUIpD8muMB/sH58bMSzzF9zTXRropldw7Vbj9VrRD7NyoX4Ol +DArtvdLqgPm0JUoP2gXINeSuVPpOfC676yVnBEMjIfqEjq09vcbwayS+Ncx4vQh2BmzDUNLE +3SlnRn2bEWr9SQL/pOYUDUgmY5a0UIf/WKtBapsPE+Zan51ezYSEfxDNfUpA4T2/9iWwJ2ZO +y0yIfLdHyvumuyiekJrfrMaF4L9Q0OnJwp1PwkvN4IVwhZeYDtIJN4nRcJK5LrwU7B97uef2 +hqBBll7/qCHl5y4Khb0csFanIg+pQLPUJdIiYtzoFtlgykB61pxqtU9rqGKW02JzEUT8DdPU +XxmMBy6A8oGeBRH/iQEcBBABAgAGBQJVrRdcAAoJEGVzgtv/JREKQJgH/3nD/3/SumL7nG2g +7Y1HQqWphUbn40XWvjZcHq3uBUn1QYXeZ5X56SANLM2t+uirGnNaZXW3cxEl5IyZVLbmcLWE +BlVAcp2Bf3FXFbdJK59f+M+y2+jZT9feTyrw+EtLoiGTxgkLdJyMyI0xGmQhMx5V1ex1CxhZ +K2JPjzCVYriBI0wIbmKi90YNMQoSsdMhYmX9bHl6XWS9TCDWsqj25FLYJL+WeVXpjO0NjRwE +E6pc/qldeJYG5Vbf0snGxIerXe+l5D8Yd4PEAnpj58+5pXeoGYZn3WjX8eTFMAEU+QhLKWQ+ +j/Y8Kijge7fUxnSNBZ2KEnuDN/4Hv/DrCFLv14CJARwEEAECAAYFAlWtZVoACgkQ5DJ8bD4C +mcBzsAf/RMqDdVHggQHc0/YLt1f/vY9Y7QQ6HwnDrtcNxxErSVcMguD8K6Oxir0TMSh+/YuZ +AW8K4KSgEURwZqz4na8/eOxj8bluNmlcAseQDHswqU6CyB95Woy3BocihH7L0eDXZOMzsa33 +vRQHBMioLxIbpnVtVbFR1z7tmyfjcOrzP32xo5QoPoczKX26luMBjAvbw1FC0is2INnmUSYM +4uH7iFZuXGPFYxcAqODqy5ys3MoPa4oZ71d0HoiRil1+s0Y+2ByddZ19pE2TXp4ZXNYNUj/2 +aRj8b4sTjR4rqhHIx/vfoK+VCNy/skFUZOyPdbbymE0stTRSJ1gr9CZLcBWYF4kBHAQQAQIA +BgUCVcFZcAAKCRCJFz+VfFX5XqApB/938p+CJiDRnh2o7eDWnjSyAu7FWmWGkOQnjI/kraKx +1vojsYnKRXD6mjq1QJ8Hsp4taJnLQjcokNTUiST4m/e4ZJExPWuJKkwlralWGH6NpqYcgWPa +jSYb0eYQC4YqS0kfyzolrHdKI8Y4NGEU7yy5zsHwWkHt/mpNQMrYnXwyWdIrc03X/OXo51dJ +yshJDRw3InREyBblFJcLvArNHz219wMrXAicPytw4wfPpVrmDx6GrZcI8q8ECWCjwSXXv7hR +pEuFLSy5XPhMc+wYBJjNlUoiFBAF/7zENd3rMn9SCQLiIFYe0ubmO+bpeGy7TizbxOaCIfgU +ouyy0BQXNuJBiQEcBBABAgAGBQJV0hrqAAoJEK18uZ+CSLoPzEIH/1D6sJMNAJtZCRGhJXvv +6SYhv4pUVNyDF9FnUvRsovliojoe4IkuBTWKhPGrxbiD5IO/izr38shqNhhm9JE2/SQZHObY +Pi+lyfDKbJgImTNxmS4F7JHnRLr37VxK1sVvuNkynJnqvCcp1g5xwNIx1rKcka3iuqJj6toM +8XQfgsTHH1rUkWHbUV3QwNzXm+yhFm2s6QzxBooPzmFn8AY7CXD4pvcMR+M0Zy+e42nngd8l +zRnmTBVig4pRq0GCMulFG+XjeVQZFpoIIxo2k1lczbRmGttONdGWSjxBUxReoTbSwM3C/50N +robycGQgY0gd6LGtWtU8/uEfklEy2NluxYWJARwEEAEIAAYFAlWtAUYACgkQVu5xjc4OFUs0 +OAf+LM0dyyvUFGdXfJDpP2xMknXzsHAXWFEtH5jein58mv6dD3fTVcCouo1vMQH3WFFSLYZv +wtNnHGrSBqFbNKqZ0ATQ5tcYaWsSZ+MVJJMXJDXFG/Oihg1nNOM33VdfV0RGPKP1I4cEROxm +s3TUFkHW3cSCgMzs8I1OxfSoLrm6da8EN+2ct2InqzdQL2yisyTyrdmXoNpwXDxApKYkvVHQ +4+9eJI5m0ZAr0mBjIeJdATcw4/lIVKTrV7UhrChxiffYJcz4SSC1crmr+2Fzw53CyAsAmYal +UHep3Yr05oQ4oJRX9X3VrY/yELHwwxXaxCAdwwHbbXAMhZsPk9Mc20J6BokBHAQQAQgABgUC +Va0isQAKCRCj1lIXO3Y+j6ZeB/91Q9/qr5oMWgOMsix8kflBLw2f/t+tRR0SWDw90bG1npJB +6nq5Hl+Bz4/A4SWFTFrrrlZi1Enjn1FYBiZuHaSQ/+loYF/2dbQDbBKShfIk3J0lxqfKPAfK +opRsEuxckC8YW1thGxt5eQQ8zkJoqBFTBzwiXOj3/ncJkX9q9krgUlfTSVmrT9nx0hjyNQQX +rghsmBtpR7WCS7G7vNRGCNUorhtviUvL+ze1F7TTSGspVsVxo2ghmz5WT/cD9MV1gcVjojYm +ksh5JIl39jCHr9hl8aRId/OfzsN+TKuBcpAxDkm9BCAps7oY8FlLKDFZTtHa000AkodKHT88 +nwnvKuqPiQEcBBABCAAGBQJVrTkDAAoJEPbQ92HczOykK9YH/0MARo3HlYXeS2bDqM/lwK/r +QcPCCyYke6wbICjncbCOjgXHqG/lBhClNs7hp/7gqkUaR7H5tmeI4lalP40mSHHnnFvMD3Tc +yhn350igK0bgrjWQDaYxhKlHT3vIXd/C24/vRSAxmqIKbP+IoXOyt2GMTQq8GOm2dgYRaTkw +yHnGWnMaibctX8D4oCYR0/D4YJqPkfqobf8+1ZfP5GaMbSxE/Jwdo0kJa4vPjEzFXbygAbnc +apzdwN6zgel2zh885rz7B7vIpMr/Y7eV85Q68qdyyhLe8cL8Y18YPzpFf+/PZNbgYxouafvn +FwBhPQwg0gUF/+1eM3UE2ua+saSTGduJARwEEAEKAAYFAlWtCVsACgkQM0LhtmejiGMovwf8 +CfYJHNbwiwSMUoP4n7FrmElhBtxvlbnCMZKz08v+lFsfS3wU1LUN69GqirfF0vkQRSlSBp7n +iCLHQCfSoqHMLgxF0P2xgXLjaYM/t/rxXDawJmW18G04dqFrtCPZTbwMT2PsPHTiWQdaN0e5 +0lXk9Vo+l6VbwQMg4zH7icZadeJgQooxFalHYFVXUVeex9t8/YdanFVrHFa3tao6azBTSUkJ +vZtIu14SfxigDWIIwsx0xpVfJf3a/xC6HY3Q1a3NeBz3i6DwaK5wYqijZKl0WVdULKyqU98o +F6y0mUv3d2o/p07Cqgeo6xxMkHqu83OLa2a0C7tYPLgL4EFc2FtikYkCHAQQAQIABgUCVaz7 +KAAKCRCWO3gxCjexfKxrD/4npm1rB7+pPlotbqK37Mur7egPbVSAzVNU/zUKPAuGUeP3C64Y +N77ETx1kDuS+meAqMDHFc9Bf8HivPbtj6QcK96U5KstbmSh1Ow9YiQtxJgxGjg/CzREgZAFc +jy0MhoklyPsFhv07s6MLOJMSM/krEN5nqjifQ0WdmTk02FLoHVWcLdjfgMiPiSjGbU3k7luv +jPyRNzk831szE5mfa74rEYh4TBklse+2uB4DFQ/3oHZ1Sj6OBK6ujmNKQjIP7Cl+jmjr7+QK +0OJcRaj/8AckDA5qXTZACh1S2syCDDMnX0V+dTxGCIoWOK+tt9mLohMzpEeD4NIX4qdpbbCR +zeYZMHSomyBIsbA6B+/ftDE7W1N0/FtJ9adkkCynKULvh2CH5c5hgOOL22M+2spnywRoeJRU +WU7hBM5OUH3JjA4Tu4j/cwp7dD7QzZrzmC9f5LQJ3OelejvVowWPQd3/tky4o1q6wlmFqAcA +gtu97UwgBOSR9sJPGDlt1iC91UYAiBQQAA7ya8uXUS84mCQwTlr8j+YrowvEHK4IxpPREytT +1LzzV/4Am4ndDFtujy83QjL0qaIIim1xIwoEosd4yidhpczw7f3b9dQpuBIFeQuhM7JsxP4t +mE7S6k6GlEmqa3INPVaPGnsUGS7+xSMlcJXLtimPCSQvFma9YiGV5vtLy4kCHAQQAQIABgUC +Vaz8uAAKCRASy06X4H5n0dg0D/9QoxIh9LRt1jor7OHG4xKUjKiXxn/KeQNlJnxI55dlWIvJ +EJGheFjaDomzKBYuxmm2Ejx+eV5CHDLUYsLFYwWf8+JGOP75Ueglgr8A0/bdsL63KX6NP2DC +g8XR4Z1aeei3WMY7p/qMWpqbQoAv9c3p49Ss2jSNuthWsRR6vbQ9iwze2oaUaA44WKQyhhbC +wBU4SHYjlKCLqIBh/HXZFhZ4rDfuWgPBKvYU1nnOPF0jJRCco3Vgx3T9F+LZ3zo5UPt1Xapr +3hMVS9iaJyl1w4z2miApUaZuHPuWKuO4CJ1GF1mS5T6vG8gB3Ts5zdtBF2xQIkCz+SM7vW/2 +i/82oq6P8EuLHEhrQPR4oTjXIvXdEJ9kgbjqcj8Xk+8teEOnuwh6iEhay9i/bf0D3Jd+roFN +5dnWPxhOVjzrI3fwlK1/ylsZYqUYBEzt7Wj0MdhjeKssI5YICcqYXXjBttMw4B7DZXPFXzz3 +kHB56jZ/II4YUjpLO85Jo5A9SV+aIqa0mvCt6DvVWy/rhfxfoUdqNlhX11gkVLaA7xxgn/Nq +POf+h5hVO2mwWkmart9YHKMZ3ukCdke65ITL/nsYSm2ZhG7OYjaCfu9jPWtkBstOEWyT9q4J +TdViR7wN3eMefEG6rb49rxOYvGJu+cTVkp3SCpl0w1j+tPj4tkj7ENzPMXdnuYkCHAQQAQIA +BgUCVa0s4gAKCRCKsTKWOgZTeuMyEACKOySKAd/xDcPcHg7Prvdws04Z8DIR0dY2qUlbRVx2 +jTmIXyry63CqbOJFbDg9uk5x0+lSotvrWtZ+NKSrg9VM6vyV4cc2P9rhqIBi3wO2elzAmpOa +S2KKOjQ+2fS/xqh91ElJUu09xXQXJ0vMrqgui+zN1YBDiJV0WOmm90Mm2NPiihcWZmBmDorO +qMQabwbjBLi0yUVHgAlkilY3mAB4tmEKDeN+4pYSAAhXAll9U+nyoVMgwMJscZyazOp4MqMb +mFjyr4p5AGzv+OOJtjtCNKT6oW9Y+URLY0YKeOsPk0v5PlbQCVBlLeSBsNZudKav/Gvo7Mvz +5uLTcneBFb+haYIiXO/FQm4uBHkzdNFLgaph81Wzh62AhbtBlfBOj/lbzN3k/xRwo64QU+2Z +9GOhFlhjfROquY70FCQcspwNuqCdZybnkdpF2Qrr6Pi0qKR/Xb9Vd7PW0/gKQdwwlYTiDemg +A21mYeJrYw873/7U/+kLFRvmPAEX4IOIOEN6XVjxvu78REi6CmXxOoYnH4aRSXDRyi1nsGjB +43AtfAMMNCUigDgFP4sUsZAG1RAoxBhOsO/g9S5wx8H3rKITCXDjQh2SYeBwHFcU03EMcyzE +QhbZNighN+aRKGIibteRxISiKU+kcWaHolemeo6wGF87QXEpJaQ2OwIoIxQYvDDmQokCHAQQ +AQgABgUCVaz/8QAKCRA/8xuvEEv54t06D/9n1Nyn2QSUN1mXd7pomoaka+I2ogDbQpu9iuFq +bkqfcH3UuG8yTKlPp9lYDBs0IEfG85Js6iVxJIultocrcDmOyDkyEsnYbdel/tn3X4yqD8eI +6ImRoCE+gnQ3LoEIHuODfJoosM/jAHANs4fsla4/u5CZDXaaq7pYXGiTt7ndsfmLiCa7dAg7 +bVFfJagsnL/VjlfeWM9nW01rDL9LPxSN4tq7ZKXWZDonFZYJ4unsK/Cn6Pqco4Wb+FUOWCcW +t8in1pgeNHZ9WnAgXG999/3iCbbQTLB6uVwY4Ax5P7VApnLVXV6QFVf7bN1DxE8kZk+pfLGc +uD1LJSF0skE80M17kAt+iV+fam8EYzeGdG6cY6w+srndaMaq9ddiHIiQkR35SjJAGnrNRj8o +oUr/vKOBnFfuwJLA2MOUVPZ8HWB+WXW8qhihw9CXa38Hdt4o5knMGRIyTWEF0TQDtRGQ6his +VBN3OxJRXBj7/QgCG/GoYpweGKcsMU43p57TzbnXVVUytJsLFyexOGNzrUIxgDVPEvTUnNvd +AihNZPdbW3YdFkP9pdwOyDpQwebXELUx1kp4ql0laueex4L1v+0a6rDYQeK1gOq5UGY+THRS +gB2xsHl5zeryfgnjlUkUlxKuumz+9FI2fRtSpxmWllJkRF2oFMGRuLPGAWe8nHvfgkuGVokC +HAQQAQgABgUCVa0bowAKCRCVY0f2+/OkFWKREACZ9TOmzvY6mrfWVEdldcYPj8cU/1LJhGdb +No5YYMx+A72nchxGXepHA65OEK+f6rFMeZFPwpQPy6Sj3MhT623H/PECfeG87WcLOyJbfc3i +9T5jvxS+ztG6abYI2J/50oMvjUWdWkDX3VvdPc0ZZ+KC+oHvx9a/9Yki48m4CEKglgVsrRW/ +b9AXZQCj07bB0GjQQtkqY/m1Z8m4ttzxfO7OBo/jHNF2An4/4gUDirXNDj0UdB5FYFJaTEUC +neIj2x0fk1r4u6na8tINhiZ0M7IgjnDlBD5jwzvwG+3kYE6TnYp9Mfeg2MPC13tp7jrJatLL +utrOzvmSVLGLXbkh9w+v+vx7qO3TxZUNlFqTmYs+vI2V/9j7KYV7Ttoind6Io7X9ImnYrvd8 +JOyVcO3867MplKnrnqHJvFStE+JcHEcw5aRw+WVmoFd/obGc34V3K62T977QQGOkrTYDEdje +KADfjXXZkZMZc0IvzLBOJ1XB45+PKqJYCcJJS8Xr55+NGCDaaUPWDpkNGIqmX2n9kYROMKG6 +uWkZIqG0JlZkga3THSJIvLiy6uoOvDC4GoQ9JnTwpGv6r1Hwcg+4DCOrYKOoPKMMU24vHx2F +tRRUgCXtr2cmi2ymHlUrtz8EXS4tblic8lixcbvPUqLEvbJ2gfWQvjXNd1whYE/wfvI9WBTE +IokCHAQQAQgABgUCVa0b3wAKCRC8FzAbSRs/IQhXEADiKbCnsN/+Plllxn6SQHACEU75ackx ++Q02XiD/u+wUptYUGmJi4aaW9f6mgzedOxYK4S+/dCiFtkcYlL+FjaR0C7G6tMjrDgW+8nQC +TPUNQA0gX2B8n06a7Zmdv3EbV/PIJJwTNSBp/dqKbvPKnRquOOpH+ayZ3awKOq/LlWBErbW1 +gB+FabN0lCe0iUIQTF9OH3GC4QsMtIrePueBmVrVPcHATV2Vw9UPqX1uX/tlXm5eai06oVT7 +V0FwUbg0o1eacblNXvHciHpe33zZIKkGBWwSjDVcU9/SN+U8GfoMYmyCma4iN3KaCklpzBkJ +iQZtNKPAB5KJti8LDUxFi2sJd3sqWaZDGFhO+/PKhBKpqIhAzx1ppd11zLgh0eg6gQlXN8D8 +ELISRvQqGGNNZdChEFdzGElg5SMfmeEd37OaX4wceLLV0v7EA0doHMVo0enFhSwU3Ywtwxbi +ukKc7H/ylG7+jvntjY+z7KktRsY/FkklrbrNhddMBQMMSAQUUz1GJ+6NUKmzXjqxFuuh3OAh +qNzhJyABZWQcNMph+rogEslkenwoHV9gWRWtS3CMybJkKkbsWpYhMZNY6hFtgCwida7NPs83 +69v+yTTE6TU/NIlXUKYIf2LMqtOpEBTjaN3jKpUi5DeE3zBeh6iVKUrfCXbt8O0rYQPNWGSW ++MZ2t4kCHAQQAQgABgUCVvA4GwAKCRBE9G4UbQI5XfS9D/9XPK7jg0lmsNZ2sDIyeAw5n6oh +SR5F20ocTMAVeXqN7VkvJdNpIqHJa13EP408DgTy9BsSptym/OQGE6B82BU7FZTEL6eMHnGG +Dg+5ktx9+b73xLedzK75ti6ED+QuA4kDYcvW8hASht0zRcmFUzwbtuEopJ1Lk1R3oFLwCAov +lhduC45nANWrTK5U+D1U2obl5PAvx+9mEfgvojlGH/C/WD74W+cQZFH7t4+muRzamckLyPft +nTxjNF/lpYIm7z0QOwvzBYj+PJ09wYueK00RE5+i9Ff8DrjtVSXsziQvSjJuUlv0kVvM8r3t +h4zBBNRhA4cinwqxhgqO4G+r2r9Gv0M2nKKOnWmyF+MSIRnhgONOQZe5a7kQxKVWkLicS2IG +UpPeQyTWaqZzYXsD+Dm6DXD57vYTURtUkwO0CDONzT5XiS1HG1MZrw+V/Jai4HAvpF5WkTJX +Pc1Lv75BxJj3wOAw4MzEWCCdr/N/dt5/+ULpEaSQfIg4L4iEj6rvabQyN0KbOxIDx+pPQ81i +zfj36wIrDqhyCNIdmVH/yARltkL4XDEl/pt7Y3t6jqFhy057lektowClWcPeq3DoL0LFYnjN +PpYvIjRIAXdhaYiAu2ViF8WdGzQ5tFeI7u3PQUG5NcPe+WOPOru3wMMrUhLgLHkCdNkjivP7 +9qIPSTkCGYkCHAQQAQgABgUCVvA48gAKCRC3hu8lqKOJoLRMEACmlyePsyE5CH7JALOWPDjT +f+ERbn+JUTKF+QS0XyWclA/BIK8qmGWfgH38T9nocFnkw17D3GP8msv8ll+T4TzW9Kz9+GCU +JcHzdsWj99npyeqG5tw+VfJctIBjsnX3mf4N0idvNrkAG5olbpR5UdsYYz62HstLqxibOg4z +WhTyYvO6CjnszZrRJk0TYZON4cXN14WYq2OTrMaElx0My8o1qVBnK58pIRzv72PmvQqUk5Zj +hUyp9gxjqqCJDz0hVK61ZuGP6iKK8KCLTfSxeat05LAbz8aC58qlg5DVktevHOjBgnTa8B7B +gJ7bQ9PLMa3lF4H1eSiR9+8ecpzEfGHILoeIDIYH7z7J/S0mTgV3u5brOMYO+mE9CEfps85t +VVoyJrIR8mGEdtE2YmdQpdFzYIYvRfq9tnXZjVsAAsC20Smw0LnjhYzAt9QJwZ9pFMXUTg6l +C5xT+6LNrEY+JR3wC16q36bcbCNj0cBv1A3x6OI5OQfpexhLPDgoDiI+qozJIdj8MzJ8W6KU +1Z3yb3dqACk77yv37rGO6uduSHnSti26c/cUIy6XZBbXBdobE9O3tr8hwvTQ1FXBmYnBrdiz +U6tgxEA5czRC9HOkdk6y6ocbjmONpF6MxkpJAvTMk7IqC2/hisbV9x4utla+7tmNZU137QGc +aK2AGQablVAy4YkCHAQQAQgABgUCVvCMigAKCRCkhaDtUbi3xAU7D/9gUPZSJ8pbZV9TLaKD +57Bc7B78HNV/B438ib4dI33iihMTBHnCB1giPE9X54QoV8ASxrO/xveS1kkj78jERqUcED6Z +HhMLb9SWs6CxUKdMdgovnIlFUc+t05D5mb6STi+zNihwO0JI+n79qhETy73WLpC7RR0aMx7z +Ycbqp3NWPptcf1kVGJZGx+QbEHfVye98T5pkH5Wp+7LSlup6AldQT/oifxdGxLXbECTnwozR +vyMpAaphoEHrET1YOmKnmw/Jyi6DLpTb3XvSf5Tntzr7HklCEcL9FvYCoHxiXWawLhuPhSyr +FYeYtF1ypmzTgaJWyuTZ8sN9J+y7Tbchk/I6FpX+3YoTgPCcC7hv1Krs803N/3KuyBEvhzg7 +NYRikzO3fxXlBG0RMm+662E7KlERU24izbWhGiYwl34+MaxrIO4oDvF79LEN7y0+SjL4V0B9 +689d+HI1ZfS9O1xkOlW6y0QyagOzsTOUF12s2mWydFmipbYnIwsSsu6Nzk3yO4M+qYABJXJ3 +tIFQPTd7xqmPNlJ8mFtmzHDhb3Pv6sRNFLLujYM9cJpuNMbAHWdohz1bjBT9pZQ3zWpll5wo +tUvGmJd6hTAXdUgmZ7lh7Uq6axClMmiLe1WYntcNpb04PyyEm2+GU5x123UTiSX2LGKa4t+H +NSM8nJL8BJiGk80xVIkCHAQQAQoABgUCVa0OAwAKCRDDvTXkbdRdpVR+D/4/37e8WqKOHNPt +eQu42sj0ZOfcqyVMA9TQ578F0s9MwoQuqfVhXGSWevOctuMv2qTBjBfFjkdPrKR5L4LNAgMs +u1epHU0DPcRZUCbh1P7GpolmZ8KgnjT5Wpl1AcuOCaP08VMrt/e/JndTHp6btn6HsLVtryNh +lL7oaeYbDr6/ovHNGHVIVSZgGP9f4Y8FiDpyfKav71vYLBMxtzM7lc3eFT1S10XhSW6k+8S5 +XldYWkLDriRXDE85C+9QndpOoQaIICp3ye3JVnUxa1qhvsYj9uPt1M6hKiBSoXdplrB+hQc+ +nqLNN3jxpGdmGmwrjtjqMhocMIguEqgARJOek3XKOppEhu+IcnJgU4edARJNLsBauiVBWY/6 +mZOFlZq6H48tVyziS2n/oIpi+aCc/fQeGs9zMTtFUohPfYtTcy9PecXMOYpSu4p4tQ07oucn +xfBkRUgTdM5VwX7YwTcRwp9XhHACUEGBhrwMH8Iz+sK2jLF3FhJGkef1vFs0vqSf4I8DBFkY +AKF848YyEcGHeINQloi3v0Kr2PpBxlRh+GPWwi++QPKXQFzlTiyVtMzoo/lpmAWUJwj0dbAb +H/mohtvWtA1WPHC2JRZ52JLThhpDrK3t//Jdt2WHE91cMx7/2B0PK4O8/j7UVlsOJXpVPsGX +5SFCeTB/iS4JtIwWN275zIkCMwQQAQgAHRYhBFnKni0qMx3iUaokJ18Dx2fCR6TVBQJZDvZC +AAoJEF8Dx2fCR6TVoGkQAIjqaQ7tpdhDJ6ORNtLIt0TsWg0jg2rpoq+9Au36+UYBMuBJ3Py/ +tAsZ3cqQlig7lJiQqOuQZkbg1vcY4Kdad7AGa8Kq3sLn8h2XUlNU90X0KAwdCTA/YXxODlfU +CD2hl4vJEoH/FZtfUsaLNHLmz0brKGrWvChq00j5bPfp90KYKqamGb3a4/LG4DHL4lmEBtP+ ++YA0YqUQ3laOvKune2YwSGe4nKRarZnFiIn2OnH9w0vKN/x9IMGEtc5MbQVgGtmT5km3DUuX +MDforshue6c7ao4nMOC96ajkWYZhybqHJgLOrEGPVUkOaEe7s1kx4ye9Ph3w/LXEE8Y8VFiZ +orkA/8PTtx0M9hrCVkDp0w8YTzFJ9DFutrImuPT6+mNIk+0NQeuDsv492m/JXGLw/LRl97Tm +HpKME+vDd5NBLo4OShlDKHwPszYcpSJTG9+5++csR95al3tWnuGX9V0/dO1s7Mv0f/z07nLB +/tL+hEpqqA5aRiGzdx/KOrPZuhCTyfA3b2wvOblwf4A/E1yO7uzPTuSWnx1E14iZuaCPyZPX +Eh3XSYCLEnQ05jy50uGXCDVR+xiE/5i/L3IxyhJk6zn5GOW5b8Taq5s/dFS3zWiFS6l0zQ1V +QmJH8jdGLoBFvdVLZoAa1bihLo+nJVPR2RauWnxWoWk1NQoT3l02Lk6DiQI4BBMBAgAiBQJV +qUAEAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBht7Um2Y8DU1CqD/9Gvr9Xu4uq +sjDHRQWSfI0lqxElmFSRjF0awsPXzM7Q1rxV7dCxik4LeiOmpoVTOmqboo2/x5d938q7uPdY +av2Q+RuNk2CG/LpXku9rgmTE7oszEqQliqKoXajUZ91rw19wrTwYXLgLQvzM3CUAO+Z0yjjf +za2Yc0ZtNN+3sF5VpGsT3Fb14aYZDaNg6yPFvkyxp0B1lS4rwgL3lkeVQNHeAf0qqF9tBank +Gj3bgqK/5/YlTM2usb3x46bVBvwX2t4/NnYM5hEnI57inwamX6SiMJc2e2QmBzAnVrXJETrD +L1HOl4GUJ6hC4tL3Yw2d7515BlSyRNkWhhdRp1/q9t1+ovSe48Ip2X2WF5/VA3ATfQhHKa3p ++EkIV98VCMZ14x9KIIeBwjyJyFBuvOEEIYZHdsAdqf1zYRtD6m6obcBrRiNfoNsYmNY4joDr +VupI96ksIxVpepXaZkQhplZ1mQ4eOdGtToIl1cb/4PibVgFnBgzrR4mQ27h4wzAwWdGweJZ/ +tuGoqm3C6TwfIganajiPyKqsVFUkRsr9y12EDcfUCUq6D182t/AJ+qE0JIGO73tXTdTbqPTg +kyf2etnZQQZum3L7w41NvfxZfn+gLrUGDBXwqLjovDJvt8iZTPPyMTzemOHuzf40Iq+9sf5V +9PXZ/5X9+ymE3cTAbAk9MLd9fbkCDQRVqUD0ARAAr/Prvt+mhVSPjNDPSDrTBVZ/7XLaUZvy +IVggKa+snJoStrlJGTKKFgDVaYTOE3hP/+0fDdQh97rjr4aRjd4hBbaNj0MzZdoSWYw3yT+/ +nidufmgPus0TIJMVO8I6rl3vgcfW/D3ovNrLW/LjkTuM9a+p+D1J7woCfMSWiFMmOLPKFT7R +BuY8edCVjyA6RP9K9Gj1sURSeqNaHR9Gr4rW10s+FwUHWxxzbmIWqH0gApQYO6vyND5IMcKO +BCWQU6Detuq1pQ6dUc+iF+sEz3Rk3C6d4WBBjtkVJSJ0KKan8Q3gJefOCMNhdRQDjZLwbzr4 +bgoAkLbaBFCjiZxWZ6HAdMfSCV8uZQrtMS7b0DUpY0vdH9Htl3JqOOkK9RorYDQBuPdkTYFI +NsmtWVsFV/LmR891mOF3fBRaoVoMeJVwiZyNlFY+dyWWFzLp+GoTLcQtmuR7OkmOcBGxWSKP +cZfPqhf4dVQud7bDR2RNfJ1Hqa5kj8Z422sseYDwHf/T9OWWYvLwKGZhlUgpnzO3WCGrd/6E +VNeC1mKXt4F7BmADov4Rdcrp1mPXiVt7oIxLaS6eBNf2y1TWzjYj5ZFuKqIukDEJfqpwsE5a +snCw56nae+7luGs8em1J9GEXhWzXG15UVyQJaFwuB1iL8l7VcEQz4ABVrSTUWLLAKDsyqUbq +2gsAEQEAAYkERAQYAQIADwUCValA9AIbAgUJA8JnAAIpCRBht7Um2Y8DU8FdIAQZAQIABgUC +ValA9AAKCRAcacTlXpkF2y/FD/oDrZm143Rv9NV9InnVJ0brpqbB7aulFfhR1LDuJ/GjeqGA +QgJCZdHlzT2pfCXXswUlYzcWEatvGcDkoaB5Ya2qs+6nhBk8pT6XYRrZAtIlKIGrlCqoSBm9 +HXguGv+EIaEECr2z/Funx9so0mP+5aJn65M9u3lPmuAonj6DcHoM07WsfsXvQ4ut3fabFmzi +lLGeAdEDKIw8Hn3JBUOxUyFrQlOoL4/3qK1TO+cidz/2bATQQyIG2kNOSgHBslU+e6/7sWOQ +4ufmzm7dEsf197zPXGdXR88LT+d2uU2K4GkCffNUKxZqy9bXxXPwr4JBjxLDQnDvl50GAWjP +ZAwXEd8Okwl5+8xp0HuZ217WUqT8ib0oUUfwh2H1vrMPRr/46i6O6THpCkV8BWF7axPYIiba +eYwC4BkjZwK3tIL5ESf2f0xK4hbE3xhMTeqABQHoXd5rQ7SEaUuX7PlQ59fRs0Cz55vH8/o9 +zMm0PN6qmZFvRBeqjnklZcu+ZdP9+CMXt81NMuzIK1X7EfpkUoam8YkYkwcCkRvPZrSHLXZF +kfnx4jW543dPOfycjnv6hhKyoXD9CBx0ZcOicsYmw9XMilBGD3b8ZdK6RYX4ywKNU6KUdFJj +XB88+Ynv6QxDit1emMCHA1glzV9/k36iYLEIqgWBiwJeUUIcUqzgnBFtN13cyS6oEACUGUiP +Kbw3IkgGW19ZyS6FBNfgGIGW0Y82Br0KlCyaXnX0R4+4u2h7kfR9NSnhRhsvRnPIkiZATa7D ++Ew1nfpsDTnti0c6g/gVw9TC/rCyXkkLztRHVcWEBdvnFJTSp2LeFaHSGbvvZfoIGUzyUzoa +1P98NmRIY1cxBoizVf8729/zAaD4fAslxoK/JsjjDvDUrRHtaNZmUle60Jl/yFFzR3zxb+pJ +liigoP2rZLt+ipomHJIhoXXWwfkRO9U/egJ8ZUhWEpZvROnaNc9eVct5EBADxL7gHWjlceIz +4ndI1eE9AdEZDdUZwOfjmK2DcXjFBfZC+jhJXjY0xh3pPKQz90h9DIkM5WDcJPf6ep+MKSd/ +3hI2/JmmscQ+alwN6x6g8zDySMo3APA9cUvEFGe0+CepVcNw03jU4faSrHiMXsUuVGbA2kHa +YVUfzF5W5GbuHZZlGxoSiq+K+HNG0RJUDa6bkSDvrcJVNw1iUrowP+LLwnNsy5kGuU4evnwc +oN1w7LVbTPaq4RIaiqvAD33kiA9q//UNKnK4k81z+hRNaWGliyGpgqh+V7MDIqPfT5TMLdH+ +ZjTeuLrNS8KBcc2BmUpSwzdUReTqHmgO5peeIcsvO7GNMFWsgucZiAdIVE/zQv+SfP6jhS+r +jCPs0eeu5zl8/V+gXFE2wy3jTJEl9bkCDQRZS9m1ARAAvh1Nh4GgjpTFZy7uQRFz5PPXdZTB +I+Y4hTpF2heoFzZDI6SLyz64Ooglum3ZglQ9ac+ChTSsO36aw4b22kCM9WDmkcl7wf21fG9o +8gJDVjFjDWbwTWREaKjgS6s/Yb8f9gje/BGySojxynTi3zyTUN94q9dhVjfiQ79UzXZdN9Fy +yIx2YO5tOo09hTWSZg16oxP47Mj1ATaS6UIrQMcMnOp0kuc6SufXPSWsUA+g2lW0dmHgPvIH +wUfcjWqT2elF01e9KOFe7im29G6zOS2MRx8cr6KRg/eNWpHh5aI4quRUhYk4Kw4ohQTbs9ed +0YttS4PMK+sq6xHpb28X6ZgrWnelPY9hfwcR4m7Ot3VQUG8JY9/aTlFCoeTgkhop+MCUI+dJ +eY8depIa0PTzdEmEWRvPhTTv+CUdZ6v4z5LD6FhP+/5c6FCbcIb89Rp5fa53oYV5/KZf+0DU +VgmpXFU7J7ZrGgDeU7vIzmwr8kcx0vtsVm1dVwYLACpTaaQPbISQUDM8sEcqKAqD7hWKaxNs +b2M85L6q2/rnHq4g46yJzdR3b8EH+V9u+mUi9DIljDwcpvw7ReRQ9wPdDWLynnglIeGImbjY +fr324yaIl4vNORAkbsoCkS/qc5v6MvKvYNle5fzb9S9kCbNZmD9c5/bHPjj9ENeQvzrl2pFh +6dc1o5cAEQEAAYkEcgQYAQgAJhYhBBTyZoLQkWzdgeN7bWG3tSbZjwNTBQJZS9m1AhsCBQkD +wmcAAkAJEGG3tSbZjwNTwXQgBBkBCAAdFiEE3OrF2WE1uRxOpnKru769uyTG81UFAllL2bUA +CgkQu769uyTG81UFUw//bW5T7w2k8ukGfpIcm0gB98VgxKenSCmU6N+Ii0DwcNtzW+pmVWl2 +TbHIXDpvuD69ODWBDMXu6gBkrVzNEsK3uhzGe0tWA+5I7Vke3iEkbll7VRQlIOrw+n5NMvje +uDqKsMt1gMEEdgRKddYApEAi49vV7XnqkB2lLKfAnf6o/KqPm8MuQ+u0xYanupZCldwdpcx5 +rybj79Es0iO9Gh/+3qOtR6ubOz3Vn78Lc3y6AP9pmtdOI2QX8foGK4hNmgHSP6uPLh/ERC9N +ir0Lc2hoEhHEkQ8CnEaccp70r03VkEQuMJQJPUyRsGZ/gIm0SAm9JJxWHXJk2/5NUN83pHAX +0LA4zxtWs4fVW5f8v9eIhFFPTZ4au+/cS9D4GFx4mlY34awcpAzrny2tntGEejY9HSJv4PuF +ZCmtyS2q61N9EU8yuBwVM9cp5HntzG+OT4HYugtI6ibehM0S1Roy4ETwT+Ns41ffhCwdYMp8 +tzdeksQ35s7rkB9OJHj+q2dkGaV0FQb3FutbSpxbP4zk/dLqyxuivdUPHGtf4W/qklxzCWBg +0VDFA7PwatmEXRxTjx77RelTY0V7K54dDyVv3Jh2+FzuaQZzzuIhv4gtqHntaqLnYl3h/QNL +bOTE3ppvn9RUSR983Bd+M3QhbbwZrgG1m+hdUZUmji+wbK0wV0xHNEH+4BAAjbVzdNOs7hMv +jY1wVDRFjvICVorNdNdU3ELy/9BAoiwOs2+zjDXmsX+3YtdzwKvdpQ24O0TvH4Vo3BkvKkJ7 +5EU7LroAbYQ2423m1MY3eaBslmX7TUJ3XE+k7OZF8AmcftgP4nhC4IQSCtoBc9+ncyGN4da1 +BpYO7b19tO0/HST8GHSrEcU9bGGdimS2eNkSgybA8wF6K0K9yvrpTNSZ7OBVlzQfEn8s70Gy +zs/d6C/rTA+defnv3AMaciuINSEdFyfYq4wjt5PikvgceMAAkH/z69xTNg+6q3FQt/lyK7xX +5qPMe2oFyDA1H+Cb/uL7ioo+jXh9gF+0fk8OP2IPzxYhBfulpVtgclmOuaekzaKeIv8NFW7G +oA9OghziExePxg95OpL/VyQ7PJiAUj1pFovFk5HS6ejVZNEGJ/A5zLc1PBIcr/phu0luqhXA +hImsZS6858GWQllWULNWw8bX5Blo8AvcfFVdq9iAK7aHN7g45ZR7Ze6qKHDyFv4XWuE/rj9C +2mM/GAstvU0gGmbo6B1mNGMJuX3Gd3dG8fqFjE77OB2feJyfZ8UeF1nvG1hxlmuD1A5e6/os +O9V7kjhXKzM2zSO11zHQ/5PlUisoUBjJ/QIK4v9RBNGtbRKso5X9Fke692lVgrdggDJ3j2Qq +MuTo71rAVDLtxerc+GNq0GI= +=YjV6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 33591b5365a5..8a8298ef8180 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,945 +1,955 @@ { - version = "54.0.1"; + version = "55.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ach/firefox-55.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678"; + sha512 = "fdbe702f129c2e8c749fed009609c475282638b5e920defeb65b94cce807f96f8f07d02d916c91b3d50cb9f909b419d2c635b3914f8f059251f33f93b887c797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/af/firefox-55.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5"; + sha512 = "b5ace58a9cffa219e3a56eb5e427a482dcce4f2e4ac2a6955c3bea6c40b48940763129499803e86742ca3407d4a80973094d9bfce869bc2a321b443258fa5806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/an/firefox-55.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3"; + sha512 = "d737a3425592ecc474399feb2d1f82fd7cdab362ed406f26671ddb3ce88c8736b17627ac279c12551c2b27432f9ba8bb3dc93b6ca30124cd155848a63bccff06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ar/firefox-55.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f"; + sha512 = "31e834d78399549ef670e78d2ff9befad6d300dc327853d1435d02533379e23ae38cf3dfff1222e314165c8f80e2e4fb9f364a9a3b33fb3d0aaed3259414d321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/as/firefox-55.0.3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce"; + sha512 = "8393861ad7e2ab0a070ba32f38afb59bfabba4510f0f9a85273b4300fd7b2f45461d8e2c0a485e1d5776533d4b0bb8d06c78efc2a2a0c87af55fe5eede33e6f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ast/firefox-55.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4"; + sha512 = "e091884962a239f65f7bee05e1bdc516091b89ae7be1dd6517c4ae3b8ad34af0c49c04d365114cceca40a6a8af229256f100e4a1aec09e7e284fd6cbee497e54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/az/firefox-55.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42"; + sha512 = "3324d8041257adf120d08537ffb94e90ff1d701bd60b9bc3016570887c0a2ff2d10a406de599be8bf5146b62647f4b95b87e9fb48736c4d0e747be03a35b6d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/be/firefox-55.0.3.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "65861965c8f3c5e37d9b6e919f0ec506340b38a2cfe71905b43802ff3cceaa062ffb49516541253a8c944ea2a6b0c09d6523da6f5b8419857921c08a53b70062"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bg/firefox-55.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68"; + sha512 = "948b2469ade253a0c174d996053e4855e477f93f6a35351c3c6db10aba6e9894fa850289aa90bc7d830edc8ddad6ddce78f6bf5047f91701152c4b7dea10accc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-BD/firefox-55.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c"; + sha512 = "3cba3214ff62b5fbed875e7af40c04382564caa3ab613f44d25aba56eefca893dace583afbae172153fcbf1adc13cd0545e3c80ee72631862f46e4211589e103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-IN/firefox-55.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb"; + sha512 = "8a9335fce85a4787c091053842a45e2234ba13ac75568209d965f28a8d40ec42f8eef8da62878c0f8f17b6db052f72a00798bf2bbc37c7de9c861efcebd9e41a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/br/firefox-55.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd"; + sha512 = "1b08b96c1030302ac47baafbaec63ce87a5744a284c20a6432208d0e3c7750f15941f89c69fe3f8a7875a7eaf7a9872855c72c4157447799edc2ba6bcf3768e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bs/firefox-55.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516"; + sha512 = "35e3a1c0b098c5ccf68e2b4547cedc513d31ca62897e0a6ceb6283e0af565ee7a1da847459217dca94c3e192e5b643dd0fb1e302ca54d866f7023841722f8aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ca/firefox-55.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5"; + sha512 = "372881da1ab01c36e06c9bbc7a67c12adf2af454afb8baee79b506d65e99754340e0650a7c16f01ee6735d2c2bad6ba82ea437f3d6265f17efe2ba26d4b55471"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cak/firefox-55.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4"; + sha512 = "447414a13729e3eef3311802c4714a00c707f3567d4d90687420972f57f4ab7079afcc741f7ea0e992f916786919c27a6670424036b50fac3be52bfe8eefbc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cs/firefox-55.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39"; + sha512 = "2eb5388d2dfccc213c730cf605b134e51c68496c93dec255c9ede8820de2d40968371e989f125c4ee938622312e782d6d68b28c836e7c8cfbfbfb100ddf59441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cy/firefox-55.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5"; + sha512 = "f27a12d1e9c9c5712f2da5236a2d81b8958eb8a208cabb8b6e1e75e40579bcefd9ea17a64d5f530248ae8f288ac1628ee350b1b280aedf3dfb8948d5cb800983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/da/firefox-55.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56"; + sha512 = "f8957fea57b1f48ea18eb65bcf5caf3d5f71aa3ad44c697861d9b7c7655cfa99c66a49b034eacb8530d42a66b2a458ce4a4c97890bf8f28cb06d24d000517c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/de/firefox-55.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a"; + sha512 = "11a2076a5502d2edcf91a0b1e8776f71be3e5970885843096ab2e576dc5910da6b758b9372caba83fb5a6c20fafbc1dfa8d0a238020b32f93a7ffe50ba1ec430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/dsb/firefox-55.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd"; + sha512 = "e788a73b2b77d2cf6aac1557814df1d88ad9e036b1d58218781dc284433f3b8b9e1a34be4c0bceabb99b6238dca2f9dee8f5e97a994e09f5fae175eec7e34b9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/el/firefox-55.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818"; + sha512 = "03099311390384c652e7dbbcb41d60eae522a1ecaa69b6e17e214fc0e06f81739456a2543adf9808b2b08d6b0c0b84dbea6168c70be4cc1ef71a04e81164792b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-GB/firefox-55.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f"; + sha512 = "e971fdbb2cbe2e080f75900df9a32506e26eb07859f635c9f9b4738ad20cf7bc939bfe6b8a91455178d124a29d869f5f960ad9bac64ac863d31dae3a2f4ab2b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb"; + sha512 = "99f270542b0d77a0bf2ce7926dcff04a356785af9269854eb12bd50c179e1d5b6db66885900a0f1dbfd1ae50a40298a2be7610b55380886719fbb3890f9e66fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-ZA/firefox-55.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637"; + sha512 = "837b11040ac50920f41400bb7764864a42fa84da9da6c606c9475f862cec3bcae8ea1bba3b72424c668d9bc036a00c7c360ad248285ca8d6f6d94aa46c80b868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eo/firefox-55.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e"; + sha512 = "0d7c650fa35e75a6af940bdb4662e03fe4a76f5fc3750ec4f813bc6570fce252256f6fd1e6b26a15c6f19c819a0e0bb2a26325015feb37b4f5318a018a8c09ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-AR/firefox-55.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d"; + sha512 = "442370c45f57cf0a63da9d7b33e377b766d71c80606144d4cdfa956c6d4d5c91314cd3f9b7db007cefc762dd2cf79bbe1999842f1ff74bcd85affb7ed1305158"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-CL/firefox-55.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057"; + sha512 = "ce5cc274961638c396ea3350857c79fcf39bfd116a9f3ceda74bef9d5eee2dfab54b12d77cd9e0a01bf98856f0b7eb8ca155fab50f444a4eab785086e8045734"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-ES/firefox-55.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de"; + sha512 = "45aa1e6e9df4bde4fe67296ce735eac1356e20bdfde638944f809338869ce243c16a23bd6c066cc3df54cd1a8b7ed1937eeb56f556803dceb3b1fcdc2ecc273d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-MX/firefox-55.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4"; + sha512 = "17c4ccef75bbe794d398121beaccdc3110d58991d5a0bfca857914c8fca5c866b45d1e4cd07e2be8f4f029a058179d61c774b74f1e9c6fb513e547a79ea901cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/et/firefox-55.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7"; + sha512 = "072b65588b1829309af5b84fe46e15974f8689e07be1bd24fd09cf5ae403d66ff196b1deac32de70d97fd5984d5579aa991a9fcde4df8fdd1884050507dab13f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eu/firefox-55.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76"; + sha512 = "dfde116081eb810215d29a142f6f3c16c0664c01415c6d2f3cd6385097b55a49b112090934700e9c217a286e345be13236df1768f602232db2da0a47edeecf03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fa/firefox-55.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981"; + sha512 = "7b934fcef4d9eda9895f4ea1a0e52e8ff40186bfec73e8c1171d0d96ee6a2b19d7a077e4208c0d6c768f6078a90525772086ca08a179036a2723443761e69259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ff/firefox-55.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3"; + sha512 = "1e6667da86ad91d5bdbd27bdd615f8152a84e01d6304de4da90d48baefd758fc6e124c4253a00a89431b6c860ea574687237fb20b8ff95f52ee55b661447e723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fi/firefox-55.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb"; + sha512 = "24d8f011fff7425163a3a1ebc497eef9fbecdba8deec7ced18d1af0dfbc2e0dc31dffe29a7d6179972026aa04f5111ecfb5d1bdb29f466d041e5ba8058ae7f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fr/firefox-55.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f"; + sha512 = "651bbba82549e5309373cc8ba3bf00c0cb87f0a8e1f943ef4c55b1d9157879a6c0132a8a296a9df3d10a501a1a13dbbfc18ce97febeab9b2e19fd87c00ce860a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fy-NL/firefox-55.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17"; + sha512 = "0adfc657c5e29e0af9c33972a93973ade9a4441e32998a1e8ac45ef814791637e26fad074ea2d3669f5d3261bd48afcf1abb30170844db12ad49a1a1b0a28bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ga-IE/firefox-55.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa"; + sha512 = "dca148b6cad926c1b57a2fa1d8e2175cca84f9ad7041a517fcd7436ae557219a19efffd6986ba7e7d1b0ff51f895d6894bc6c4316ec92b2ad79cdf747243bfc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gd/firefox-55.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2"; + sha512 = "f4f01d4253b0e2ce56aa15839ca619df93fff7b60a771440a7102df1d84d45e37a7981044ad40d03e8dc70317836968bd84cf3ab3985736593880f26d95d7e60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gl/firefox-55.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34"; + sha512 = "2fb7a2ced35eb942cca10b4ca4b89fe4c0eb1a8f5aeeb9d62989717b704a922bf2678251e4c5fdb4a3507255f1548c183081d88e1586a727c17ec821240443e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gn/firefox-55.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff"; + sha512 = "28a720b0e8c3b452ca6824db44f274728d61471a815f858d95498ec8a8662973b0800e34cd8cceb5a0abdad405ee5eebb87f5f8efb5e07ebb8021bee41e73827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gu-IN/firefox-55.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b"; + sha512 = "5b1fbbba89814b15c6d8db09a1f335bdf37a300035ecd637909aba756a6986b3ed2107e5f015df2122e594e3a4a84775110f2e1faa9412302758f20915da5b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/he/firefox-55.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e"; + sha512 = "96dc38740133f31d385f5a2bfdac4af4eb9ec13c9a5fb29b989de34349eea3a682dc50a57b52037228dcea56b19535a31c37b47873b34a6383dc687eb3d61680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hi-IN/firefox-55.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6"; + sha512 = "62ebb2492546d9d6923a93b506c573e1bbb1cdd563700db4980b0d9afcfe19ec3b31b34b5f0d141e1a5827bf922978860ab13e36338a611a6c1143b225d6c546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hr/firefox-55.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83"; + sha512 = "1de18ef034b46d2d610268bcc5735e10671a6e7e70c2239d869606cebc0421c0c99032c2deaba2b0ced97c937441731a8097598185a81ebfb609662471081533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hsb/firefox-55.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37"; + sha512 = "2a500029892890bbcc44937e02c2f8dfee42fcc0cf0397e635b2e564aff66806424f0c0105440e3fef973289ec655a109b480c9c52f9cf820ffdedc7a5314377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hu/firefox-55.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17"; + sha512 = "3227cf91840b19e45e4d1eb1454d0d1ebfaae1f91a632c93e994cd576f3d6dbe1acee273e266b12a8d8d18409e8c7da8abb2284a2d85e0f48a3e2619d6ffbeaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hy-AM/firefox-55.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117"; + sha512 = "47d744ae1aa81e5caf0ec14bbb19289bac77c969c773a3a98ef6b22577a1b345127333281d9d041c9a835aa2a6313fee26dd5e8d20e452a9ebad049eff96c560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/id/firefox-55.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559"; + sha512 = "3745ceb9ac5cb1a11d4fde46787a435a44c6197d7cc557fcffd6c68a332105eee9e0aa4042dc010b11e0a4846caa066f96c786a744b45a2b13b832b29deacce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/is/firefox-55.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5"; + sha512 = "cdcc14717bf8460b2ae2a21dc5ae4d9e3f9486ca29d744149f90e26f09f6fed54b40739f75ad644c57b8a1e4b16dac49f43167ab74e8e29b850d6dd8b22a68fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/it/firefox-55.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c"; + sha512 = "d93cfd5b5bdf0dcef5a82a39e592cfb3aa6e4b128ad22c38fc5ba3dff8177947c877b55da6d45fdb0e8fedf73aed024630eebc45910dea6760e4cbc0cb47f971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ja/firefox-55.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4"; + sha512 = "d9508e377e104c869c38d62edd255b2837092571c0748112554efa8fd9eb2f17319e3e7d36fad2538b49eb06a82151e364614416b3bd17c181923f5506cfb445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ka/firefox-55.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2"; + sha512 = "6dd2fffd82ccf111b133431edde1c8bdd34769803cce8626987b7665203d64925aef1c2bcbdb2be70897e3f66fd40bdfedf4b6ffc9dfcb2e8f0ee585a1b75cea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kab/firefox-55.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9"; + sha512 = "389d33267f621a82d08e179005dafe88284a2580cd2803a3c223e9d132b471a69ea97647883ca05fed98d96048b0f448f376dcb3994c64c3f25598b601f2226f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kk/firefox-55.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da"; + sha512 = "48b5cc20a559aceff6f58fbc5bc18ef72e60ed5ae4ed86e7d30ba75169a1bb62bee19deed7dcf071ed470719c8f97117fbd2dd0f973edd3cd641500747fc1dae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/km/firefox-55.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4"; + sha512 = "783a67160300aa95ff851e913b5af9208db4d1c96696db9aeb153a6ca0d061b68d2d83fd231b1ff73d11fb6c9689ede2c1632d43e23fb2c923e761cbffd73b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kn/firefox-55.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0"; + sha512 = "a4ae433d78844021f0fbe9a36b2baedda3c80cc10fea1bdf865d110c52c23936c51f5670917947aca9c313d7de936012661a96b498f3a88dd73ef6862a1035b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ko/firefox-55.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1"; + sha512 = "a1075cb1d622af46b47110da0e0c846a3a245fd94a89427d1598cec1e30f2b43a5697075358bddece7b44fa4bb5dacb63751a6cb16f00a447b9c3f815a96838f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lij/firefox-55.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47"; + sha512 = "ef16c60f7a479876655338a822d0a366340581f90ba6a5927336aa24c7241ae1de7295dac0aa9d94758fcf2f9de696ec5996066db51ab961e108b73717f93019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lt/firefox-55.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470"; + sha512 = "4eb707f286d699948bcc7df14096f32581a0ba2edbde59b89f1568f6d5a96e412d2aac210d765707b4bd797845cfb70569e57b6587a8fa67b81ce56d23648666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lv/firefox-55.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8"; + sha512 = "45fed96d0e82dceb48853aaa08ac9f6b26ef16ee8fad04ef15cb76cc2f1969a3733fd74468088803a735feca5e5416b853f41956d240d4150254a61ac86f83cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mai/firefox-55.0.3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f"; + sha512 = "14739a5b2249386786c14816115a9b1a21bded28083bba11aba28012a9c7f5240d7b4dc3342192689d4d3a096d6a6f516d22f4370e49d465ee07721e937c1380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mk/firefox-55.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96"; + sha512 = "fa44baf0e211a6efc3498c077911879593bb3dd715dfe3127f3177801f86fc7561f1ceefd5743cf4367bb01082a19df1f003ec879d314d252877bb69e2a12213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ml/firefox-55.0.3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1"; + sha512 = "91b233c59500256bda1e9236df9e282af2a161b4085e4d3af4807e4d9bbb568bf1c83b1d7314c01e10dd5757fbb9d291ac3df334e40e3f155f996db506996bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mr/firefox-55.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb"; + sha512 = "eaf62cb8a34af24dffd29daa1a5e2b9bab7f58a4016a6624335f621cb75f187d09c3fba71abe780b58c3e4861b640a1e8273a682d02c2179909249725a44da30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ms/firefox-55.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b"; + sha512 = "f089fa240f58ebc248fed6922eb1c429043504df079027f0f8122288ca7277bfb24644852c73ba1cb8032e5951f6066b4175b59bcd894485e7adcaf7823776bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/my/firefox-55.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9"; + sha512 = "747ae8c0826f463a9b5f6e68283069ac35501245a3ec4e3df356e4244bf649bc83f3564bf7f7dfd572f7c09fc2b4cd533b7d60a1c2839de9ff9e049945d3238a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nb-NO/firefox-55.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9"; + sha512 = "063eb5efc2a47e6ac39d71900844df00bd1508873ffda1a1a7910bceb83fcb33f33b6de00470e1ef23ffdcd46dbb7ee2e60d9272e43f74275ac1c3b34c330f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nl/firefox-55.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3"; + sha512 = "77441aa1589345be58882ecf3890e2f029b80ba62946109d48a105d421db7259532ac153fc1b5dfb4ff54c788def590dfa98ebb6f5c95383374843e9f8dba1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nn-NO/firefox-55.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd"; + sha512 = "0369a0732cd13ed14059041187de9bf10ad018b68449513da224ade76827a21df8b87743137028c788dcbc76c216345a50bc82f097aaa991d068cb37473ab5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/or/firefox-55.0.3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b"; + sha512 = "dd3a1a56f506cd20163d28c8aab98958dedc811f921f4a0c277be59d93379856b04fa7362d3528c5840cb024280919eabf7acec031bcd1a198012457a4061a88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pa-IN/firefox-55.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c"; + sha512 = "04ac45c34a0373e40574662f841879172d6d49fb79c0b39d0394397f26e3291a5ef053b78dac8d1bcac9d55fdb9e3e60dbe315f2416d4b93ecf6a258bbad31d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pl/firefox-55.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4"; + sha512 = "1037efb25bc120e8aa8829362991461f22c0a7422afd45a3bcd29e81c81d009efdb9b8011e09fdf95e2d59a37199a75fa5ac46f042552140bd9ab571c63ac702"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-BR/firefox-55.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f"; + sha512 = "66372b345b017a46b0bc6a5eb2cd54854e15fb6229b72b418dabc605003542b97170c72ef4d22d05a41e8622c8f43767e32971e09d1d0c3c4f58c008a0028532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-PT/firefox-55.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb"; + sha512 = "99b5a21180578bcc24e2813e2304a3b70f6d19c199925b0771938366e40710329ac408b59635f741e3082048972a740e84166fad9d567d155bb714aeac35037d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/rm/firefox-55.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36"; + sha512 = "d67cde6cce18638e061256a562774a332192242a506b817b033ba41fe2f0f854bc0c80ce9b956f5ed7f25e51fd257cdb17673b05cb139a7e619cf5f01d90fd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ro/firefox-55.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53"; + sha512 = "dc33064cebff3ba13f169fc1f52f4134c672214431db0d6309b111df8c53d59db5ac32ec54e5001d14b837cb8bcea02ed3b48763bde75c29fa8e4ba3a406fe08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ru/firefox-55.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea"; + sha512 = "24b5259c9a146176075e26b37744759ce3f9b24c7e7973b9394fe2a70ad10410e2c4453ee55a1bb2bef9b766fe829b3a7dc99cddc4686081f413f4cd2537be35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/si/firefox-55.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c"; + sha512 = "0d8590d03413e817baba1d5f32ccaa7516d258f7eb742ed619a8615f7b2191e5229674730e90accfaa1711d6730c458e60c2b142840a62e526127257632233ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sk/firefox-55.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3"; + sha512 = "c2afd8ec0f78f6d8db747500c8dafa3a188a10ba6c1cf713d3997bfc349a02f8dff58663b51ab24d545f74308d4b7db29c2d6a5a92f9efa3520b42e84795696a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sl/firefox-55.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb"; + sha512 = "75d545f89dc2da70737910f0288a91a6a745675419aa2ed41e0652072dfce0696b0b01197f0cb7dbffbbcfc4e8350394e94c621d2f8e36c65fa95163e70db50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/son/firefox-55.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873"; + sha512 = "0baf5dc181eca057107b2d2ea89fdbd5662a0e443f7ad7adc286773da3b0ba922a90583b4961908607f6b6f1f1849c56ca219e661b8ec3ecde2ae4e1dbec0f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sq/firefox-55.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052"; + sha512 = "9d220d7177945732d27c77fede9528043f1ced0e26968c9589aab75c727d808440897b8246b0ecc72c91a375f532c2add002d2bd8d59e3fb0f5f9474f42e144b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sr/firefox-55.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8"; + sha512 = "8e9ac8e24c3af617ec99e77ac849267712ef095d01b177c78e8e8a0c35ca28b4567b93fc9ce1eb5c5e7cc16f9e1e9ad19df30f483db86d25e01e665c73380838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sv-SE/firefox-55.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842"; + sha512 = "4a5895a1304c24c19ab270496f6de03a46059ac7d47edb834f36ec2ab39ab363af59eb742f2b11c325b69616cf4bfe93abe2a6720ebb5654cbf56e6868d07508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ta/firefox-55.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6"; + sha512 = "00d6ef2853eff0f6e867087e0fbdc16f6243d349b14ada2c540c8d3bebb520b682248165725ca842c77925d71b07e27ec15426cc215fc256caf34f56055351af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/te/firefox-55.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6"; + sha512 = "ca9b12ba9c26bf12c709b8204206cf5766a819cbafee1d71fe4e12897fe76fc9144cb281e11b94f35243af6cb7d8deff2dd3d05444fc92a18a8babc8de9bb72a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/th/firefox-55.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3"; + sha512 = "d58decde55543eb8ae134335d3dc10f478b8354a723c0f0de2cef89d76c885ad442f989590bf5746a60e9bd46627ea520cc296f6811452d6ac4188da261ac941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/tr/firefox-55.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537"; + sha512 = "1852fe5c47454a7b5bffc236f12843f0fc7491311979bb0793cc8150943f6bbc39852b30c597a6167d23b8b3199da77347bcaaf8a7d58f50f65019dc6db5a8b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uk/firefox-55.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744"; + sha512 = "c908a9385c9bb07bbe55e62962f19af59da63753284dbc90fa4418fbb601a787f9ac6448906a45da73929e7fd66ffaa1d1c643e240ff288b21e66494e73b9e9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ur/firefox-55.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd"; + sha512 = "e23aed0297c0605881baaed3df11f327db42467d8f0c764763ab0ac08697f1a7d3183ca0dbe8abe97d46503d6f71b9efaf046e5be68ac8e34027e8cc70c1c622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uz/firefox-55.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac"; + sha512 = "894e4bfa2919983c8879bdbed542b39da58ccc237e93a981a7dfcdbd0fb91fb338770f89c46cb97d4af3f3b8b9472983ce72c4fccb458d50f70d79b3da6591ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/vi/firefox-55.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24"; + sha512 = "5011071e8f1be873e69d7914c99b5fff3a510f74a064525f71c45373ea1444db4a2da46e806f0cc6f20032f96ef63a6147961acc4f6a7d9af161f08732b6b4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/xh/firefox-55.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337"; + sha512 = "9bb89e5614745a1fee19241d96abb15d7ba51a19b312c3d47d0a931d4e111b1e5796a47b97175af44331f4d7d86158d4c07d825b4f019383e5d93b2460a17ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-CN/firefox-55.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442"; + sha512 = "2d9a2a0c2d0b21f5c3d58fd14cd7b9fdf3a7b45cb31b124ad17eff538e4dc64e55c035834373d0093615e93fcf61033fd16151b74b411d774541872ee4e1e914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-TW/firefox-55.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e"; + sha512 = "2d55a1458104fcbd6b6f24d5ab6df1103ce1390d4bae44fa4552b6172a25a36d2456c5f5466abdf8a1eebbda926f1c354b12183b12bba497ea1b7739f804a167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ach/firefox-55.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d"; + sha512 = "f66fb15ed6671b27f03eeed20c42a93a31ec2589196160ab80d27b2db57f580ad52d3f23b03a3426e90753b8530ec766e35d3428561b837fac2444d0b9972e17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/af/firefox-55.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f"; + sha512 = "41fa15ec74a0b53fccd6f572e4d350ede8eb637d1cdcfd38db1ef56e29672761abfaac76b2eed74b59c3a907238df02e5a193410829ba5b738a4a7d2ed74a0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/an/firefox-55.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46"; + sha512 = "900409612c2ef05008c8c3b27852ab94038677df5fabb2ddf460ab731d57f5a39b9928b5cadb0996ffcce893983128bc04593ca6dbedb528ddd634199d92d311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ar/firefox-55.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4"; + sha512 = "445af6192be988f8af74f2ef618c09c3ebb8f3bacedb0d622740b9068665b104146a7bb06306219193455cfdb1f508a924711a2480a31b5d1d554361a9ebf576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/as/firefox-55.0.3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e"; + sha512 = "9230c78a28845292164c311fdd882a2e0be590f09ed680c5fa91cb400570b1da8efce86efb96c1f006d166f61fa463871c9c8d7276a4f49a07bdd89c9a67442f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ast/firefox-55.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331"; + sha512 = "8b313ba678e7beb14788fccda7ab1ff4dcf8c2adee8eee7a8a1224184219b167f8b84d81ae1c73400781bdd0b6c8a5e3e0e6bbb3e34b26587d5eda71130f2215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/az/firefox-55.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5"; + sha512 = "8092452d5e2197932a4fe126e891b8985c008fc28d24ae2ebcbc8554a55f1592de2eb0e0ec6b8d33d483aaca29c644b4b5956ea49719e6bd06b88d07ce200169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/be/firefox-55.0.3.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "6020147ec72cad49e2d1ca93f3eb4e7f5c3c435f6f0a85bbe0a39335c3791d52c628ad5b9b97dfaf52ecb61e7ba354e0bb5d00770cb88c79a58db0c002f2aac1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bg/firefox-55.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725"; + sha512 = "c34a98c08553a7961f3dd2af92e14f72c6bc9eb6fe0c613339570d9ecef1f015d0860ba5866107115cd1ea71a86b4c8177509c173f108db316b0d1a4feccf0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-BD/firefox-55.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085"; + sha512 = "d1157740fc765119441aab489252db93698e82e43a8bf2577a1c36be535adc782fb418a439c56c1954d58091514db4c9e33b7a8f281930387a9bbe6066062b52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-IN/firefox-55.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b"; + sha512 = "ada0aec0383e3f43bc46d72e0e79e3adc64cdba5d5d6fb76315077403e233e5ebb8622795b4e3d78bd16ca3b5978259218c0873f547828f420aacdfb53753e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/br/firefox-55.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66"; + sha512 = "714d2433d3716d1d9f08025115a7c4a20be975a7d66684ffd25439f68cea2b5dab2c37689c688b7d6eedddaf756e810556bd53366a28ee11437e1180a563388b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bs/firefox-55.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6"; + sha512 = "836310bd3eafd70edc760390fe0fa33659ce2c1f0243ffa21d5da95d59462cf9301f50e89f8e413a91c02f5f362ddc34e18498f635ba19667ae8bb5d69bfcd57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ca/firefox-55.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68"; + sha512 = "51f2ce893ae1513c067dcdd0525b254a7c1049e952e56b31f86eb3249d741d131f7df529400039bc63b61a673cf1fc55e7dc12043679def7fcb583d748afe4e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cak/firefox-55.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c"; + sha512 = "ed948b4f57118d0e0fe7deb5d8e117c1cf8d7df0c6d5c1f1721490586720bea76e81f05ee07553f2ffb42675b2ce5fd8e3dae342fbe9ec7836d489472d1ca673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cs/firefox-55.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d"; + sha512 = "2b16f351f4984310355f9f9b27d656bdaf15b2641ab5c83c08d6e590562284b9d4a89d7f26be605957ad3f4fc81775155255d1f0080ee0558dad96c05e6a5591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cy/firefox-55.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d"; + sha512 = "ad4719304c7ee807294853aacf1516e29339be23e5906bfb5725266ebc3105dc1bde876b29573609de0f38b180f75017fdcc40e8602f92d779578a450146f6c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/da/firefox-55.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7"; + sha512 = "158c318c5b83dacc3ca737e387d47845a43cfdae5add8230b9b4055f936f212fd9f25d2837ad9b4e177e18beb949ae2afe5853b24331facea3fe410216b8cf78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/de/firefox-55.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04"; + sha512 = "f9ff911f2cadc837685b814e906d6e03f019a004f0daff5b5af902467e905269b873f101b63b9e6cc33e357b5be06834878b072b2f8b7e08cf9f16d46122f987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/dsb/firefox-55.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912"; + sha512 = "d4d92ccb3073d038836c92ece1e7cb94e8c2ad1210c1f70608f99381fb02fc88aa61db5845cb123af11794cb39d14562e9e034be4f1519234bb9f8b2f685eb61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/el/firefox-55.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03"; + sha512 = "6eff466dd1b04611fa8af686dc70bb2530e4392d2eabdfbf51f4b679060c7d5f96fd95120e60cc629eea8b23f2452f5342fa5e5dff6067b820d152906ac19882"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-GB/firefox-55.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61"; + sha512 = "e8193bc433fccb5d02254892f2e4869cbad215ab9022dade1167082d3559545c7d9a8c28b6b6454183e1a0ab707f0535709cf551977c97398459f816ecfb1b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-US/firefox-55.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622"; + sha512 = "880084f39653f405a3a142267e0c6023779cac219932d89705750f1384e08e21d70025152dc010ed19a5a3c6c4059948892d6121135a44de96ba9c6dd185b5a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-ZA/firefox-55.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a"; + sha512 = "d42d7a3e9bc2c3d06b7579077a99db5bd609b62e807862e5e03717cc84c2b26e9202f8e785ea16bc16182aaa8ebd8b83ba2b0b73dae133dd6466ed46a75351fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eo/firefox-55.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c"; + sha512 = "2f1aae311a095e8d48df3106513b94e9b1fb2cb426c0b35782a61bd7cb02215f26039e3090b78401120fbe81a548b5de819c3e49cdc46a41431534735527cf40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-AR/firefox-55.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d"; + sha512 = "71b1c0ca8dd8483f6c40f62215b86b7633c76097aa9c2d94bb901eea5f6e8a9a5bd99255064c700308569d294caeafee7fd711191b9f393f0b607768edbe2488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-CL/firefox-55.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f"; + sha512 = "065fe812e9a4001b0cb282efa5c667a999429456de1be2679fb656b88be7119d252164036a9c23829722e5f52b29512809ed4ebdd0824f6904c81865a1a96a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-ES/firefox-55.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5"; + sha512 = "c2c22c22624e55d2463644fd0e3812556b22b7c664ef412613485278b5bb9e0cda8f17e9e57798cbe6b93a3a8acfad9c287abef425e1c064374757abc7465edf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-MX/firefox-55.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f"; + sha512 = "e0c84c217ff11d3ed882d49edd68b8b72589b5a1689dc75d54a895dbe261166bcbc2a14f89f633749b5c9ebc865e39a01bb992904e897d518a45840846710e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/et/firefox-55.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd"; + sha512 = "7639e65067d23d20f4ac96e1ec87efcf3fd6ba912dae1fb68e46c4eb23fa31352589bcd6841df66e292c08a332243dc305c1800ee26b4d91d6401b873d517607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eu/firefox-55.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad"; + sha512 = "8251eab30eb48b0012d3df66ebfbe75d75d36fc4d2ef71947113f747741f42ae8942db7a40df777973245be3c72949a303fe013341bfa64753d30ff05407d592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fa/firefox-55.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332"; + sha512 = "418c2ccaedc94c695dd77bacc399d7dda65cba53251eeea8e203c68a80fcc2fc83f7f6a75bd2d919a5e8f61a148b25da7ef4e4026bf2ab35eec99f39bbc4daf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ff/firefox-55.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b"; + sha512 = "eeb0f38f0aa9cca8c7d9530a60416685054394a016778006eee3fad363f05ef8a362425e1a318d18b9f88c409b60fe380dfd86080825929aa9cd2553392a8b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fi/firefox-55.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b"; + sha512 = "678e4396e41c5674b8bb5a536c498b48312b2fc029ac8a34fe152b93392e6337f41f29c755157a0cbb3af39098eb9a821ca288b1b09d28da417164a46195f5f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fr/firefox-55.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4"; + sha512 = "2f94ad8820602f0687da70da22dd1d09ab7901e3697f55fb094f7e9ef2aee87b02aef529b58b528cbc7a3d3f7245f5fe2886949201fe902463febb1900c9e38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fy-NL/firefox-55.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87"; + sha512 = "7641e748104314754fab92b8d08a3f1d45871b10997a7c42b1862bd69db8cb8df41251a8030488d673127b24da40159996f1f9d88869ddf90cd60f9017cdf1c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ga-IE/firefox-55.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4"; + sha512 = "8eaba21bf5b37552186db581f5f0da833170ccc1eb5c490911b51771a72d1c48678aa680f29ef5f1a3a3cc019ba5e9a58fddfdb9acd08b2356886a84eb5801b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gd/firefox-55.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5"; + sha512 = "71508a24090f347738fc0511432d4331007e4982a69d2b07e8ef39a6c0917db55b6a0a1c4b5397f7bc96213c6ab67747a4252bba3625b1ec7ad3dbce4b6976a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gl/firefox-55.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5"; + sha512 = "01f4fe34072d62b95e0197ce2622334dd851c14066bb988b2744a983bb766d60852f8a1144b2d2972ea0a7edc8bd974934e4e120b9e218ea8307744ec42ad268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gn/firefox-55.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd"; + sha512 = "2857bad04c580841f58aa29d02d30c87fa72d5ca2695c124ee73f5cdcef93e5b7cd02daa42f2b93a569be6773b0edb9c9da55289bf49f2e442fc91c1cf97ac47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gu-IN/firefox-55.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1"; + sha512 = "8ec3538b7d0278caeaae64b19300132c76cefc3345e66a76bf686391ce35cb578be9674d14b6cc54fee2017792e319496777af337401f3b3419af99e86710462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/he/firefox-55.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3"; + sha512 = "82324d45dda57df70520e878938a646e6692817f4f35d6d0f0518d8f8c7ce6183f968f9863e83304f5f41a5a6e135d77f613dbd6d277a66f6d5db9996381d949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hi-IN/firefox-55.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c"; + sha512 = "0359d570441db163c8d8346a0cf1e50704125e6f165a6e1d7bbfbcd0ffd89fede9487195de927d9eec5d4f23889dbf4ed69d8a7807ddf93291da79bae14267c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hr/firefox-55.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f"; + sha512 = "fd3e94d57decd57ac00450b9b76cdda282bc2b528cea4630d6e835c5a1ff9d56c7be6c67e18e977ff4b3d00cc4e1db3d21b73debb7194bc094e29a49de405010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hsb/firefox-55.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf"; + sha512 = "0a6896110e471501194086932f155d0a5302fbae75fc0403cf437d13d5e5e3ecdc382ac748688f7918307e45d294e0b29100831fbab5684afb8d78f9031512bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hu/firefox-55.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73"; + sha512 = "ed27b99b71dbe5f51db4a981e4c93b59c35d7ebb2965b7d12719c70de41512201f37f4540aee2bb723ebdb7b2737df668babef889847d3c136d6083433e75c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hy-AM/firefox-55.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a"; + sha512 = "568c1e4bc95c26b5b0113c0784a305dd5ecfba56f5cb8318f71e135a676f9b86e38fe31675684785d2cbff7a1db46910c0ef7c60470791f9b6c0334422df83ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/id/firefox-55.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207"; + sha512 = "91e66bda4ef701bfd10e5170ba463fcd1849083651add4cd09103c5eb6532ce5f72bd30a15e0caa811e2e78326fa53429f7d232a27100ed03207f2a2110730bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/is/firefox-55.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8"; + sha512 = "a9fe82f9045ca421c45bb9f2de9fd28b57b22329dc767b402a7393d0275acda591cd193d0285395a36907a9b497427a88d2d4da2c224bcd123dfbd53888b2e3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/it/firefox-55.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173"; + sha512 = "2ea32878113a4256eb9e264bfbf67a81803f8c89a63d74e3ba66a143ede3af2082e5fd13f1e761147f5545c29c70f578210b2a4e5dbf2985ce957ce79db2d568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ja/firefox-55.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b"; + sha512 = "760b3c4ad18d6af0b1bc993dd9d12d76e30f6c197b1e58d9b4606d271ce502fb609b1208c0ccdea222bc7076f03dc8923e61cad092d23c0289ffb5bdd3d8442d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ka/firefox-55.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d"; + sha512 = "5a2c4a3249be869c5e70369c38a3795de3cfc2ad9bf30f933f82b4a286d72fb9c936d4df8e1320105a4ba20ebadaaef1659ecbec80eb9e8e21aa8f403d912c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kab/firefox-55.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f"; + sha512 = "7ef692ed2101c094a08b3593ba2d1738a616803b3649f83f650c0038316fd52b51e8cde53116015a54dcdfbfeb9d1209dea2273705142bf431b29c2f6b7611dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kk/firefox-55.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44"; + sha512 = "bd88bc609a6638f9cf825e2ce9b7a615c555532275dea9dc3c6e79376cd2d814b886f5266631166a53ea38542e66011608f52797febd2867d15c18223d5f7788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/km/firefox-55.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6"; + sha512 = "b38ca1ff78eff732ef54d71cc956a31fe87922e76df5cef63ffc13016b01394aae904a17b7c8905d62120420bf715b8c37f73cd5fbe2468003d55b8c28db47c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kn/firefox-55.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6"; + sha512 = "ae05bfa4914d479de80f0cb6842a570737b21097a60386b700cdd831374e6197cbc5d0b171b2091ce962e082bb7809fa46fcffb4a1281d7c38d5f57675b8e925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ko/firefox-55.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830"; + sha512 = "20993f13768ea3b035b0b9d80db2baaae2d07757761a9d0a8e2a992df2e7ba3b891222c93dc3778f1b51b381ab99adf2671161560904f99a4756d5e4999cfc82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lij/firefox-55.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b"; + sha512 = "0bf873490e9a6dc237d5bf2b8f32676b78eb1d6d9a8cf5f5ca9d1913b4b235e9694010463ba13bd082a90cae23d65f6eb33a15a8dd8e21092a5c966c2805ef54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lt/firefox-55.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd"; + sha512 = "0660a016305c84dc4601bc1e324864702233cd08a356673f515d8b9a9b7be443c6e265cc6072f144c49a097ab3d512b033ef0ca657be92117f6b646b6e2102f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lv/firefox-55.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c"; + sha512 = "6fa4d166fd871e1d76d8324cfe50217a468c6da073905504919ab69c6dd14521f585e0e347fc076c985afb5d41f86b3ae691f09492c97400ad5245ddbaaadcf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mai/firefox-55.0.3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54"; + sha512 = "a18f5580bcf74d2dde0d2c1bed4413add943d0e7ce8529d3fb5ab55b91397352eb70ec8c393cf8f9dd89e3a32f4187b4cc93954800b63d1a10853bcf13202b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mk/firefox-55.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351"; + sha512 = "72248c99fd9bc40ce579992438cd94b050c18100b26cbfe575c6199ae3b986d1d8aeb8fcfb63c8b8464b7d4ec35f6b332fc32595e72603eb7d41f0b0dbf3c2b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ml/firefox-55.0.3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5"; + sha512 = "f9ae435602cfc796d93a2e5aa9ffe1216c1465de3beed4ecc6b04141c392df9d1b6280deb1d69c30330db4c9ac6568b3cc4849e57c8e84f8d3e69c47a473018f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mr/firefox-55.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886"; + sha512 = "0cff95fc291a1874926ec895150cbc99b8219b29f4e66782ab182c29670b2356a5ccb1a765e0eb734666f7ff4a7be7806c62012b38118ce8d2a8f7c47a1e936c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ms/firefox-55.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b"; + sha512 = "1add2335e98ad3ea9a2b57ca733087830c50e50872f8add7d8d5f2571f2d858b4f4a866298a8509398237ba62c363eccce9bb358c978cbd7b1ac6cf1dcaffce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/my/firefox-55.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471"; + sha512 = "901404d74cdd090c0a63b2c0e60d0fb7afcdf3fbabda7dff07205613680ea315c2c33ee33001c8e10174f91698cc1cb4f03dfcf96e1104a5bd2d4750666627b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nb-NO/firefox-55.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617"; + sha512 = "50821c1cf2ff9b49c34f9e05007678068d73d9558e43083bb305049c47d62abeeb3c0a994d872de6c9dbe86971e4a5d70de716a9051180a0b2bd73df213416b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nl/firefox-55.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac"; + sha512 = "a81331ef521173951d7b45e726dcc0d57fa4d1ae1d9c05a835163bd71bd6ec6ee410a355bd2d697b6c59f3a8d9d2a5122182e82ed800b0d8c1830ff759fff71c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nn-NO/firefox-55.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16"; + sha512 = "9e8e1337557ab07c07ceb5395d6cdaca647a606650ff00d76244df125e6e041b3580828cc25dc1e300559b05a83121454e77c88e47c0708c30a561b00f18a86c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/or/firefox-55.0.3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae"; + sha512 = "4dddf3bcc8b46c326a632f96844ec369c5593bbd70a846a4d041a5f14da29b953c3318aef820b46d4e77d25e79290fa77230ef17c0d57bd00802f830ae4a76a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pa-IN/firefox-55.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55"; + sha512 = "b22a57fb65257b25f2a7c083fbdfeb9ca0ff83919d5201fb6996a5af33a68a2722ed8174853d81a90d61beb79d811c6b756d1fca6dea6c70175165255dc92bda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pl/firefox-55.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d"; + sha512 = "76d98c31d80b581a910a703098a0f80d9b9dceebb8b8f5f69eb428a59d7b592ff3aea40f152b1c74a9a849c45cfe1334951261b84e84ed454afa3bf9d14afdd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-BR/firefox-55.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0"; + sha512 = "b22cce3b391df6c945a7d84294b3ca36c90438d1eeeda002f1af4230bb8638733db1313b36f3d907b8ad4b7b117eec58c601abb21400ca2cd228a44fc49a499d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-PT/firefox-55.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a"; + sha512 = "7f0f627c170f8db91525a3aebbe1afe47a84745eba53da6fec79c14a95d857f8ca65ed7b52d67d966f371d3c4cf1bc4d734e1c8f427775e234aa80c318aeac52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/rm/firefox-55.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4"; + sha512 = "3e7941441c09a0dbac44ae352b3817713b34c0a7cf694e465b75cdc53d977b97ae3e388ae580880bc33df134d11fbe941b4d1c63567ee6183f43bde31a2d9793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ro/firefox-55.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64"; + sha512 = "67d270f1eed7b761499967d1d3ae6c1c7e067f124689f6214be6ba5687f3eb212e70a6089573ab2a90315593d8749496e48d047cb8642b19c01877ee394ef86d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ru/firefox-55.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d"; + sha512 = "287e6a3fb2de71b31a0cfd74d3eca00ad8ae1cc68760fa5731c1cc9f58c4bcccecbfefab892b93864ffffca6433498d6daafd7928b9633f8a587de3c0787600e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/si/firefox-55.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68"; + sha512 = "63260a1c9e333d05654ac7d912011228d0f787d2d2a5b084410ee6cef75b41ef3ee08dc305f95baf459d16fa4f206792e3811426500ded4d02eea0d6fbc0d5ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sk/firefox-55.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147"; + sha512 = "339c3df4c1a12e14f6e2156ec0fc64aa62fb5d5e93897fcd412980ffa37edd2f6a55f3da991e0ee4c00aaa30e469f862e288cd8c950ac03bcebbe8b84d12f374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sl/firefox-55.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1"; + sha512 = "793c89b07c0fb8e7929aecb67bd37a1a97156d48f50972ec13583728614703b3d69e50249efb12b592aa6e5643d3f2af2aa57854ea1bb88d080983ded11ef676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/son/firefox-55.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9"; + sha512 = "51d941ebf974bc04f9aa7a02c14c14b4aa5190d3621604964262a92d298d68d36f3aaf84ed235760d1d9d766d29a97490ddd6df8cfc53ab215526741c8de0d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sq/firefox-55.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08"; + sha512 = "44ee948b537e8774fbc37361639a83508fa3e7bb0978e12bce9ecd8c9a02d9bcf6ba28922093e8701deac71fd577eb4d85cd349c85e93fb04f5e5e6a02d6fa48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sr/firefox-55.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc"; + sha512 = "77e9dd47c3967435a83e191c335791d03e6e63206f1e303eece5e1a813bf5e0b88aede11eea033972e578974beb4ec6bde260194a01e15f7b9ed7fd915ace77d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sv-SE/firefox-55.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43"; + sha512 = "945a718d39d665e4b51a57ee4bb819eca8d4572c2e9098c448bece63b76bfbb652764667908c66ab4f9ace0c82b2d476f51a6fae5ba0f24aab8f94e47f506085"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ta/firefox-55.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21"; + sha512 = "17c5f121cee7d8b81fae8f1b2dec696e4fe02abeb0fb50124906dbb9d00c4a74a917d812760e671215f7391c408a391ecad2c590103956460dbbe5484595f457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/te/firefox-55.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502"; + sha512 = "0f14c88d99afa7f299bff4d456d10a08bd4d359bd5ffae74b51eb907274e0ac5da1b762f357b845f7039e2b43fffa1b20c1a7fbd895ac57eb42615516ef0329e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/th/firefox-55.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0"; + sha512 = "2727f304314911aabbd34f46afda1c035fe018cd2efcfd2ab89cd71a265de176b5fef36f176086f93c28e0d456464634dd36f6e048761b24d276aecd0dc7fb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/tr/firefox-55.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7"; + sha512 = "74b31af4b6622d286aa145e41567b09e9d1f0d922dd256647f09c959f09c2637889d11a346ec303c0fc871c8b1a382707756b8d0fc38d7093387b0247d143ff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uk/firefox-55.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47"; + sha512 = "a9373c5d8379a7ab483d4587fdc3df8adee0371d2a40b7886033d0505022b8adb516f7164d67da7b504e170aa5ed105218124274173d29c232e2dab7f7279921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ur/firefox-55.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92"; + sha512 = "78578c99aefea3eb46d70d563868d2eb0bf43cc6a905b908305cf61ffe5b49064bf2845661af48c861e93cf50aa5e9d8dfaa755f11732760c1574cc0c88e5718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uz/firefox-55.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa"; + sha512 = "0739b4d60e55b1d4e0ef5984050dca5ef484edb73ed590f948d8e4c4c2303cc0fcd177dbcca4ef66bf61821172675a4805aeaaf3349df1dad5a3080544316aa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/vi/firefox-55.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f"; + sha512 = "9e0185b988338a333e7d89a384bd42dcf6f6ca8db4eedd56236357909f9d43ec09685e8099fe25833dcd60c301297760972770bbca7b61aba87622abc2623428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/xh/firefox-55.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae"; + sha512 = "63c1cd434edcb6069959085526cc14845de1fbf4da135a1e705433fae305dacaccfc958b98e0905b5cb2627f50b768db0940aeb728a4ab84e4592b596e50a895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-CN/firefox-55.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738"; + sha512 = "a8c2473a2e172eb7bb34a66a4ce145218ba1cdbf951d3865561512cecd6cdda2a9741c6b383706f37537eea646fa1b282174ce9634bc69105c7611879c851a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-TW/firefox-55.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb"; + sha512 = "f40193e6390f143cac3cdc0c230fedf2e791792d16e8446becf2038b4916274b47522bf5f239454696a8cbfffbb001556ade3b1bee2bdd239843f3bc3448b03f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 3bcc2ab003c1..ac3f7d1380c5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -22,7 +22,7 @@ in writeScript "update-${name}" '' pushd ${basePath} HOME=`mktemp -d` - cat ${./firefox.key} | gpg2 --import + cat ${./firefox.key} | gpg --import tmpfile=`mktemp` url=${baseUrl} @@ -47,7 +47,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4fe89a403de9..7c9ffc0f4784 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation (rec { ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" ++ flag crashreporterSupport "crashreporter" ++ flag safeBrowsingSupport "safe-browsing" - ++ flag drmSupport "eme" + ++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-release" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 11d9324c0424..36053045468a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }: let common = opts: callPackage (import ./common.nix opts); in @@ -6,12 +6,17 @@ rec { firefox = common rec { pname = "firefox"; - version = "54.0.1"; + version = "55.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2"; + sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416"; }; + patches = lib.optional stdenv.isi686 (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; + sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; + }); + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -25,10 +30,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.2.1esr"; + version = "52.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3"; + sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9"; }; meta = firefox.meta // { diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index b1d77afa8f1f..7383e0ec0445 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal web browser"; - homepage = http://pwmt.org/projects/jumanji/; + homepage = https://pwmt.org/projects/jumanji/; platforms = platforms.all; maintainers = [ maintainers.koral ]; }; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index bbf034a13424..0f6c4ed36d40 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -2,29 +2,43 @@ , fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null , buildPlatform, hostPlatform +, nukeReferences }: assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "lynx-${version}"; - version = "2.8.9dev.11"; + version = "2.8.9dev.16"; src = fetchurl { url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"; - sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a"; + sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; }; + enableParallelBuilding = true; + + hardeningEnable = [ "pie" ]; + configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig - ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc + ++ [ nukeReferences ]; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; + # cfg_defs.h captures lots of references to build-only dependencies, derived + # from config.cache. + postConfigure = '' + make cfg_defs.h + nuke-refs cfg_defs.h + ''; + meta = with stdenv.lib; { - homepage = http://lynx.isc.org/; description = "A text-mode web browser"; + homepage = http://lynx.invisible-island.net/; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 1d287f4100c2..ce9ac961c92a 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight WebKitGTK+ web browser"; - homepage = "http://midori-browser.org"; + homepage = http://midori-browser.org; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; maintainers = with maintainers; [ raskin ramkromberg ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index c33bff60e01e..fa98f2a9e785 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; installPhase = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix index 039d8bbe4060..1a0752c33c62 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firefox ID card signing plugin"; - homepage = "http://www.id.ee/"; + homepage = http://www.id.ee/; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index e7893d22717c..0452e7486e6f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.131"; + version = "26.0.0.151"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s" + "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8" else - "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr" + "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d" else if arch == "x86_64" then - "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w" + "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l" else - "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f"; + "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp"; }; 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 b290caaee3ed..9a805eb55e4f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.131"; + version = "26.0.0.151"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn" + "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb" else - "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk"; + "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8"; }; 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 85012f8f7091..b3382ef05127 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = ''A wrapper to run browser plugins out-of-process''; - homepage = "http://nspluginwrapper.org/"; + homepage = http://nspluginwrapper.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index bd334356df5c..bd841ba8110f 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -5,19 +5,19 @@ , gtk2, hunspell, icu, libevent, libjpeg, libnotify , libstartup_notification, libvpx, makeWrapper, mesa , nspr, nss, pango, perl, python, libpulseaudio, sqlite -, unzip, xlibs, which, yasm, zip, zlib +, unzip, xlibs, which, yasm, zip, zlib, gcc }: stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.2.1"; + version = "27.4.1"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4"; + sha256 = "0sgy0iq038pj676w6k5nwbavrdmrznhydjibdpj6irdz5qxxdgjn"; }; desktopItem = makeDesktopItem { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification libvpx makeWrapper mesa nspr nss pango perl pkgconfig python - libpulseaudio sqlite unzip which yasm zip zlib + libpulseaudio sqlite unzip which yasm zip zlib gcc ] ++ (with xlibs; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman scrnsaverproto xextproto diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 5ec4340dba78..025e4522f065 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -78,7 +78,7 @@ in buildPythonApplication rec { ''; meta = { - homepage = "https://github.com/The-Compiler/qutebrowser"; + homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.jagajaga ]; 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 419f24cfb0ce..980c90a91ee7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -37,6 +37,9 @@ # Pluggable transport dependencies , python27 + +# Extra preferences +, extraPrefs ? "" }: with stdenv.lib; @@ -81,7 +84,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.2"; + version = "7.0.4"; lang = "en-US"; @@ -91,7 +94,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 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr"; + sha256 = "17hz6nv7py80zbksk1dypmj8agr5jzsfrpjncphpsrflvbqzs2bx"; }; "i686-linux" = fetchurl { @@ -99,7 +102,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 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z"; + sha256 = "0g8m5x891f4kdvb3fhmh98xfw569sbqd9wcadflabf9vc9bqv3al"; }; }; in @@ -173,11 +176,12 @@ stdenv.mkDerivation rec { cat >mozilla.cfg < $vivaldi_version" +(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash") + +# Check vivaldi-ffmpeg-codecs version. +chromium_version_old=$(version vivaldi-ffmpeg-codecs) +chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+') + +if [[ "$chromium_version" != "$chromium_version_old" ]]; then + echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version" + (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") +fi diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index e7aa7bb67280..33a1e8a5c08e 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "C14 is designed for data archiving & long-term backups."; - homepage = "https://www.online.net/en/c14"; + homepage = https://www.online.net/en/c14; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index b2d70b1f767c..95ad83cb3b17 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.10.0"; + version = "0.12.2"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc"; + sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 55ebb580f52b..9af4cf3f0ed6 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://hadoop.apache.org/"; + homepage = http://hadoop.apache.org/; description = "Framework for distributed processing of large data sets across clusters of computers"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index dc7d2b8b2eab..0ac872c35c90 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 "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" - else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; + then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f" + else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i"; pname = "helm"; - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index a7cc5d789382..65758fca6000 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - makeWrapper autoconf automake115x libtool curl sasl jdk maven + makeWrapper autoconf automake libtool curl sasl jdk maven python wrapPython boto setuptools leveldb subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 5cdb30b3f00e..0a3cede66f33 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,15 +14,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.6.3"; + localkube-version = "1.7.3"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm"; + sha256 = "1ay11321kg3waxzi9d885pr08hz97a8ajwk31kbfxlm3x5bk3jii"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.20.0"; + version = "0.21.0"; goPackagePath = "k8s.io/minikube"; @@ -30,7 +30,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb"; + sha256 = "1y72kdrpbxwfzxs9jslcrb2l3xw83z4i7raf5c7sky4wf2nx8vis"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 1d39534bc16c..f607bd9a614d 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.5.5"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65"; + sha256 = "1qvpcf2hwrx280qk8gl7sfl23y44k8z7c2vwi0gnzx8vqh0l8ywm"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index c99643beb90d..49c57b470289 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://pig.apache.org/"; + homepage = http://pig.apache.org/; description = "High-level language for Apache Hadoop"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4ecf63427648..e86351fcc54f 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -51,6 +51,12 @@ in { terraform_0_9_11 = generic { version = "0.9.11"; sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x"; - doCheck = true; + # checks are failing again + doCheck = false; + }; + + terraform_0_10_2 = generic { + version = "0.10.2"; + sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502"; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix index 7ed2cef0e3ba..359579c3fde8 100644 --- a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix +++ b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5"; }; - goDeps = ./deps.nix; + goDeps = ./deps_0_11.nix; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index a343f1f951bd..adbe2ab5a54f 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.12.16"; + version = "0.13.0"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "07xxk7r9wvjv3v0l95g7sy5yphypfxmlymxzi7yv3b8dznifwm0y"; + sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 5ea04d1f424e..ac6bae693952 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5"; - sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj"; + rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b"; + sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "90b6568eac830f62a08e8f1f46375daa63e57015"; - sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism"; + rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0"; + sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8"; - sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61"; + rev = "9a441910b16872f7b8283682619b3761a9aa2222"; + sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; - sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -95,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "05e8a0eda380579888eb53c394909df027f06991"; + sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; + fetch = { + type = "git"; + url = "https://github.com/ulikunitz/xz"; + rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; + sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; }; } { @@ -104,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; - sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; + rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; + sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; }; } ] diff --git a/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix new file mode 100644 index 000000000000..5ea04d1f424e --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix @@ -0,0 +1,111 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5"; + sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj"; + }; + } + { + goPackagePath = "github.com/bgentry/go-netrc"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/go-netrc"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105"; + sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-getter"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-getter"; + rev = "90b6568eac830f62a08e8f1f46375daa63e57015"; + sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"; + sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab"; + sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-testing-interface"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-testing-interface"; + rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8"; + sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; + sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; + sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; + }; + } +] diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 86a93309b1f6..412335094ff3 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.6"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w"; + sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v"; }; preConfigure = '' @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { description = "Native Gtk+ Twitter client for the Linux desktop"; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 8eed4b7856ad..a76d6bc2fa47 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,30 +24,27 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "29.4.20"; - sha256 = - { - "x86_64-linux" = "0w8n8q846mqq8f3yisn9xazf323sn579zyp1kwrdrmmqalwiwcl2"; - "i686-linux" = "0zgdnpizgkw2q6wglkdhpzzrhnpplfi2ldcw1z0k9r6slici5mfk"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + version = "33.4.23"; + sha256 = { + "x86_64-linux" = "0z8sd71v0xfbq4x8gw0rjhg7kbd7r0465b1cqk1ls2fivb25qqxz"; + "i686-linux" = "07sj1ixpml56bx83jawslak6scb12wxwn53nnabvgnivhb9vzq97"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - arch = - { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + arch = { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - libs = - [ - dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM - libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt - ncurses zlib + libs = [ + dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM + libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt + ncurses zlib - qtbase qtdeclarative qtwebkit - ]; + qtbase qtdeclarative qtwebkit + ]; ldpath = stdenv.lib.makeLibraryPath libs; desktopItem = makeDesktopItem { @@ -99,10 +96,10 @@ in mkDerivation { mkdir -p "$out/bin" RPATH="${ldpath}:$out/${appdir}" + chmod 755 $out/${appdir}/dropbox makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" - chmod 755 $out/${appdir}/dropbox rm $out/${appdir}/wmctrl ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl @@ -141,11 +138,11 @@ in mkDerivation { paxmark m $out/${appdir}/dropbox ''; - meta = { - homepage = "http://www.dropbox.com"; + meta = with lib; { description = "Online stored folders (daemon version)"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = lib.licenses.unfree; + homepage = http://www.dropbox.com; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 3db20d3de4c1..0190d5f9798f 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }: python34Packages.buildPythonApplication rec { - version = "0.9.7"; + version = "0.9.9"; name = "canto-curses-${version}"; src = fetchFromGitHub { owner = "themoken"; repo = "canto-curses"; rev = "v${version}"; - sha256 = "0ap1b4m5gbzi0l7vj6pwvvg77i2aarbynbdc147z2b1lzvr985zq"; + sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr"; }; buildInputs = [ readline ncurses canto-daemon ]; @@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = http://codezen.org/canto-ng/; + homepage = https://codezen.org/canto-ng/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 18837299e93e..4b1721278e3d 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python34Packages, }: python34Packages.buildPythonApplication rec { - version = "0.9.6"; + version = "0.9.7"; name = "canto-daemon-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ python34Packages.buildPythonApplication rec { owner = "themoken"; repo = "canto-next"; rev = "v${version}"; - sha256 = "0ibakwmsbpk10bvxsr5vvka0pks89arric428y5cmfgcpr72sqzw"; + sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n"; }; propagatedBuildInputs = with python34Packages; [ feedparser ]; @@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = http://codezen.org/canto-ng/; + homepage = https://codezen.org/canto-ng/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 4e22a95d4d86..41f578759dfd 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { namePrefix = ""; meta = with stdenv.lib; { - homepage = "http://offog.org/code/rawdog/"; + homepage = http://offog.org/code/rawdog/; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 6b92db9efa55..99517b478c32 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; - homepage = "https://pypi.python.org/pypi/rss2email"; + homepage = https://pypi.python.org/pypi/rss2email; license = licenses.gpl2; maintainers = with maintainers; [ jb55 profpatsch ]; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6c3731b82a41..814f6bb5548e 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { ++ lib.optional (transmission != null) transmissionrpc; meta = { - homepage = http://flexget.com/; + homepage = https://flexget.com/; description = "Multipurpose automation tool for content like torrents"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar tari ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 950bdc8ebdbd..6643f385074b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.25.2"; in +let version = "3.27.0.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1kdah69lbgpam7xrxrqxbcjplk459a5fv5ffvgfn5y5gq7dhm6sm"; + sha256 = "1yis3lk23ymgqzvad7rhdcgipnh1nw98pk0kd7a01rlm7b9b6q90"; }; configureFlags = [ @@ -20,13 +20,13 @@ stdenv.mkDerivation { pugixml libfilezilla nettle ]; meta = with stdenv.lib; { - homepage = http://filezilla-project.org/; + homepage = https://filezilla-project.org/; description = "Graphical FTP, FTPS and SFTP client"; license = licenses.gpl2; longDescription = '' FileZilla Client is a free, open source FTP client. It supports FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available - under many platforms, binaries for Windows, Linux and Mac OS X are + under many platforms, binaries for Windows, Linux and macOS are provided. ''; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix new file mode 100644 index 000000000000..284c4f8cee1a --- /dev/null +++ b/pkgs/applications/networking/gns3/gui.nix @@ -0,0 +1,34 @@ +{ stdenv, python34Packages, fetchFromGitHub }: + +# TODO: Python 3.6 was failing +python34Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "gns3-gui"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; + }; + + propagatedBuildInputs = with python34Packages; [ + raven psutil jsonschema # tox for check + # Runtime dependencies + sip pyqt5 + ]; + + doCheck = false; # Failing + + meta = with stdenv.lib; { + description = "Graphical Network Simulator"; + #longDescription = '' + # ... + #''; + homepage = "https://www.gns3.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix new file mode 100644 index 000000000000..067d636f137c --- /dev/null +++ b/pkgs/applications/networking/gns3/server.nix @@ -0,0 +1,37 @@ +{ stdenv, python34Packages, fetchFromGitHub }: + +python34Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "gns3-server"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7"; + }; + + propagatedBuildInputs = with python34Packages; [ + aiohttp jinja2 psutil zipstream aiohttp-cors raven jsonschema + ]; + + # Requires network access + doCheck = false; + + postInstall = '' + rm $out/bin/gns3loopback # For windows only + ''; + meta = with stdenv.lib; { + description = "Graphical Network Simulator 3 server"; + longDescription = '' + The GNS3 server manages emulators such as Dynamips, VirtualBox or + Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST + API. + ''; + homepage = "https://www.gns3.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 946d0dedba0c..4117d409b935 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful network analysis framework that is much different from the typical IDS you may know"; - homepage = http://www.bro.org/; + homepage = https://www.bro.org/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 90b2695f0039..f5406d9fe629 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { - homepage = "http://www.creytiv.com/baresip.html"; + homepage = http://www.creytiv.com/baresip.html; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 5ee93bd4df5b..fa1c64ba0ad7 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }: +{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python, +enableLibPurple ? false, pidgin ? null }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,20 +12,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; - buildInputs = [ gnutls glib libotr python ]; + buildInputs = [ gnutls glib libotr python ] + ++ optional enableLibPurple pidgin; + + preConfigure = optionalString enableLibPurple + "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig"; configureFlags = [ "--gcov=1" "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ]; + ] + ++ optional enableLibPurple "--purple=1"; - buildPhase = '' + buildPhase = optionalString (!enableLibPurple) '' make install-dev ''; - doCheck = true; + doCheck = !enableLibPurple; # Checks fail with libpurple for some reason meta = { description = "IRC instant messaging gateway"; @@ -40,7 +46,7 @@ stdenv.mkDerivation rec { Messenger, AIM and ICQ. ''; - homepage = http://www.bitlbee.org/; + homepage = https://www.bitlbee.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4085324a2aa7..6267a3c8eb76 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,44 +1,46 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango -, systemd, libXScrnSaver }: +, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb +, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "10m3ixvhmxdw55awd84gx13m222qjykj7gcigbjabcvsgp2z63xs"; + sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz"; }; + nativeBuildInputs = [ makeWrapper ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss pango systemd libXScrnSaver + libXtst nspr nss libxcb pango systemd libXScrnSaver ]; installPhase = '' - mkdir -p $out/{bin,share/pixmaps} - mv * $out + mkdir -p $out/{bin,opt,share/pixmaps} + mv * $out/opt # Copying how adobe-reader does it, # see pkgs/applications/misc/adobe-reader/builder.sh patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out:$libPath" \ - $out/Discord + --set-rpath "$out/opt:$libPath" \ + $out/opt/Discord - paxmark m $out/Discord + paxmark m $out/opt/Discord - ln -s $out/Discord $out/bin/ - ln -s $out/discord.png $out/share/pixmaps + wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib" + + ln -s $out/opt/Discord $out/bin/ + ln -s $out/opt/discord.png $out/share/pixmaps - # Putting udev in the path won't work :( - ln -s ${systemd.lib}/lib/libudev.so.1 $out ln -s "${desktopItem}/share/applications" $out/share/ ''; @@ -53,10 +55,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; - homepage = "https://discordapp.com/"; + homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; - maintainers = [ maintainers.ldesgoui ]; + maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a21a82848e03..b01c6497fb23 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://gajim.org/"; + homepage = http://gajim.org/; description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.aszlig ]; diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix deleted file mode 100644 index 21f2afdde68b..000000000000 --- a/pkgs/applications/networking/instant-messengers/gale/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf -, libtool, pkgconfig }: - -stdenv.mkDerivation { - name = "gale-1.1happy"; - - src = fetchFromGitHub { - owner = "grawity"; - repo = "gale"; - rev = "b34a67288e8bd6f0b51b60abb704858172a3665c"; - sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf"; - }; - - nativeBuildInputs = [ m4 libtool automake autoconf ]; - buildInputs = [ boehmgc openssl adns pkgconfig ]; - - patches = [ ./gale-install.in.patch ]; - - preConfigure = '' - substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc - ./bootstrap - ''; - configureArgs = [ "--sysconfdir=/etc" ]; - - meta = with stdenv.lib; { - homepage = "http://gale.org/"; - description = "Chat/messaging system (server and client)"; - platforms = platforms.all; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch deleted file mode 100644 index 33e3e09a96d2..000000000000 --- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch +++ /dev/null @@ -1,339 +0,0 @@ -diff --git a/gale-install.in b/gale-install.in -index 50e8ad8..eec0ed2 100644 ---- a/gale-install.in -+++ b/gale-install.in -@@ -29,22 +29,78 @@ testkey_stdin() { - gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>" - } - --if [ -n "$GALE_SYS_DIR" ]; then -- SYS_DIR="$GALE_SYS_DIR" --elif [ -n "$sysconfdir" ]; then -- SYS_DIR="$sysconfdir/gale" -+INST_SYS_DIR="$sysconfdir/gale" -+ -+if [ `id -u` -eq 0 ]; then -+ is_root=yes -+ SYS_DIR=/etc/gale -+else -+ is_root=no -+ SYS_DIR="$HOME/.gale" -+fi -+ -+if [ -f /etc/NIXOS ]; then -+ is_nixos=yes -+else -+ is_nixos=no -+fi -+ -+if [ -u /run/wrappers/bin/gksign ]; then -+ cat < "$CONF" <> "$CONF" <> "$CONF" << EOM -+ cat > "$CONF" </dev/null`" --[ -f "$gksignlink" ] && gksign="$gksignlink" -- --echo "" --if copy chown "$GALE_USER" "$gksign" ; then -- : --else -- echo "*** We need to chown $GALE_USER '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 -+ fi - fi --run chmod 4755 "$gksign" - --# ----------------------------------------------------------------------------- --# create a domain, if necessary -+if [ $is_root = no ]; then -+ GALE_SYS_DIR="$SYS_DIR" -+ export GALE_SYS_DIR - --echo "" --if test -u "$gksign" || copy chmod u+s "$gksign" ; then -- : -+ testkey "$GALE_DOMAIN" && exit 0 -+ echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -+ GALE="$SYS_DIR" - else -- echo "*** We need to chmod u+s '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 --fi -- --testkey "$GALE_DOMAIN" && exit 0 --echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -- --if [ "x$GALE_USER" != "x$USER" ]; then --cat < $out/bin/skype << EOF - #!${stdenv.shell} - export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches - exec $out/libexec/skype/skype --resources=$out/libexec/skype "\$@" - EOF - - chmod +x $out/bin/skype - - # Fixup desktop file - substituteInPlace skype.desktop --replace \ - "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png" - substituteInPlace skype.desktop --replace \ - "Terminal=0" "Terminal=false" - mkdir -p $out/share/applications - mv skype.desktop $out/share/applications - ''; - - meta = { - description = "A proprietary voice-over-IP (VoIP) client"; - homepage = http://www.skype.com/; - license = stdenv.lib.licenses.unfree; - platforms = [ "i686-linux" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9bad366b8ef3..d476b9b35c49 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -92,7 +92,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux client for skype"; - homepage = "https://www.skype.com"; + homepage = https://www.skype.com; license = licenses.unfree; maintainers = with stdenv.lib.maintainers; [ panaeon ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index edd66bd900b3..f36f0956f654 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.6.2"; + version = "2.7.1"; 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 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8"; + sha256 = "1na163lr0lfii9z1v4q9a3scqlaxg0s561a9nhadbqj03k74dw6s"; } else throw "Slack is not supported on ${stdenv.system}"; @@ -84,7 +84,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop client for Slack"; - homepage = "https://slack.com"; + homepage = https://slack.com; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 67d1f55f2fe0..29026ccdc5ad 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { version = "2.7.1"; description = "Telegram client forked from sigram"; - homepage = "http://aseman.co/en/products/cutegram/"; + homepage = http://aseman.co/en/products/cutegram/; license = licenses.gpl3; maintainers = with maintainers; [ profpatsch AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 446156fbe4cf..90fc4944d804 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake +{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake , qtbase, qtimageformats , breakpad, gtk3, libappindicator-gtk3, dee , ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio @@ -7,19 +7,20 @@ mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.1.7"; + version = "1.1.19"; # Submodules src = fetchgit { - url = "https://github.com/telegramdesktop/tdesktop"; - rev = "refs/tags/v${version}"; - sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w"; + url = "git://github.com/telegramdesktop/tdesktop"; + rev = "v${version}"; + sha256 = "1zpl71k2lq861k89yp6nzkm4jm6szxrzigmmbxx63rh4v03di3b6"; + fetchSubmodules = true; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6"; - sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9"; + rev = "a4ba392309116003bc2b75c1c4c12dc733168d6f"; + sha256 = "1n0yar8pm050770x36kjr4iap773xjigfbnrk289b51i5vijwhsv"; }; buildInputs = [ @@ -103,7 +104,7 @@ mkDerivation rec { description = "Telegram Desktop messaging app"; license = licenses.gpl3; platforms = platforms.linux; - homepage = "https://desktop.telegram.org/"; + homepage = https://desktop.telegram.org/; maintainers = with maintainers; [ abbradar garbas ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index c29c6def2f60..05ea0fda8353 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ]; + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + + preFixup = '' + wrapProgram "$out/libexec/telepathy-idle" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; meta = { description = "IRC connection manager for the Telepathy framework"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4cf0d2a04492..37d5ea2e17b8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig -, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -12,13 +12,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool - gobjectIntrospection dbus_libs telepathy_glib.python ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper + gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; nativeBuildInputs = [ libxslt ]; configureFlags = "--enable-call"; + preFixup = '' + wrapProgram "$out/libexec/telepathy-logger" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; 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 a8fc9477707d..87ae0210bdae 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: stdenv.mkDerivation rec { name = "${pname}-5.16.3"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/mission-control-5" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index e8c1f50164df..1f1a19394b31 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = "http://code.google.com/p/vacuum-im/"; + homepage = http://www.vacuum-im.org; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d77cf347e5a8..91c77fc9d7ca 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,11 +4,11 @@ let - version = "2.0.91373.0502"; + version = "2.0.98253.0707"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a"; + sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r"; }; }; @@ -75,13 +75,12 @@ in stdenv.mkDerivation { #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it - wrapProgram $packagePath/zoom \ + makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" - ln -s "$packagePath/zoom" "$out/bin/zoom-us" cat > $packagePath/qt.conf < $out/bin/msgviewer + #!${stdenv.shell} -eu + exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" + _EOF + chmod 755 $out/bin/msgviewer + ''; + + nativeBuildInputs = [ makeWrapper unzip ]; + + meta = with stdenv.lib; { + description = "Viewer for .msg files (MS Outlook)"; + homepage = https://www.washington.edu/alpine/; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 3473d321c75b..7de359bae5a5 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170609"; + version = "20170714"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "015dd6rphvqdmnv477f1is22l7n5gvcvyblbyp0ggbp64650k0bz"; + sha256 = "0jbh83hvq1jwb8ps7ffl2325y6i79wdnwcn6db0r5prmxax18hw1"; }; nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c53383b954e7..d9af01bdad41 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.24.2"; + version = "0.25"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma"; + sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5"; }; buildInputs = [ @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { find test -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ - -e "s|gpg |${gnupg}/bin/gpg2 |" \ - -e "s| gpg| ${gnupg}/bin/gpg2|" \ + -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/gpg2|" \ + -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \ "{}" ";" for src in \ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { emacs/notmuch-crypto.el do substituteInPlace "$src" \ - --replace \"gpg\" \"${gnupg}/bin/gpg2\" + --replace \"gpg\" \"${gnupg}/bin/gpg\" done ''; diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix index c196ce777ffc..728287f8c75a 100644 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://re-alpine.sf.net/"; + homepage = http://re-alpine.sf.net/; downloadPage = "http://sourceforge.net/projects/re-alpine/files/"; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index c3ce77adb9e6..ed811cf82ae1 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.2.1"; + version = "52.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ar/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5b19b8fb7b7a6a4dd03ee5ab163f07ee664dd7b6d701571e57b6b3943d8aebf69291958d9a51b7720c5e5935daabacfd6149229e7626557927133b00a6c8750d"; + sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ast/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d0d2a562834e865cb31648255a94b120419c7cf4bba20d0a43368a05c3590333443da9416f7940eb0ed1fd774bd161d85585154b389d01b468124b6da310d5a9"; + sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/be/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2809c98f9b64b778c1bced8f91657a9cb8e57963d273ff380740db9be2aa999df5c32eeca7b6e63a4db65854f4e5654cc81f58a35e26eec8038520a9e78f263e"; + sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bg/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cd6a67c530f7ce0e3da897ed5701ce2b85f5bcb30df8db85af38918e951e7cc75e446f5709d7b02b1f54092cd8cc54c15ec46e5bfe893cd85fccdb0851a4579c"; + sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bn-BD/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f117b3f56a79b5fd4a947a83ae6a3d28f0bd83f5ecb65cde674c12191517f51956535e1872547b985a35a9c0c398abc610a3f2fc2d7c9893bf7299222e5fbad7"; + sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/br/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "72af56a4376a28ec2f3c091614b2d5907b12c2e66f2d3dda27b46ceb8b199a32d495454a2ea167180e44b1f9ef7aba89aea47bfed0976892d5d9af7102d5f5df"; + sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ca/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "85da428c53f3a2467f5be661c4f40e0f9434609fd6509e01e3c28dec522f5342d225a4f19c30a59187e42540905f156897b1f0e0ab76b2419d263923be844b3f"; + sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cs/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f1fc63e25fd30b1f379689fbc9d7f24e94f061b39d3b0494226f25702dd6bd610dc031e2105957e2abefab1d7f8e90e81f4381f6d69cb43b815d8b80b9588715"; + sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cy/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b15b4c2766ef32b5e8023e8002f05fa82fd1e71784d5b5f2d63c62c4b20076c46d470a253f8e0a59f1bb1425a2d297b403c32117e43ce2e4851795511604cfb2"; + sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/da/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "98750936e15b469d489e31eb65935d9013a0f4250543267f03b5eb9615587f8fe592b84bddf51176ecfe0864bc5c35ad5408e42861d45ed3af61f43764f5f9b0"; + sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/de/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "7653e5e9e02aba7cacaaeb82e7106dfd7e49e4611eb3fb347c8192fcab3749ed98b2a2342788fe8f0e23c932ae5f9ae71266464d3d6b83629231f83ef8efa7c8"; + sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/dsb/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "abf52e2f55f9582a5a1f5243a35e3fc2196beddb128a690479d6e82ac5f3cb7967640418f02fcc57c5525debce716345da23e4105e551ab0682dc5df5b6b3cc1"; + sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/el/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e86bfe27cddf7b1deb2fe499df2c37488863e5af24614986ced8f9063eb8494f64e637691fe3f69f6b448a50a655725f866313cf0a881425ba5cb669c9fb9940"; + sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-GB/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "57970ed60a24e6c02383b99ff4886ea9d90f49fe466f8175b3b9ec16294acd5900191b4a8fd7be08f5d987eebe547a9fd5004e516d13da8bfd702b82baeb7b8b"; + sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-US/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "787b0c18e5cf7115ee7f317d0949f7c8d35be15f3f0c6a07b75372c07992601194a860568879164b2c5a49c276b1b48c4a723b68be46b8cd4d3bdb4144db2606"; + sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-AR/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "65e6d0726d733b9f4929a946bc9890e5eff5ad9e22d50bbaad40d2dc259028643e666b619eef25ba7d906f5a05d0e9ea456ab0d298cab5ecccc9a4a494a6f4bf"; + sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-ES/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7266fe0dfcdc7f119e521873ea0ddc3106c6ca3d147a9cc8f9a88d563a6647d97f4c46d26547a24afaa6b10d115a3d4effc58fe2621c62395c7fc99f9587e2d1"; + sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/et/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "048cd4d824ddc0b075bcc6d9e7a8a3905031c3333ab8bc55893278435316fd310d6002b9fa1d7b270f8b94f3bf79679e96571b083305d687c36106b903389066"; + sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/eu/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "09b4d12b0a09de492082dc315173baccf603b387d391317a350fa67c04339b0d720a6c682e4d1c7fc7ea54e04569b004b6697d9e27a14c4f5095449f2f4e4471"; + sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fi/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "21f1069f46a8dd2dc54326bfa32d0722dd5d139f3ac10702a3cfba7d5ba462362c126ac2656ddae8c2071b20e7f96ce8fddd8049b4df9d66438e7f32f53f9316"; + sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ae30bd2a9eccb925ed4cf6acda17363e9cbbca0b185b9477a9b5611b613e332647907bc4653f6d677677dfca9347026d02f0aec3a42f29ed532a4b71b2c207ce"; + sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fy-NL/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7d35d3a78f9ab79fa8528260160d8b5fa1ee0198b53b94fdeb86e400f95320aa0d695bf1b4e1c73733ba09d6bc78d8d39f1825744e49cef1a22873f35d8a30fb"; + sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ga-IE/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9886d5b9654e7cfaedd5dd60c59a6888929bc2001d4c43a2cf40f92a098ca725cfee8fc819af13c5ea2c9eeeeb3d6103289124b8fd05a234eba04f4570b5986c"; + sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gd/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "18f62933d213197ae618226aea192e30875f76568fc0a17343b49152526a32c10ad79ed4d6eb36feda0c8e287d915a99bdbff70ca942b4a313ea81ca04b257c8"; + sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c6e447722e284beba304b42d643a16b835f525d053714577425660087b03aebdcb93c57071a2e9f143ec5393616f7a0cde9a52f5bdaf42c9df1aed8b509de415"; + sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/he/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7445dc1299038b412a39baf594c11444875d29332afd1c36a8ec603893c3f34d442566c2c18cfcee60c5b84e1bd1bf53675d1a32530dee7fc801554605d7fe4b"; + sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "9812c41f77cc76a6de78ca009989623071a3b95f992658f584bfc58b5be65a3db48d9135025f578f8877bc2f9426182f3f2dff39f50f1018ffb7b6ff272affc3"; + sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hsb/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "af4fb4ca49ac982e28fb5b77d1ec7ec5be69cb097138bb7de865d8a0167b8ce13074d2b2ca80e11dbd68c7fec8533163b9285ed4495545da833f726dac484e7c"; + sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hu/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f1026a8fb44424b95e29051ab778313c417b6119fb9959d3116d6fcace96f1786f26b419eedd7f83790c13c89aba2c339c52ca5b5cfa2d62572518cebd12db9a"; + sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hy-AM/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fa18a6113852d231dfcecdf682c6c1fd18f2ec5176fd9fd694a3134deb511ebaf01e00c0a336dac4a79918606136232d62f2b443ba60d25e40c573f696fca7ea"; + sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/id/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "313e713ae5d1b4bc48789c2c33850b5177d8f497d9965606ad2530f26075cded2943351da7c13057aaeab72a60d4dca193b2fc8c4b8cc97734132b721d4df8fe"; + sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/is/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6f0f8444d230cbdb5dcc81530cd05fe08ea9e2482ea7560157ece9ef938d12b7cf86a259bcc72e132717ac143a6f3e203c869f1c37715bb87fd7b248366c7554"; + sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/it/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f0633c2a46c66b4db18b2e70fffd9459d1c6732e872afaf8a1ef7fcac20114a09d32ec666305963acefa6caf6ec9b902d3f9d2143f68951674c12af462cb3673"; + sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ja/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5893bd100cc44aefe160a8ecfc5e9e5b581e1b9c59a1aab02ea9c63f8c062d8dc0f0c069a4a8adf4b11e5be614b3390d195df91ba3c2f3845f13ae7734e7295e"; + sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/kab/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3777a5caf8208f429db9e828b6812dd16c549511e539375ff2ecb74ddeea8b8823f93194c73fc8e708ab17f8fe37c72af6ca36b5ed0ecaa2994620be7ab21de9"; + sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ko/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6a3e800d909db23c7abcc10a9e07feb5df47c57c072544ba84246c84ad364c8027e6b383a65867d9d0f1523682c45a929fb1c628999b18df2c959e32d374a15a"; + sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/lt/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "486691138c9548343e6841ab1e84d2e795f280fbcfbef06769c7ad816e2dec79381a1d7bc0a4bdf0d5723d48f62ffa1acb7170ff6f1f1a5364ba6872a7b34fbc"; + sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nb-NO/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "0f3745ef22be9cb7fab9d5540a1ba9433e4450511398442debce3909577ca97e1ad5ec3a41c834b31ff60852a8479321dba44559fa2262afeadc16947f69eca9"; + sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6ad18ac7eb19eee591b64d6118de057ec49736e93f60b18ad979536a722a2d5df4b55a8b3d69a335eb0ef96451d2516c0a160a9218fd2ccd92c290752fca61fa"; + sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nn-NO/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "879e402e2dade3acaf1354b8566d1abc11994b749c90f5c1169b1fdff5ea5dd19ae31fbfd1628adaa02c93f2346c02cc69a8625de8302e9965724d8f79c5d384"; + sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pa-IN/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f23942c425238016e1a13b84e6407badac50efa6f11960c9996e4bf7845d3a56537721bb4b6e1c1002870739534f2dd7ce6fb74781bb8e9986e744f36b704c8f"; + sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "0ce3854480f0d9969e6c836e92ba7aecca8f662aec5c7784d8e0e9986239cd8e721baf0aae1142f43dcdc54d66708fe7b7d8f1d32c3410c69306e57e1d663159"; + sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-BR/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "13d2b36dcbc85016066b4fecd61b695eabdcfdf729996eb37ee3aabac3b6b06fb619db915fbca6d59e4827b9e724e9ce0f8308e033c5469ac906d8766bf7021c"; + sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-PT/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "9bce5873c1266fece8d14df41d44dfed545eaa7a9435336650cf102f765a99978d117c787d1ea0f0987407139bfd07765728c6fb188699e8e70dea557e4b4f12"; + sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/rm/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d15bcd925d9be3d0a27478c62d178c99ed1ee474799dfb1a63b505cff3560f1d4a287a5067d6ed4b67cd05c6e8a7398a09468269f262fc001b934e5e6cef1bc7"; + sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ro/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7ef381e722553644d8f3842be5c0fcd1c2f08b4128a53380a6aeb54f4d7d8dba5f73ccecc60d5212429ccac96045eb9dffd77b39b42b637020ea0142daf98097"; + sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ru/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1f71926edd82ba36e98045e8135b4c60fcc59ab0b0a097385231a5dcc40a2d7628d6f3f3691981056f013d01a4a3b1765a58d3cab683ecd55fcfdbf1b974d138"; + sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/si/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "453b2d6898cfe04580f2846da0d534eedb77aa9627a39d7e7b6af1287c9e2feb695bf3d1e5b51b9d15f293579df2ebb1d2f9afb6cfdc3071ad24618e43ae925c"; + sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sk/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c604c83470157e881f3563c04e3e5ad368fb2d0d1cc3fb58b176cfd03953141fe037baa14120f857e238071f55ab1a3d2c1ca06c847eaabf8012b96de1409c8c"; + sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "da7a37a7fe21a338ed2ebbe13e46a2395cebde8036a5544e8678083cddf092fd47ee80ad7e7fef66dcae59567cecb1bd15b99d470d4ee083d328e5c2932ad518"; + sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sq/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1b1e592b2eeab57e843eb4fd6745886946dbba451b5bc78e2212400a4e10fffaa5159034e8ea5d32a0f3dab7527e91b642209a7233140e0fd9c1c44363da9fef"; + sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "836d1b2c786e787e07be4df837efb2051f8fb5a964facc94e82cbc05aca77ae54e1553e285a868f4703b48e72e2a0b739ae5e92e7b3da55e4ffc70567e1ce992"; + sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sv-SE/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ddb52211226353c021350dd94014061a42ce1ee06d2b4e8c612bcfb5e17525bf41ead152f91c466e69ae3041136fb7350ec58de21ed2726cab2d6695dacac332"; + sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ta-LK/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "c8c79641c7d80391d5007155b4ec3bb0ff36c2ae3e1dfb908013274ce6c64e03563a68a2ed4fbfed8e4684c4c49e7f9710050aab6851cbff2e77609ce6e25f34"; + sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/tr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3c6740c9512b0d2d7f809312ba9f375be8635dc41a477e5084007cdffec9fae3c3677faf96745b61a384a4b899f48c5e9c239f52549faea00e198539181f8ba8"; + sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/uk/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0950bfca73dd4907e493e9b15667f70be1f1174ca755baeefbd2ed40160bec3f41e1c67207454e31afed919bc72314e671ed47492509c9b2c0c207bfe3e22088"; + sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/vi/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0107c16694feaffb18160e4eac666ec840b7efda706ddd04596cd4f54feaad07a95e9168eb8eb78cf800b4c60f3f4d229d6d217e3d3c681d2a2b0182ff65251b"; + sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-CN/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "879cd62661967b85919fddc90658d40a3119715eb2cfa95edfa60e7ef3dbc3eb23c2d317a9c632d1c2055900f03e8437af635d72efbf14d7b9fee7f87ed5b19e"; + sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-TW/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2c26ff8ed886aa5abf82511bb61fe96fc5817b211dcbfaf91deabb992b1cc968baccafcf1787b6f11b26052e18ff7f0da1d86de7ce45579bf2f6f403b11e9613"; + sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ar/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5d0971ab1c51c50a9f44967a13ea7c8cd7828f14625c5d5fc02ef001adbf69f7895ec6aa691a05c7a5ce5b038854d4dcfda0204c50533b028c2458adf5a6de97"; + sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ast/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "26e55787bc6e7a9fa8e3a40d0cee9912201026ec04454cbb117dbbad97d448dab1de9aba0c84e8cb10dda5cf818fd0c98116590b9e62849b5b714e63029d0fd7"; + sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/be/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "432295c9cbcbd59ea6bfca3d3509f9ba3ea07bc4004cd96bdfaff468210f30f9401e372c1f19c6504895e35db907d35c282d39666eb1c99e5362f46fe6dd9ecd"; + sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bg/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "137f4baad093df14da263ec707aaa64edfe0972b36e6441b864722a1577cc1683d4205649f79fac9262c5a53f7adcf045991bbdd3168cde74365ca2938bc8df5"; + sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bn-BD/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fc33faeec367b1161c969b82c0ec703fd4f443908284b0cae309f44942473cf6042723de8895442ca21da40d404f24a8c1a490313352b95cb949e568db56b953"; + sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/br/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "69c71b3af91d6bd5c63198937f43d5ac4c29c1c075b9faa64a94362cc544d5abd9182b339936a88da87bb69ec3201c6b54185c67d0dff1defede541a48d721a5"; + sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ca/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "b3b33c69e411cb4e920a72cb9a4eaf41469c709e0b04199e53094856121ed7fefe84d3987045442317dfed27069686692e9e0ea00562856a15c916c74c4f8e90"; + sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cs/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c38deac7a95fe30166f8a22e6e4c76039fa3ec31ddc4ffb4e84f78c549bd76ced476efeb0b4abac0d73b4f5ab54e6f9a7181804450f882c123f41b8c2dfa9f25"; + sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cy/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0ad5a4e40d03d0f329c479c56ad43a6151e262faa225e6f0280e4e60c7a13dd2ea949695f84514034031b796a8cf190fdab519cd58d998a254ad9238c337057e"; + sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/da/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e681d601bbeebad6c2abbd7784041b700bf0d2abcd490fa41165b608334e3a98ab2a8bd2291935622788c506c475de89ab5a868be734225219c499ad147d02be"; + sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/de/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f6388f6992e1057906e5343adcef5d3cc08c983d3319b2880190d7ad3a42266c1635f5a04914f44edea6487dbba64ec8a916383938d6c1c064eb06ead06da39d"; + sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/dsb/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "661f1eef600803d2c76f623be25a0b3143dceda01e146c12075b8aab32112922bdfbdafcb0d1f9be88ec1414f8447a7804494d1b5e6ab91873eb5ab00039e29b"; + sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/el/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "7c6cfdd5c97c7a721ccd02ecc6d000d759aafd9c1a05dd77da09ff077f2a284a5349a5c14371af35a5a9ab4829e4fb93d93042d75fd9eeefb95e2fc368dc458f"; + sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-GB/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a76afaab47e279ebf5ebacf510a1ad39cebc7f1abfda826bb9b5a6af9d4de9a02066f040affe33238aba40e875402a35aa819ab1f4895ebafe370bb3d32e7d74"; + sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-US/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "09e72c7a26e52973bf63e18e8c85f49c0aed00a7b4ea238bcb82c55964a019965cc24f5e71d3a7ab6f5d8f288a64609ce15bb584a2fddc08aea03ff5e6d071b3"; + sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-AR/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "412cf566707a02d62cc8a60d65a1974c608eaaf4ed666830facf137f7611a0346319a2cb560ae04742bffe776299facb7ea214e637248774bf406d5e7aab08ba"; + sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-ES/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a56988ffdae668c2321f999b0cebf8008bbddbfc3469f053135d848d4cbfaccfac75ae2db325b6a080eacdb8ede5dc91e8c2fa2be255b2e72c3a47c761e63f02"; + sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/et/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0df3306cebff726d26cd3b46e8ef14ccbe730ff2002b80c463185c6fa1b491eec1c3262dc792db8fd96da2b4394e00ed8abe21700f85cf2f969dc8bc9b548421"; + sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/eu/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ddf6542c17196aa7877409a4e37948eb351ea4fa7e10dfae21e4b8c21aa92b8bb3065c504b526784efcaa41c621889bc5ecebe4cf95ff56b0f2788d3b5cb7190"; + sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fi/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e86c14d4416939cd04d2a23849afc3cb991c352b9bdc3ecbc8f83aaa14360b30c706aa74ffbfef2bd369f62610c057232ec9e621871010d187965c177ed06e85"; + sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b0fdd4da60b3278e4639a17e896d1c817ab80a44207edf21845614a8c32c70bc2094184e8d90e1b831a3516dd5b18088f21a35b09e9e8c52d72ee41764bb45d2"; + sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fy-NL/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b314386f0cf27ee7f46f703c50eec9bbd879e0bc6c304c07f75f2b1455bb29c067c9c3c3d168fe3986f3018c406cf10815edde01a74764aa6d3f48a3999ff409"; + sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ga-IE/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "0dafbe71c9f8da9bb6b2c2ea29498a9e6f120e59d6f352d96c89a2e3c5ea1b2b072e91943490320ba52e070fe5b2a39332945edf34c729b672a83a2afe16a86c"; + sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gd/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "50809368c1fdde1181e163c9d77c79191454a68d0ebf4429d52c4e95ebf651adbfb7769b07ba4e3b365312ff12ed2fbb96be60dc3d90c6b8fc6fe35f3ea8c1de"; + sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f08d5bf61cca0e2fce5894619736a267be1851e8ad66fe2800b7a1dea2d847300bfa434c9dd539eaf966a63ee32a383cdede9029ce71758fb88e3fa6b35670d7"; + sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/he/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0a0a502e8da5945057c30f5a3de0fb623111e48d585cb7707addf0ea608e8683a882c0525e19ef4300f3d827e8d7989f09ff643955b3dc9379fcd6506e1415f9"; + sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "954cc5c1f3687945c6a66698ddb45ce74731bdc72f34b9ed874883b732149ad9a50773acfa1f19eec16840be3aeeec7d37ca140158def750c68d7ef6d5a2ffd4"; + sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hsb/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "15b7f0ae3741e6578e492b14ba3e43dd60e6d9f3768053cb43cd88d91d40fa247b6035b9746c173d272f752d86da2f5778779b3e3677792b976da68ff460c542"; + sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hu/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "32938f7f6a4f2f611a6e057a5eef8a1af67eee710f8de6053d4c9d1ef9b92fef5af29dfcc3c37939811f07dbdf89c529a9481ef4823aacfab7fa753f47144a5b"; + sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hy-AM/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0cceb38a1b6d679b3a5dfa63a44b90255a271ad0b9808d55408fb18cfa1e034b7010365b32a86cd72a29020fe211f404b7fc640f2b24428c3bc3945b4970ce8f"; + sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/id/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "89b8172a07ae809b153ea6c48dca1bf0ae7fcbc7dea6e13b78bce99f2e84d6bb3d23e3d7955344e71c918b1c26729b920429c1efdb6a4bd5db1bb24001220ccd"; + sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/is/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54875ec1b89501f52ad3525233ee8f7c9f50b1cf0b3061dc734a0733c0cf72c537f7279729b1c3afcfcdc411f708a519a4585877858c5c040e7455a0c5d30342"; + sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/it/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4766a810c7c49049ff20e52045100ab4a46a687e37613cb6161e680cdffe6fce708251a830c2b38f9fa5e93d6c31c5afa0856a79a20a9ac972c1624e77da932e"; + sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ja/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ef031bb68f1edf02c43887ec3c7d092c43e3b0694b18951997a3e2356675e09cd1f6be12a33945f8ebf877678c86266e61e1d3802ffbb42c7a7d1c3832f25eed"; + sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/kab/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6876c464c3e23640a3a03cc977b727fd1fea9925efacf9bb8a14afa575ef88041b85dc30569035fab700663eca1224928584b98b99735fdd6a68d9f00071e75a"; + sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ko/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0e2f64e9499d0cfc7597fe76214de6d9312804eaafdaef07d95e8ab84927db1d27232c9ac8b9283f24cf04e8bfac8667a253e7e229116e9241005ea433476019"; + sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/lt/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6e3c400dacb213a767699263a7106e08183d7c8b0fa06976ff5626aeb35be1d839a4383fb7cd61cf2437a1ab33e6315fdac8b921b2f0967bfd991a90ca2fe157"; + sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nb-NO/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "dce647bac69f3d7d7bee0e3ef622eedc6f7d97adf991a244718f24d8ba2c33a75c470c05e95d66109535a832c65d6cd2c064157e4e9806e44cd0f6f950de6de6"; + sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "e797cf5d6300b6478435c554ed39d4d1ef5ff9a61cd47557a2db1766912f8da9b1e60599b66e35ca9138d3e04e234b2f443a675d0329639b21f37cd787faea4c"; + sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nn-NO/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f30cf85b92a024a2c7133e97203c60ed18d2ddba2ddf081779962ea1af2be893cd820638b08dbbb09304ff1412df94a4dd5f6e9e05b49527a5d6d15011a4f024"; + sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pa-IN/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b6256747abfe759c0c65a0dd3431e9e498339259caff450b0988e1936ce10e9f2f019a241b21d7f2c1e9911e4396a055ab9640fcfd9a22d5f520ed461d476411"; + sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a6cd073fd83eb0a31e1cbcadd149e5c1be90e0bd8d890cde0ceec19bf4be15582fcceb5d6987c1682492a4e6370c215995c3ea49f3ae25529be6c5b1534c198b"; + sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-BR/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "016eeaa8804945f34a89d0fbb60133f1e0beca5c6ccd695201f09ab8fe529b85f98f0d992875ba8ce866d147ce9f92807773d44f9932ba1de73fdb1398fdece1"; + sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-PT/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "e76b5313089da90a6cb34190bd07e65cb7fda4a34ee0581009fcdf9d0135c42b698f2a6c575cc13e63d749ca0ee0f3485fb05308419b5f7e72c9a1ff89601a69"; + sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/rm/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fcb0fc5ef00a370396f01bdb885f3bedd551344849f6eba53057506a573486af5ec781f2850aaf1e6fede9a3613c9c94629511c0a7d445565db8fe1cabcec29c"; + sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ro/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "fafff899f366c17bc81b4432a4b1c6cae8fd6bff6c307bd377a314b9b4f520fbce4ba23b144a816d24fad65e90b33e17b25767c60f4ef10136dac6701f3d326f"; + sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ru/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0a0598479ced443e18d9b29bd0e0deca39176303f81e25999282af9fa1d67ffe5d0e66ad4f4461a24fbd94ca960876e2836ad2d69ba0fb4bbe81c1e471555625"; + sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/si/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "5aff4f01e7902140e817b206dd543a73b003a808bea448478918be7214de0601568151814baa96c4ae2ea193c76e7c8daa411f742b719df34dc275b4e9f8d52b"; + sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sk/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "560557b1662f58311a2ba694544a6b329a4fa709bc1702e12351c90b2647b974ffca4ac7c78e0c2430193cd6fcf194fb40f078c8c7c4cbb628e9b8e4a8abc37f"; + sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sl/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c3689c69bad7cd2f8ae58e430de4141b593db86adfc58e1f4b65258aa2a74c68595bbdaa966437a732502aae8f8c6952e10a27e453e632e2a162457261426a55"; + sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sq/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6ab246a7878e68204c2d4548a1583edb7293a7d7c671ad2be4767e098d7e5ab2308e5f5d8f02a7081bf6aead42207e88b16a38667ebde5f76bfb8fcf398545d3"; + sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "923fd4d862bb8c363f20a5f05dc67a98de3266b961790299c667492c1c528b860524bf7197377c73f68c849dca8a96ac7adccfd32b0e9513d631550e786c43b6"; + sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sv-SE/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "81d7662ebaa211208f435b8d66a5766289ca9bc897c81aeef9666f10157a5c6b3cd5226585e144ceb2ac3a2ca9edb336e82e4b3d9097e4a4097e5b6de5626e1a"; + sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ta-LK/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "dd8bd65fe029cb0fa7016119b354fc0e2d1a3bac2b89e899edcdc03e3514aad4ae91707f72d19156b1d24e778f0b7a54fbbdff049e553a3daeaf56c6486dec47"; + sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/tr/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3a71dcf6e9562d2e196e7bd76c662f5181f11cc6cc121a1ed1724e13e5e897777f1c36a4eeef36bf8a606ab8f13fbe8c4b3b345e9c70f42f8c22155ac7da3963"; + sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/uk/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6094592ebae6b37073e7c15da36f5fd39ccbbfbc104dac8faea889ebf00f9c6e7cd5f0a2bbd54b53c0495a7166ed871b7aa4c3abe4b97827d15646b4d002b010"; + sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/vi/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f96d09771ebd3ff63d35f95e42e77b2227c5b48a459f6e1e782a1259a845c2d6d819afb3a12333f19d5440cc6098db98b502514c5bb68c509a5a4778a5b88501"; + sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-CN/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "eba8d0ee4cc69f386dc114019501fac6b5ebeb3828755062167519ca062fa1e60d2327aec6db647459efd9ce83d31dbfeff28ea7821f52e9254de362a46ee472"; + sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-TW/thunderbird-52.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f0af41f4faa7259f6caa2a675e60880aea434b0f2bcbde3db00001c32362c001c92b10c14d06d1ea344390d16e20f87f0cb5a7e7ecfcfbb0b3ec1da9ece8f5dd"; + sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 4374e51f6d1e..51d90d11707f 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.2.1"; + version = "52.3.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb"; + sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 156ea589388d..85e5abdc9b6e 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = "http://msmtp.sourceforge.net/"; + homepage = http://msmtp.sourceforge.net/; license = licenses.gpl3; maintainers = with maintainers; [ garbas peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 696681dce277..9f30d722fda4 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -60,7 +60,7 @@ let meta = { description = "Low-latency, high quality voice chat software"; - homepage = "http://mumble.sourceforge.net/"; + homepage = http://mumble.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ viric jgeerds wkennington ]; platforms = platforms.linux; @@ -119,14 +119,14 @@ let }; gitSource = rec { - version = "2017-04-16"; + version = "2017-05-25"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf"; - sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh"; + rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3"; + sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f"; }; }; in { diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index a15c441b9cc6..5314d3668eb0 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; - homepage = "https://github.com/DanielAdolfsson/ndppd"; + homepage = https://github.com/DanielAdolfsson/ndppd; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 9bad7a8b42a3..3cea203a0257 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Benchmark to measure the performance of many different types of networking"; - homepage = "http://www.netperf.org/netperf/"; + homepage = http://www.netperf.org/netperf/; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index e95963c695c1..5ebd01f38c41 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.6"; + version = "0.18.8"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6"; + sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader written on Qt/C++ ''; - homepage = "https://quiterss.org"; + homepage = https://quiterss.org; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 1cae91dbf861..75ed084c2853 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; + homepage = http://vicerveza.homeunix.net/~viric/cgi-bin/offrss; description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 207581ed29b5..e0e8622e6431 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "051rky4rpm73flxxkhfdxqq23ncnk4ixhscbg74w82sa4d93f54k"; + sha256 = "02az9wq0d1vsgcdipddipdjwj2faf7jag8hizwd0ha3sjlmrs6d1"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 6b6f66e24d09..e8df906217a0 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,15 +1,42 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { - name = "eiskaltdcpp-2.2.9"; + name = "eiskaltdcpp-${version}"; + version = "2.2.10"; - src = fetchurl { - url = "https://eiskaltdc.googlecode.com/files/${name}.tar.xz"; - sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; + src = fetchFromGitHub { + owner = "eiskaltdcpp"; + repo = "eiskaltdcpp"; + rev = "v${version}"; + sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; + patches = [ + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch"; + sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch"; + sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch"; + sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch"; + sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch"; + sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8"; + }) + ]; + cmakeFlags = '' -DUSE_ASPELL=ON -DUSE_QT_QML=ON @@ -29,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; - homepage = https://code.google.com/p/eiskaltdc/; + homepage = https://github.com/eiskaltdcpp/eiskaltdcpp; license = licenses.gpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 6b91956e5e39..d18342177243 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = http://gnunet.org/; + homepage = https://gnunet.org/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index be385c5bc8b9..8c8d95169c87 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = http://gnunet.org/; + homepage = https://gnunet.org/; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix deleted file mode 100644 index b540ffd0967c..000000000000 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl -, libX11, boost, zlib, libnotify }: - -stdenv.mkDerivation rec { - name = "ldcpp-1.1.0"; - src = fetchurl { - url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; - sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; - }; - buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; - - installPhase = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; - - touch gettext xgettext msgfmt msgcat - chmod +x gettext xgettext msgfmt msgcat - export PATH=$PATH:$PWD - - mkdir -p $out - scons PREFIX=$out - scons PREFIX=$out install - ''; - - meta = { - description = "Direct Connect client"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix deleted file mode 100644 index 4b881445323a..000000000000 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: - -stdenv.mkDerivation { - name = "retroshare-0.6-git-fabc3a3"; - - src = fetchFromGitHub { - owner = "RetroShare"; - repo = "RetroShare"; - rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a"; - sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; - - patchPhase = '' - # Fix build error - sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ - libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # Where to find the bootstrap DHT bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsaccounts.cc - ''; - - # sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \ - # retroshare-gui/src/retroshare-gui.pro \ - # retroshare-nogui/src/retroshare-nogui.pro - - buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory - enableParallelBuilding = false; - - postInstall = '' - mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin - - # plugins - mkdir -p $out/share/retroshare - mv $out/lib* $out/share/retroshare - - # BT DHT bootstrap - cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare - ''; - - meta = with stdenv.lib; { - description = ""; - homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; - platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index cb6dad20ce08..0d7a41735ea4 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,40 +1,44 @@ -{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt }: +{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg +, qtmultimedia, qtx11extras, qttools }: -stdenv.mkDerivation { - name = "retroshare-0.5.5c"; +stdenv.mkDerivation rec { + name = "retroshare-${version}"; + version = "0.6.2"; - src = fetchurl { - url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz; - sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; + src = fetchFromGitHub { + owner = "RetroShare"; + repo = "RetroShare"; + rev = "v${version}"; + sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8"; }; - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ]; + # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; patchPhase = '' + # Fix build error sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # For bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc ''; - buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig - protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; - - sourceRoot = "retroshare-0.5.5/src"; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ + speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg + ]; preConfigure = '' qmakeFlags="$qmakeFlags DESTDIR=$out" ''; + # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory + enableParallelBuilding = false; + postInstall = '' mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin + mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui + mv $out/RetroShare06 $out/bin/Retroshare + ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui # plugins mkdir -p $out/share/retroshare @@ -47,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ""; homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index b6f4d8b5b19c..e5a242662ce1 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { name = "twister-${version}"; - version = "0.9.30"; + version = "0.9.34"; src = fetchurl { url = "https://github.com/miguelfreitas/twister-core/" + "archive/v${version}.tar.gz"; - sha256 = "1i39iqq6z25rh869vi5k76g84rmyh30p05xid7z9sqjrqdfpyyzk"; + sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq"; }; configureFlags = [ @@ -37,6 +37,12 @@ in stdenv.mkDerivation rec { boost db openssl geoip miniupnpc libiconv ]; + patches = stdenv.lib.singleton (fetchpatch { + url = "https://github.com/miguelfreitas/twister-core/commit/" + + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch"; + sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6"; + }); + postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ src/init.cpp @@ -55,7 +61,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://www.twister.net.co/"; + homepage = http://www.twister.net.co/; description = "Peer-to-peer microblogging"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix new file mode 100644 index 000000000000..a6858a7b5fdf --- /dev/null +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper +, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg +, lsb-release }: + +let + sha256 = { + "x86_64-linux" = "0g19sac4j3m1nf400vn6qcww7prqg2p4k4zsj74i109kk1396aa2"; + "i686-linux" = "1dd4ai2pclav9g872xil3x67bxy32gvz9pb3w76383pcsdh5zh45"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + arch = { + "x86_64-linux" = "amd64"; + "i686-linux" = "i686"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + +in stdenv.mkDerivation rec { + name = "anydesk-${version}"; + version = "2.9.4"; + + src = fetchurl { + url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz"; + inherit sha256; + }; + + libPath = stdenv.lib.makeLibraryPath ([ + cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango + gnome2.gtkglext + ] ++ (with xorg; [ + libxcb libX11 libXdamage libXext libXfixes libXi + libXrandr libXtst + ])); + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk} + install -m755 anydesk $out/bin/anydesk + cp changelog copyright README $out/share/doc/anydesk + cp -r icons/* $out/share/icons/hicolor/ + ''; + + postFixup = '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${libPath}" \ + $out/bin/anydesk + + wrapProgram $out/bin/anydesk \ + --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} + ''; + + meta = with stdenv.lib; { + description = "Desktop sharing application, providing remote support and online meetings"; + homepage = http://www.anydesk.com; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 503632c009b0..5e675c148bcd 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms, along with an xterm terminal emulator. It is written and maintained primarily by Simon Tatham. ''; - homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index c3eca16af011..66e0cef23f5b 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; - homepage = "http://remmina.sourceforge.net/"; + homepage = http://remmina.sourceforge.net/; description = "Remote desktop client written in GTK+"; maintainers = []; platforms = platforms.linux; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index ed64629fe244..1d1d6f4e1e3f 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "VNC viewer that adds encryption security to VNC connections"; - homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; + homepage = http://www.karlrunge.com/x11vnc/ssvnc.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index b28a9040532a..d15d0afa63cd 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = "http://www.teamviewer.com"; + homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 8079a0aabe66..b6b1f6542af3 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { name = "xorgxrdp-${version}"; - version = "0.2.1"; - + version = "0.2.3"; + src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi"; + sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -34,16 +34,15 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.2"; - rev = "48c26a3"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already - name = "xrdp-${version}.${rev}"; - + version = "0.9.3"; + name = "xrdp-${version}"; + src = fetchFromGitHub { owner = "volth"; repo = "xrdp"; - rev = rev; + rev = "refs/heads/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already fetchSubmodules = true; - sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16"; + sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7"; }; nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; @@ -59,7 +58,7 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; @@ -73,12 +72,12 @@ let # remove all session types except Xorg (they are not supported by this setup) ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini - + # remove all session types and then add Xorg ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini - + cat >> $out/etc/xrdp/sesman.ini < ++S<[ B<--help> ]> ++S<[ B<--version> ]> ++S<[ B<--extcap-interfaces> ]> ++S<[ B<--extcap-dlts> ]> ++S<[ B<--extcap-interface>=EinterfaceE ]> ++S<[ B<--extcap-config> ]> ++S<[ B<--capture> ]> ++S<[ B<--fifo>=Epath to file or pipeE ]> ++S<[ B<--port>=EportE ]> ++S<[ B<--payload>=EtypeE ]> ++ ++=head1 DESCRIPTION ++ ++B is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from ++any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic ++functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP ++port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless ++(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in ++https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master ++ ++=head1 OPTIONS ++ ++=over 4 ++ ++=item --help ++ ++Print program arguments. ++ ++=item --version ++ ++Print program version. ++ ++=item --extcap-interfaces ++ ++List available interfaces. ++ ++=item --extcap-interface=EinterfaceE ++ ++Use specified interfaces. ++ ++=item --extcap-dlts ++ ++List DLTs of specified interface. ++ ++=item --extcap-config ++ ++List configuration options of specified interface. ++ ++=item --capture ++ ++Start capturing from specified interface save saved it in place specified by --fifo. ++ ++=item --fifo=Epath to file or pipeE ++ ++Save captured packet to file or send it through pipe. ++ ++=item --port=EportE ++ ++Set the listerner port. Port 5555 is the default. ++ ++=item --payload=EtypeE ++ ++Set the payload of the exported PDU. Default: data. ++ ++=back ++ ++=head1 EXAMPLES ++ ++To see program arguments: ++ ++ udpdump --help ++ ++To see program version: ++ ++ udpdump --version ++ ++To see interfaces: ++ ++ udpdump --extcap-interfaces ++ ++ Example output: ++ interface {value=udpdump}{display=UDP Listener remote capture} ++ ++To see interface DLTs: ++ ++ udpdump --extcap-interface=udpdump --extcap-dlts ++ ++ Example output: ++ dlt {number=252}{name=udpdump}{display=Exported PDUs} ++ ++To see interface configuration options: ++ ++ udpdump --extcap-interface=udpdump --extcap-config ++ ++ Example output: ++ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on} ++ ++To capture: ++ ++ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture ++ ++NOTE: To stop capturing CTRL+C/kill/terminate application. ++ ++=head1 SEE ALSO ++ ++wireshark(1), tshark(1), dumpcap(1), extcap(4) ++ ++=head1 NOTES ++ ++B is part of the B distribution. The latest version ++of B can be found at L. ++ ++HTML versions of the Wireshark project man pages are available at: ++L. ++ ++=head1 AUTHORS ++ ++ Original Author ++ --------------- ++ Dario Lombardo diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 326529d1e0ff..340c2e0babe3 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules +, libssh, zlib, cmake, extra-cmake-modules, fetchpatch , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp @@ -12,17 +12,19 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.7"; + version = "2.4.0"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8"; + url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; + sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9"; }; + cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + nativeBuildInputs = [ bison cmake extra-cmake-modules flex ] ++ optional withGtk wrapGAppsHook; @@ -35,7 +37,19 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch + + # Backported from master. Will probably have to be dropped during next + # update. + (fetchpatch { + name = "AUTHORS_add_newline_after_bracket"; + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde"; + sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3"; + }) + # A file is missing from distribution. This should be fixed in upcoming + # releases + ./add_missing_udpdump_pod.patch + ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' @@ -61,7 +75,7 @@ in stdenv.mkDerivation { longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network protocol analyzer developed by an international team of networking - experts. It runs on UNIX, OS X and Windows. + experts. It runs on UNIX, macOS and Windows. ''; platforms = platforms.unix; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index bcdc3cd8342b..b9d74bee83d8 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { buildInputs = [ patchelf makeWrapper ]; meta = { - homepage = "https://spideroak.com"; + homepage = https://spideroak.com; description = "Secure online backup and sychronization"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ amorsillo ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 93b4fc764674..6dd6b5ebcedf 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.36"; + version = "1.37"; goPackagePath = "github.com/ncw/rclone"; @@ -10,12 +10,18 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3"; + sha256 = "0krmdwzl4c68vxpbycqy2xba8vvqbka7xh3k2q6ldxsd8y2rypym"; }; + outputs = [ "bin" "out" "man" ]; + + postInstall = '' + install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 + ''; + meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = "http://rclone.org"; + homepage = http://rclone.org; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index b24be07b8eec..1f5e9601ff22 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"]; + configureFlags = ["--with-nobody-group=nogroup"]; meta = base.meta // { description = "A fast incremental file transfer utility"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 033e6e5e0ab8..dd2576cd0830 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.31"; + version = "0.14.36"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1zg9gj0g89swr8cxxrpl96adhqgxz40dwkm7n61q1vycd6hhl73d"; + sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727"; }; buildInputs = [ go removeReferencesTo ]; @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { # Syncthing's build.go script expects this working directory cd src/github.com/syncthing/syncthing - go run build.go -no-upgrade -version v${version} install all + go run build.go -no-upgrade -version v${version} build ''; installPhase = '' - mkdir -p $out/bin $out/lib/systemd/{system,user} + mkdir -p $out/lib/systemd/{system,user} + + install -Dm755 syncthing $out/bin/syncthing - cp bin/* $out/bin '' + lib.optionalString (stdenv.isLinux) '' substitute etc/linux-systemd/system/syncthing-resume.service \ $out/lib/systemd/system/syncthing-resume.service \ diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 19a077d15898..550445f73068 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "umurmur-${version}"; - version = "0.2.16a"; + version = "0.2.17"; src = fetchFromGitHub { - owner = "fatbob313"; + owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1"; + sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; }; buildInputs = [ autoreconfHook openssl protobufc libconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; - homepage = http://code.google.com/p/umurmur/; + homepage = https://github.com/umurmur/umurmur; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 1c78f926fe7b..c3424e2fc779 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "vnstat-${version}"; - version = "1.15"; + version = "1.17"; src = fetchurl { - sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3"; + sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q"; url = "http://humdi.net/vnstat/${name}.tar.gz"; }; diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 4858a9f8bb91..96a518a7a28f 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { installTargets = "global_install"; meta = { - homepage = "http://www.winfield.demon.nl/"; + homepage = http://www.winfield.demon.nl/; description = "Convert MS Word documents to plain text or PostScript"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index ef824f57a354..3421abc557fc 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { --prefix PERL5LIB ":" "$PERL5LIB" \ --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { longDescription = '' GnuCash is personal and small-business financial-accounting software, freely licensed under the GNU GPL and available for GNU/Linux, BSD, - Solaris, Mac OS X and Microsoft Windows. + Solaris, macOS and Microsoft Windows. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 1eedf1f313b7..4ed150813127 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { longDescription = '' GnuCash is personal and small-business financial-accounting software, freely licensed under the GNU GPL and available for GNU/Linux, BSD, - Solaris, Mac OS X and Microsoft Windows. + Solaris, macOS and Microsoft Windows. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index fda320dd54a3..69a96c6148e1 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.34"; + name = "gnumeric-1.12.35"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725"; + sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a"; }; configureFlags = "--disable-component"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${gnome3.dconf}/lib/gio/modules'"} + ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules'"} done ''; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix new file mode 100644 index 000000000000..29c30204ddbe --- /dev/null +++ b/pkgs/applications/office/grisbi/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +, hicolor_icon_theme, libsoup, gnome3 }: + +stdenv.mkDerivation rec { + name = "grisbi-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; + sha256 = "1m31a1h4i59z36ri4a22rrd29byg6wnxq37559042hdhn557kazm"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + description = "A personnal accounting application."; + longDescription = '' + Grisbi is an application written by French developers, so it perfectly + respects French accounting rules. Grisbi can manage multiple accounts, + currencies and users. It manages third party, expenditure and receipt + categories, budgetary lines, financial years, budget estimates, bankcard + management and other information that make Grisbi adapted for + associations. + ''; + homepage = "http://grisbi.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ layus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 7b15ec347a92..119fb6bb0754 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = "http://ledger-cli.org/"; + homepage = http://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = "BSD"; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 07726ba90a41..a459909764e7 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://ledger-cli.org/"; + homepage = http://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 7c122c0725af..7f564379c660 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do + 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 : \ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index c24812418180..07a09fbfc0ab 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,19 +1,19 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv , gnome3, hicolor_icon_theme -, xvfb_run, dbus +, xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { name = "paperwork-${version}"; # Don't forget to also update paperwork-backend when updating this! - version = "1.0.6.1"; + version = "1.2"; src = fetchFromGitHub { repo = "paperwork"; owner = "jflesch"; rev = version; - sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h"; + sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5"; }; # Patch out a few paths that assume that we're using the FHS: @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { }}/lib/aspell"; checkInputs = [ xvfb_run dbus.daemon ]; - buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ]; + buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ]; # A few parts of chkdeps need to have a display and a dbus session, so we not # only need to run a virtual X server + dbus but also have a large enough @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo + paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil ]; makeWrapperArgs = [ @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A personal document manager for scanned documents"; - homepage = "https://github.com/jflesch/paperwork"; + homepage = https://github.com/jflesch/paperwork; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.aszlig ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 869a88fe2ab4..6a43f6ea24e7 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Planner"; + homepage = https://wiki.gnome.org/Apps/Planner; description = "Project management application for GNOME"; longDescription = '' Planner is the GNOME project management tool. diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 70d4a0bf8888..faecc3f4227b 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "Simple plaintext todo list manager"; - homepage = "http://todotxt.com"; + homepage = http://todotxt.com; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index e41b0e4683fc..76ad47950c49 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -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 = http://code.meskio.net/tudu/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 0cf85840db62..021e7f87eee0 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,21 +1,45 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs4, kdepimlibs, boost, baloo }: +{ + stdenv, + fetchurl, fetchpatch, + extra-cmake-modules, + qtbase, boost, + akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, + krunner, kwallet +}: stdenv.mkDerivation rec { - name = "zanshin-0.3.1"; + pname = "zanshin"; + version = "0.4.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "http://files.kde.org/zanshin/${name}.tar.bz2"; - sha256 = "1ck2ncz8i816d6d1gcsdrh6agd2zri24swgz3bhn8vzbk4215yzl"; + url = "https://files.kde.org/${pname}/${name}.tar.bz2"; + sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as"; }; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + patches = [ + (fetchpatch { + name = "zanshin-fix-qt59-build.patch"; + url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1"; + sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x"; + }) + ]; - buildInputs = [ kdelibs4 kdepimlibs boost baloo ]; + nativeBuildInputs = [ + extra-cmake-modules + ]; - meta = { - description = "GTD for KDE"; - maintainers = [ ]; - inherit (kdelibs4.meta) platforms; + buildInputs = [ + qtbase boost + akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap + krunner kwallet + ]; + + meta = with stdenv.lib; { + description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; + homepage = https://zanshin.kde.org/; + maintainers = with maintainers; [ zraexy ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 0e9f2eba1d12..a4b15b6626e7 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { installCheckPhase = "$out/bin/zotero --version"; meta = with stdenv.lib; { - homepage = "https://www.zotero.org"; + homepage = https://www.zotero.org; description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index d28aa8e62a14..674aa666b7e6 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = "http://www.shatters.net/celestia/"; + homepage = http://www.shatters.net/celestia/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index eb5506e74908..5903edd337df 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = "http://gravit.slowchop.com"; + homepage = http://gravit.slowchop.com; description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and - Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body + macOS. It uses Newtonian physics using the Barnes-Hut N-body algorithm. Although the main goal of Gravit is to be as accurate as possible, it also creates beautiful looking gravity patterns. It records the history of each particle so it can animate and diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index da6aa38d746a..886a98f2e6b3 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { meta = with lib; { description = "Free open-source planetarium"; - homepage = "http://stellarium.org/"; + homepage = http://stellarium.org/; license = licenses.gpl2; platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 97e081f908ef..cfd72601d1eb 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - major = "1.4"; + major = "1.5"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; - sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg"; + sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"; }; buildInputs = [ zlib bzip2 lzma perl ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 3acf7d965279..a2a40f0acc80 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.3.89"; + version = "2.3.98"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip"; - sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y"; + sha256 = "1bjdsvx8jsbcry6v7yfclh3vrlsvaw38f3s9587lklj63zj638l2"; }; buildInputs = [ unzip jre ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://www.broadinstitute.org/igv/"; + homepage = https://www.broadinstitute.org/igv/; description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index eb4d2714a127..06fc1ef641be 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A comprehensive update to the PLINK association analysis toolset"; - homepage = "https://www.cog-genomics.org/plink2"; + homepage = https://www.cog-genomics.org/plink2; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index 009e12aa02f0..cc48a0cb13a9 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; - homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; + homepage = http://pngu.mgh.harvard.edu/~purcell/plink/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; broken = true; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix new file mode 100755 index 000000000000..3bb9ea06fd46 --- /dev/null +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonPackage rec { + pname = "poretools"; + version = "unstable-2016-07-10"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + repo = pname; + owner = "arq5x"; + rev = "e426b1f09e86ac259a00c261c79df91510777407"; + sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; + }; + + propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; + + meta = { + description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; + license = stdenv.lib.licenses.mit; + homepage = http://poretools.readthedocs.io/en/latest/; + maintainers = [stdenv.lib.maintainers.rybern]; + }; +} diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 827c1448693a..f8391a2d6b3c 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - major = "1.4"; + major = "1.5"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; - sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls"; + sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5"; }; buildInputs = [ zlib ncurses ]; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix new file mode 100644 index 000000000000..b98af36604a3 --- /dev/null +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +with stdenv.lib; + +stdenv.mkDerivation { + name = "gwyddion"; + version = "2.48"; + src = fetchurl { + url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; + sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; + }; + buildInputs = [ gtk2 pkgconfig ]; + meta = { + homepage = http://gwyddion.net/; + + description = "Scanning probe microscopy data visualization and analysis"; + + longDescription = '' + A modular program for SPM (scanning probe microscopy) data + visualization and analysis. Primarily it is intended for the + analysis of height fields obtained by scanning probe microscopy + techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of + SPM data formats. However, it can be used for general height + field and (greyscale) image processing, for instance for the + analysis of profilometry data or thickness maps from imaging + spectrophotometry. + ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index ed208014f7d9..39c027706ee3 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication { meta = { description = description; - homepage = "https://www.pymol.org/"; + homepage = https://www.pymol.org/; license = licenses.psfl; }; } diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index dc00cef88982..399815f943a8 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; - homepage = http://caneda.tuxfamily.org; + homepage = http://caneda.org; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a7dcbb675f5b..506cdcd40371 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; - homepage = "http://www.kicad-pcb.org/"; + homepage = http://www.kicad-pcb.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index dfcdac20ae08..2588ee39addc 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; - homepage = "http://ngspice.sourceforge.net"; + homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; maintainers = with maintainers; [ viric rongcuid ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 4b4d21aca006..56bc66eb3caf 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = "http://qfsm.sourceforge.net/"; + homepage = http://qfsm.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 2a3f17b670b4..aca1f9a35898 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; - homepage = "http://www.tkgate.org/"; + homepage = http://www.tkgate.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.peti ]; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ed4a430198a1..31c2d4f6475e 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, flex_2_6_1, bison }: +{ stdenv, fetchurl, perl, flex, bison }: stdenv.mkDerivation rec { name = "verilator-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ perl flex_2_6_1 bison ]; + buildInputs = [ perl flex bison ]; postInstall = '' sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc} diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 9dd254736834..3a2dbf180ee3 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = "http://tetgen.org/"; + homepage = http://tetgen.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 904fb6c7d49e..b655cc48c731 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = "http://tetgen.org/"; + homepage = http://tetgen.org/; license = stdenv.lib.licenses.agpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 47fd8e5dbc81..bab9b302d7d1 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A tool for squential logic synthesis and ormal verification"; + description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 9c8ecd016394..bd4ccea231b3 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { + " " + optionalString installEmacsMode "install-emacs"; meta = with stdenv.lib; { - homepage = "http://www.loria.fr/equipes/calligramme/acg"; + homepage = http://calligramme.loria.fr/acg/; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 7cf0aeb203de..8cf4bb9b6d25 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.30"; src = fetchurl { - url = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; + url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "High-performance theorem prover and SMT solver"; - homepage = "http://alt-ergo.ocamlpro.com/"; + homepage = "https://alt-ergo.ocamlpro.com/"; license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 37d25c9e9477..2b40995b7433 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,48 +1,23 @@ -{ stdenv, fetchurl, zlib, useV16 ? false }: +{ stdenv, fetchurl }: -let - v15 = rec { - name = "boolector-${version}"; - version = "1.5.118"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz"; - sha256 = "17j7q02rryvfwgvglxnhx0kv8hxwy8wbhzawn48lw05i98vxlmk9"; - }; +stdenv.mkDerivation rec { + name = "boolector-${version}"; + version = "2.4.1"; + src = fetchurl { + url = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2"; + sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; }; - v16 = rec { - name = "boolector-${version}"; - version = "1.6.0"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz"; - sha256 = "0jka4r6bc3i24axgdp6qbq6gjadwz9kvi11s2c5sbwmdnjd7cp85"; - }; - }; - - boolectorPkg = if useV16 then v16 else v15; - license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3; -in -stdenv.mkDerivation (boolectorPkg // { - buildInputs = [ - zlib zlib.static (stdenv.lib.getOutput "static" stdenv.cc.libc) - ]; - - enableParallelBuilding = false; - installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cp boolector/boolector $out/bin - cp boolector/deltabtor $out/bin - cp boolector/synthebtor $out/bin - cp boolector/libboolector.a $out/lib - cp boolector/boolector.h $out/include + mkdir $out + mv boolector/bin $out ''; meta = { - inherit license; + license = stdenv.lib.licenses.unfreeRedistributable; description = "An extremely fast SMT solver for bit-vectors and arrays"; homepage = "http://fmv.jku.at/boolector"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; -}) +} diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index ec4e530ae523..87b847087e34 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = "8.3"; maintainers = with maintainers; [ roconnor vbgl ]; diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 32007ba45ce3..34505192021c 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 8d3fb19b2638..209cba07c438 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fd3655ce9e92..9620140dde4b 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" +, version ? "8.6.1" }: let @@ -18,9 +18,10 @@ let "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -129,10 +130,10 @@ self = stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; }; }; in self diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix new file mode 100644 index 000000000000..9687ac66ead1 --- /dev/null +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, make, fetchgit, ocaml }: + +let + version = "20170720"; +in + +stdenv.mkDerivation { + name = "coq2html-${version}"; + + src = fetchgit { + url = "https://github.com/xavierleroy/coq2html"; + rev = "e2b94093c6b9a877717f181765e30577de22439e"; + sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610"; + }; + + buildInputs = [ make ocaml ]; + + installPhase = '' + mkdir -p $out/bin + cp coq2html $out/bin + ''; + + meta = with stdenv.lib; { + description = "coq2html is an HTML documentation generator for Coq source files"; + longDescription = '' + coq2html is an HTML documentation generator for Coq source files. It is + an alternative to the standard coqdoc documentation generator + distributed along with Coq. The major feature of coq2html is its ability + to fold proof scripts: in the generated HTML, proof scripts are + initially hidden, but can be revealed one by one by clicking on the + "Proof" keyword. + ''; + homepage = https://github.com/xavierleroy/coq2html; + license = licenses.gpl2; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 26efbc5fe723..4d96339149af 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, vim }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }: stdenv.mkDerivation rec { name = "cryptominisat-${version}"; version = "5.0.1"; src = fetchFromGitHub { - owner = "msoos"; - repo = "cryptominisat"; - rev = version; + owner = "msoos"; + repo = "cryptominisat"; + rev = version; sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb"; }; - # vim for xxd binary - buildInputs = [ python vim ]; + buildInputs = [ python xxd ]; nativeBuildInputs = [ cmake ]; patches = [(fetchpatch rec { @@ -23,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced SAT Solver"; + homepage = https://github.com/msoos/cryptominisat; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; - license = licenses.mit; - homepage = https://github.com/msoos/cryptominisat; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 9bfbcc3f30df..65a0f72da5eb 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = "http://cubicle.lri.fr/"; + homepage = http://cubicle.lri.fr/; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ lucas8 ]; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 505d09ef3903..82fad1134bc4 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ raskin ]; platforms = platforms.linux; license = licenses.free; - homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; + homepage = http://www.cs.nyu.edu/acsys/cvc3/index.html; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index e931c6fcf9d5..5eb33daefe80 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { implementing combinations of deduction, execution and property checking. ''; - homepage = "http://hol.sourceforge.net/"; + homepage = http://hol.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index fe906fbe3578..af225a2961d5 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ocaml, eprover }: +{ stdenv, fetchurl, ocaml, eprover, zlib }: stdenv.mkDerivation rec { name = "iprover-${version}"; - version = "0.8.1"; + version = "2.5"; src = fetchurl { - url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz"; - sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; + url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz"; + sha256 = "1mbxjczp6nqw0p33glqmw973c268yzy4gxflk1lfiyiihrjdhinb"; }; - buildInputs = [ ocaml eprover ]; + buildInputs = [ ocaml eprover zlib ]; preConfigure = ''patchShebangs .''; @@ -25,12 +25,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An automated first-order logic theorem prover"; - maintainers = with maintainers; - [ - raskin - ]; + homepage = http://www.cs.man.ac.uk/~korovink/iprover/; + maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.linux; license = licenses.gpl3; - downloadPage = "http://code.google.com/p/iprover/downloads/list"; }; } diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index a938af72f587..f45f65e90826 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lean2-${version}"; - version = "2016-11-29"; + version = "2017-07-22"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean2"; - rev = "a086fb334838c427bbc8f984eb44a4cbbe013a6b"; - sha256 = "0qlvhnb37amclgcyizl8bfab33b0a3jk54br9gsrik8cq76lkwwx"; + rev = "34dbd6c3ae612186b8f0f80d12fbf5ae7a059ec9"; + sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl"; }; buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 50ef1edf63e2..db784237ea91 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://ozark.hendrix.edu/~burch/logisim"; + homepage = http://ozark.hendrix.edu/~burch/logisim; description = "Educational tool for designing and simulating digital logic circuits"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index d980afee7c4e..4b2116680d50 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner raskin ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://minisat.se/"; + homepage = http://minisat.se/; }; } diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix index 9d63f32c5449..f1a42f8215e3 100644 --- a/pkgs/applications/science/logic/minisat/unstable.nix +++ b/pkgs/applications/science/logic/minisat/unstable.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://minisat.se/"; + homepage = http://minisat.se/; }; } diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix new file mode 100644 index 000000000000..48546a86112b --- /dev/null +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, zlib, gmp }: + +stdenv.mkDerivation rec { + name = "open-wbo-2.0"; + + src = fetchFromGitHub { + owner = "sat-group"; + repo = "open-wbo"; + rev = "f193a3bd802551b13d6424bc1baba6ad35ec6ba6"; + sha256 = "1742i15qfsbf49c4r837wz35c1p7yafvz7ar6vmgcj6cmfwr8jb4"; + }; + + buildInputs = [ zlib gmp ]; + + makeFlags = [ "r" ]; + installPhase = '' + install -Dm0755 open-wbo_release $out/bin/open-wbo + ''; + + meta = with stdenv.lib; { + description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = http://sat.inesc-id.pt/open-wbo/; + }; +} diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 6129eaadc891..f9f021b15f07 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = "http://code.google.com/p/opensmt/"; + homepage = http://code.google.com/p/opensmt/; broken = true; downloadPage = "http://code.google.com/p/opensmt/downloads/list"; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 43c2ae141b7a..74e31d062f48 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.cs.unm.edu/~mccune/mace4/"; + homepage = http://www.cs.unm.edu/~mccune/mace4/; license = "GPL"; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 49245c73f2c4..9da2647d1138 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "A proof assistant for Nominal Computational Type Theory"; - homepage = "http://www.redprl.org/"; + homepage = http://www.redprl.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.acowley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 6f42ff15a227..c22bff9cdee2 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; - homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; + homepage = http://www.ps.uni-saarland.de/~cebrown/satallax/index.php; updateWalker = true; }; } diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 0ec7f93d26f5..c8e20c7260c9 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree"; name = "${name}-src.tar.gz"; - sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; + sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0"; }; patchPhase = ''patchShebangs tests/regress/check.sh''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # only installing the libyices.so.2.5.1 file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 9683579af475..a6b89f90ef67 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://github.com/Z3Prover/z3"; + 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_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix index 1b989097758e..d3d63795d69b 100644 --- a/pkgs/applications/science/logic/z3_opt/default.nix +++ b/pkgs/applications/science/logic/z3_opt/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver, optimization edition"; - homepage = "http://github.com/Z3Prover/z3"; + homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ]; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index 515b7e272899..e0b0bc11f05f 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { description = "A Computer algebra package for Lie group computations"; - homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/"; + homepage = http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/; license = stdenv.lib.licenses.lgpl3; # see the website longDescription = '' diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index e75ae2222ae9..5adece31370e 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = "http://www.r-project.org/"; + homepage = http://www.r-project.org/; description = "Free software environment for statistical computing and graphics"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index b8ed7ffac3cd..ff8a1ff95844 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.5.3"; + version = "2.12.6.1"; src = fetchurl { - url = "mirror://sourceforge/calc/${name}.tar.bz2"; - sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg"; + url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; + sha256 = "1vy4jmhmpl3gzgpkpv0kqwjv8hn1cza8cn1g8c69gq3inqvr4fvd"; }; buildInputs = [ makeWrapper readline ncurses utillinux ]; diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 879ad96a9367..6d1c778d1e0e 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; - homepage = "http://www.eukleides.org/"; + homepage = http://www.eukleides.org/; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index b6fdd6f58b9b..ef6b266eaaf2 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,13 +2,20 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-369-0"; + version = "5-0-382-0"; preferLocalBuild = true; src = fetchurl { - url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk"; + urls = [ + "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + + # Fallback for 5-0-382-0 + # To avoid breaks when latest geogebra version is + # removed from `download.geogebra.org` + "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2" + ]; + sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index dbd28cf9e8ce..05f09e4aedb3 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; + homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; }; } diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index ee67af62bb19..1956ebdcb0f1 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, cln, pkgconfig, readline, gmp }: +{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.6.2"; + name = "ginac-1.7.2"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g"; + sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4"; }; propagatedBuildInputs = [ cln ]; buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig python ]; + + preConfigure = "patchShebangs ginsh"; configureFlags = "--disable-rpath"; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 4de4a0c261d5..6a49976c86b8 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; + homepage = http://www.wolfram.com/mathematica/; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 07a20b4ebe03..c4fd0c384c14 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; + homepage = http://www.wolfram.com/mathematica/; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 1a9adcd4782f..1e23cfea27fc 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid + zlib ] ++ (with xorg; [ libX11 libXext @@ -93,6 +94,12 @@ stdenv.mkDerivation rec { echo "=== Running MathInstaller ===" ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent + + # Fix library paths + cd $out/libexec/Mathematica/Executables + for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do + sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path + done ''; preFixup = '' @@ -133,7 +140,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; + homepage = http://www.wolfram.com/mathematica/; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 5a19f73d9cf9..8a84ed78b781 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false let name = "maxima"; - version = "5.39.0"; + version = "5.40.0"; searchPath = stdenv.lib.makeBinPath @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm"; + sha256 = "15pp35ayglv723bjbqc60gcdv2bm54s6pywsm4i4cwbjsf64dzkl"; }; buildInputs = stdenv.lib.filter (x: x != null) @@ -45,7 +45,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; - homepage = "http://maxima.sourceforge.net"; + homepage = http://maxima.sourceforge.net; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 7503c50c6d22..36ac84ece25f 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://pallini.di.uniroma1.it/"; + homepage = http://pallini.di.uniroma1.it/; }; } diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 55293e6c8a79..2d150d0c30e9 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; + homepage = http://www.sas.upenn.edu/~vnanda/perseus/index.html; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [erikryb]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index e74e17fa44f5..02d24d601b19 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://www.gnu.org/software/pspp/"; + homepage = http://www.gnu.org/software/pspp/; description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 5f49b240fc06..cd89fbbe1871 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,19 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "0.9.9"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "0v9ibycilygmi9zzi7cxif7si56c85lfzdvbqnbf32whg8ydqqkg"; + sha256 = "08sg6kfcfdpxjsl538ba26ncm2cxzc63nlafj99ff4b46wxia57k"; }; + patchPhase = '' + for fn in src/interface.cc src/main.cc; do + substituteInPlace $fn --replace 'getPackageDataDir().c_str()' \"$out/share\" + done + ''; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 1e99b8782a96..82a6836bd623 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; + homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 7f94b7408a11..b7453ecb01d4 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; - homepage = "https://github.com/Ripser/ripser"; + homepage = https://github.com/Ripser/ripser; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [erikryb]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index e6630815ba16..bf3c7fcea989 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = ''DESTDIR=$out make install''; meta = { - homepage = "http://www.sagemath.org"; + homepage = http://www.sagemath.org; description = "A free open source mathematics software system"; license = stdenv.lib.licenses.gpl2Plus; broken = true; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 2e928bc8f344..3b01c684d529 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering. ''; - homepage = "http://www.labri.fr/perso/pelegrin/scotch"; + homepage = http://www.labri.fr/perso/pelegrin/scotch; license = stdenv.lib.licenses.cecill-c; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 3fe8b542995e..b098da060e07 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = subtractLists platforms.i686 platforms.linux; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = "http://www.singular.uni-kl.de/index.php"; + homepage = http://www.singular.uni-kl.de/index.php; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index 0c87beb22dfc..a7212299aa63 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.publicDomain; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://www.symmetrica.de/"; + homepage = http://www.symmetrica.de/; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index cfc63a50165e..18cb26890634 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; + 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]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix new file mode 100644 index 000000000000..b0471b80e2f1 --- /dev/null +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }: + +with stdenv.lib; +stdenv.mkDerivation { + name = "aliza"; + src = fetchurl { + # Hosted on muoniurn's google drive + url = "https://drive.google.com/uc?export=download&id=0B0s_Yf4jjfZ4WUJaSERHN3FsNFE"; + sha256 = "1nfp3ghjnfxmxiclg76gcn7a3mhvi6h7s5wmd9v9l6w8lfq9vj5h"; + name = "aliza.rpm"; + }; + + buildInputs = [ rpmextract makeWrapper ]; + + unpackCmd = "rpmextract $curSrc"; + + patchPhase = '' + sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop + ''; + + installPhase = '' + mkdir -p $out + cp -r bin share $out + + runHook postInstall + ''; + + postInstall = let + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; + in '' + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/aliza + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/aliza-vtkvol + + wrapProgram $out/bin/aliza \ + --prefix LD_LIBRARY_PATH : ${libs} + + wrapProgram $out/bin/aliza-vtkvol \ + --prefix LD_LIBRARY_PATH : ${libs} + ''; + + meta = { + description = "Medical imaging software with 2D, 3D and 4D capabilities"; + homepage = http://www.aliza-dicom-viewer.com; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mounium ]; + }; +} diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index d36b0f0b4d93..d5ffe9cd9ba8 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.cytoscape.org"; + homepage = http://www.cytoscape.org; description = "A general platform for complex network analysis and visualization"; license = stdenv.lib.licenses.lgpl21; maintainers = [stdenv.lib.maintainers.mimadrid]; diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index b5e9fa6a51ee..0d5c79fde900 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { name = "motu-client-${version}"; - version = "1.0.8"; + version = "1.4.00"; src = fetchurl { - url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz"; - sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2"; + url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; + sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; }; meta = with lib; { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8916a9fd1677..86e074dbe5d4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.00"; + version = "6.10.04"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp"; + sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = "https://root.cern.ch/"; + homepage = https://root.cern.ch/; description = "A data analysis framework"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 35ab53483687..9a89b88d7a52 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). ''; - homepage = "http://lammps.sandia.gov"; + homepage = http://lammps.sandia.gov; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix new file mode 100644 index 000000000000..152b71217743 --- /dev/null +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -0,0 +1,32 @@ +{ stdenv, glibc, flex, bison, cmake +, version, src, meta }: +stdenv.mkDerivation { + name = "scyther-cli-${version}"; + + inherit src meta; + + buildInputs = [ + cmake + glibc.static + flex + bison + ]; + + patchPhase = '' + # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work + printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h + ''; + + configurePhase = '' + (cd src && cmakeConfigurePhase) + ''; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ]; + + installPhase = '' + mkdir -p "$out/bin" + mv src/scyther-linux "$out/bin/scyther-cli" + ln -s "$out/bin/scyther-cli" "$out/bin/scyther-linux" + ''; +} diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix new file mode 100644 index 000000000000..beef26c6032a --- /dev/null +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz +, includeGUI ? true +, includeProtocols ? true +}: +let + version = "1.1.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + sha256 = "0rb4ha5bnjxnwj4f3hciq7kyj96fhw14hqbwl5kr9cdw8q62mx0h"; + owner = "cascremers"; + repo = "scyther"; + }; + + meta = with lib; { + description = "Scyther is a tool for the automatic verification of security protocols."; + homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/; + license = licenses.gpl2; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.linux; + }; + + cli = callPackage_i686 ./cli.nix { + inherit version src meta; + }; + + gui = stdenv.mkDerivation { + name = "scyther-gui-${version}"; + inherit src meta; + buildInputs = [ + python27Packages.wrapPython + ]; + + patchPhase = '' + file=gui/Scyther/Scyther.py + + # By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is + substituteInPlace $file --replace "return getMyDir()" "return \"${cli}/bin\"" + + # Removes the Shebang from the file, as this would be wrapped wrongly + sed -i -e "1d" $file + ''; + + dontBuild = true; + + propagatedBuildInputs = [ + python27Packages.wxPython + graphviz + ]; + + installPhase = '' + mkdir -p "$out"/gui "$out"/bin + cp -r gui/* "$out"/gui + ln -s "$out"/gui/scyther-gui.py "$out/bin/scyther-gui" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/gui" "$out $pythonPath" + ''; + + doInstallCheck = true; + installCheckPhase = '' + "$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl" + ''; + }; +in + buildEnv { + name = "scyther-${version}"; + inherit meta; + paths = [ cli ] ++ lib.optional includeGUI gui; + pathsToLink = [ "/bin" ]; + + postBuild = '' + rm "$out/bin/scyther-linux" + '' + lib.optionalString includeProtocols '' + mkdir -p "$out/protocols" + cp -rv ${src}/protocols/* "$out/protocols" + ''; + } diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix new file mode 100644 index 000000000000..569606d2fdb6 --- /dev/null +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.20170611"; + pname = "blackbox"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stackexchange"; + repo = pname; + rev = "v${version}"; + sha256 = "1jnzhlj54c0szw9l9wib07i2375pbm402bx9wagspcmwc0qw43p6"; + }; + + installPhase = '' + mkdir -p $out/bin && cp -r bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "Safely store secrets in a VCS repo"; + maintainers = with maintainers; [ ericsagnes ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index cc4edd54b560..6301acdf1342 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Bugtracker supporting distributed revision control"; - homepage = "http://www.bugseverywhere.org/"; + homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index eae18c39dadd..ed207a1e7d96 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; - homepage = "http://www.catb.org/esr/cvs-fast-export/"; + homepage = http://www.catb.org/esr/cvs-fast-export/; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 7ad3aac61d9e..8c69517a7506 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ nano ]; meta = { - homepage = "http://cvs.nongnu.org"; + homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index b2324581244a..b2a4bc66c699 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -27,7 +27,7 @@ in ''; meta = with stdenv.lib; { - homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; + homepage = https://rtyley.github.io/bfg-repo-cleaner/; # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index e7511e10d40e..518db7708b7f 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://git.zx2c4.com/cgit/about/; + homepage = https://git.zx2c4.com/cgit/about/; repositories.git = git://git.zx2c4.com/cgit; description = "Web frontend for git repositories"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index f7c6ef25b731..1af1870928ba 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = { description = "Converts a Darcs repository into a Git repository"; - homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; + homepage = http://www.sanityinc.com/articles/converting-darcs-repositories-to-git; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 081bfd5918b8..82846a564cd9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -34,6 +34,8 @@ rec { git = appendToName "minimal" gitBase; + git-fame = callPackage ./git-fame {}; + # The full-featured Git. gitFull = gitBase.override { svnSupport = true; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 3b1837d16f1b..5878f3a8b74c 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "0.11.4"; + version = "1.1.1"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig"; + sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r"; }; # Perl is needed here for patchShebangs @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # itself, so we are copying executable to lib, and only symlink it # from bin/ cp diff-so-fancy $out/lib/diff-so-fancy - cp -r libexec $out/lib/diff-so-fancy + cp -r lib $out/lib/diff-so-fancy ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin # ncurses is needed for `tput` @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix new file mode 100644 index 000000000000..6918f048eae3 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: + +python2Packages.buildPythonApplication rec { + pname = "git-big-picture"; + version = "0.9.0"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "esc"; + repo = pname; + rev = "v${version}"; + sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9"; + }; + + buildInputs = [ git graphviz ]; + + postFixup = '' + wrapProgram $out/bin/git-big-picture \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + ''; + + meta = { + description = "Tool for visualization of Git repositories."; + homepage = https://github.com/esc/git-big-picture; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nthorne ]; + }; +} 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 2a9ea0715e03..8e3c6b8d9d02 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.10"; + version = "2.11"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; + sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 517602bb633e..e5e676059706 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://www.agwa.name/projects/git-crypt"; + homepage = https://www.agwa.name/projects/git-crypt; description = "Transparent file encryption in git"; longDescription = '' git-crypt enables transparent encryption and decryption of files in a git diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile new file mode 100644 index 000000000000..17373f02b44d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in git_fame.gemspec +gem "git_fame" diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock new file mode 100644 index 000000000000..0ac7907fe55d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock @@ -0,0 +1,26 @@ +GEM + remote: https://rubygems.org/ + specs: + git_fame (2.5.2) + hirb (~> 0.7.3) + memoist (~> 0.14.0) + method_profiler (~> 2.0.1) + progressbar (~> 0.21.0) + scrub_rb (~> 1.0.1) + trollop (~> 2.1.2) + hirb (0.7.3) + memoist (0.14.0) + method_profiler (2.0.1) + hirb (>= 0.6.0) + progressbar (0.21.0) + scrub_rb (1.0.1) + trollop (2.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + git_fame + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix new file mode 100644 index 000000000000..8b77efd1be23 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -0,0 +1,19 @@ +{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }: + +bundlerEnv rec { + inherit ruby; + + pname = "git_fame"; + + gemdir = ./.; + + meta = with stdenv.lib; { + description = '' + A command-line tool that helps you summarize and pretty-print collaborators based on contributions + ''; + homepage = http://oleander.io/git-fame-rb; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix new file mode 100644 index 000000000000..49b4af4ef6d3 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix @@ -0,0 +1,60 @@ +{ + git_fame = { + dependencies = ["hirb" "memoist" "method_profiler" "progressbar" "scrub_rb" "trollop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02k5ls5zyif8skdbnym6zw9y76whlnksw2m94jsh2n1ygk98izdd"; + type = "gem"; + }; + version = "2.5.2"; + }; + hirb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji"; + type = "gem"; + }; + version = "0.7.3"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03d3h6kp16bf0crqg1cxdgp1d2iyzn53d3phbmjh4pjybqls0gcm"; + type = "gem"; + }; + version = "0.14.0"; + }; + method_profiler = { + dependencies = ["hirb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ax04qrrv7fqp5ayxaxhn72660pybdkpkvmgiwbg7bs7x5ijjzd8"; + type = "gem"; + }; + version = "2.0.1"; + }; + progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17haw9c6c9q6imsn83pii32jnihpg76jgd09x7y4hjqq45n3qcdh"; + type = "gem"; + }; + version = "0.21.0"; + }; + scrub_rb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dwg33w83w17aiij9kcbi7irj7lh045nh9prjgkzjya3f1j60d3x"; + type = "gem"; + }; + version = "1.0.1"; + }; + trollop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; + type = "gem"; + }; + version = "2.1.2"; + }; +} \ No newline at end of file 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 82549fd9a57a..9ddcaea497de 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 @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { - sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k"; + sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 3b10c3305efc..1bf7a14932ec 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -4,10 +4,6 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; version = "0.5"; - phases = [ "unpackPhase" "installPhase" ]; - - dontInstallSrc = true; - src = fetchFromGitHub { owner = "michaeldfallen"; repo = "git-radar"; @@ -15,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; }; + dontBuild = true; + installPhase = '' mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 547f5f997b98..f30813cf1201 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/felipec/git-remote-hg"; + homepage = https://github.com/felipec/git-remote-hg; description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; 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 981b57b44c1a..746801eb9087 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,7 +12,7 @@ }: let - version = "2.13.2"; + version = "2.14.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1rfx2gj7dw9rw0w22ihi940zv3wdrj1xmjv25djq2vs6a4vsq40d"; + sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg"; }; hardeningDisable = [ "format" ]; @@ -198,7 +198,7 @@ EOF enableParallelBuilding = true; meta = { - homepage = http://git-scm.com/; + homepage = https://git-scm.com/; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index afb01ff4a89c..044800fe73a6 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://josefsson.org/git2cl/"; + homepage = http://josefsson.org/git2cl/; description = "Convert git logs to GNU style ChangeLog files"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 05659a68a522..698de486b5be 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -4,14 +4,14 @@ with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.10.2"; + version = "1.11.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; + sha256 = "0zk53g0wd5n1zlhkwlfp124i6agx8kl0cwvy0dia3jh1p51vsc1q"; }; buildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 955fe90ff119..7130e057d971 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = { - homepage = "http://procode.org/stgit/"; + homepage = http://procode.org/stgit/; description = "A patch manager implemented on top of Git"; license = "GPL"; 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 8a0cd8982625..f5e5fddd3b72 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://jonas.github.io/tig/"; + homepage = https://jonas.github.io/tig/; description = "Text-mode interface for git"; maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 441c28bd45be..c183bbde7e6b 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://github.com/greenrd/topgit"; + homepage = https://github.com/greenrd/topgit; description = "TopGit manages large amount of interdependent topic branches"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix new file mode 100644 index 000000000000..24c22d423d5d --- /dev/null +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "git-lfs-${version}"; + version = "1.5.6"; + rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; + + goPackagePath = "github.com/git-lfs/git-lfs"; + + src = fetchFromGitHub { + inherit rev; + owner = "git-lfs"; + repo = "git-lfs"; + sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; + }; + + # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' + excludedPackages = [ "test" ]; + + preBuild = '' + pushd go/src/github.com/git-lfs/git-lfs + go generate ./commands + popd + ''; + + postInstall = '' + rm -v $bin/bin/{man,script} + ''; + meta = with stdenv.lib; { + description = "Git extension for versioning large files"; + homepage = https://git-lfs.github.com/; + license = [ licenses.mit ]; + maintainers = [ maintainers.twey ]; + }; +} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 6543f40c4dad..bf089a03fa0f 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.0.2"; - rev = "85e2aec4d949517b4a7a53e4f745689331952b6c"; + version = "2.2.1"; + rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy"; + sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s"; }; preBuild = '' diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 886efefa8bbb..808e7b1850d1 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. ''; - homepage = "https://android.googlesource.com/tools/repo"; + homepage = https://android.googlesource.com/tools/repo; license = licenses.asl20; maintainers = [ maintainers.primeos ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 080894bc80e1..a824b55fca84 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - homepage = "https://github.com/openstack-infra/git-review"; + homepage = https://github.com/openstack-infra/git-review; description = "Tool to submit code to Gerrit"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index c93ee9244663..4b6ba9398b48 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/msiemens/PyGitUp; + homepage = https://github.com/msiemens/PyGitUp; description = "A git pull replacement that rebases all local branches when pulling."; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 23a3ab7fa5e6..c7f7a4b02e4d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7"; + sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index c8af3fe63f92..49243a823ede 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { meta = { description = "A painless self-hosted Git service"; - homepage = "https://gogs.io"; + homepage = https://gogs.io; license = licenses.mit; maintainers = [ maintainers.schneefux ]; }; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 244a95447a96..53947a95e9f1 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.1.1"; + version = "4.3.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3"; + sha256 = "18hq6vvjsrjsnbs15bvyyfrss35bgc0hgw4wxksdyaj578pg04ib"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -44,12 +44,6 @@ in python2Packages.buildPythonApplication { $WRAP_TK done - mkdir -p $out/etc/mercurial - cat >> $out/etc/mercurial/hgrc << EOF - [web] - cacerts = /etc/ssl/certs/ca-certificates.crt - EOF - # copy hgweb.cgi to allow use in apache mkdir -p $out/share/cgi-bin cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin @@ -62,7 +56,7 @@ in python2Packages.buildPythonApplication { meta = { inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = "http://mercurial.selenic.com/"; + homepage = http://mercurial.selenic.com/; downloadPage = "http://mercurial.selenic.com/release/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 2408621b9cf9..238d527ce38e 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -13,7 +13,7 @@ in mkDerivation rec { description = "A tool for editing version-control repository history"; version = "3.28"; license = licenses.bsd3; - homepage = "http://www.catb.org/esr/reposurgeon/"; + homepage = http://www.catb.org/esr/reposurgeon/; maintainers = with maintainers; [ dfoxfranke ]; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 059c4fc344c2..903932ccbec3 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = "http://www.srcml.org"; + homepage = http://www.srcml.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 17ff3e4b19f3..0a5a3fbd0c64 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,12 +104,12 @@ let in { subversion18 = common { - version = "1.8.17"; - sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy"; + version = "1.8.18"; + sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5"; }; subversion19 = common { - version = "1.9.5"; - sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa"; + version = "1.9.7"; + sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3"; }; } diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index e15bc489beb7..77663e858ef2 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -12,9 +12,15 @@ stdenv.mkDerivation rec { }; patches = - [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; - sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; - }) + [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; + sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; + }) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch"; + sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam"; + }) ]; buildInputs = [ which git ronn perl ShellCommand TestMost ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 6587b25ef94a..f0185e187bbe 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/TheLocehiliosan/yadm"; + homepage = https://github.com/TheLocehiliosan/yadm; description = "Yet Another Dotfiles Manager"; longDescription = '' yadm is a dotfile management tool with 3 main features: Manages files across diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 79e3cfbde1bd..5dae78a3e8c4 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -14,11 +14,11 @@ }: let - version = "2.6.18"; + version = "2.6.20"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l"; + sha256 = "17zgqz6i0bcan04wqwksf7y4z73vxmabcpnd9y5nhx7br5zwpih3"; }; common = { @@ -43,7 +43,7 @@ let ; meta = { - homepage = "http://fixounet.free.fr/avidemux/"; + homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; platforms = with stdenv.lib.platforms; linux; @@ -88,6 +88,8 @@ let fixupPhase ''; + + meta = common.meta // args.meta or {}; }); in { @@ -114,6 +116,8 @@ in { pluginUi = "GTK"; isUi = true; buildDirs = [ "avidemux/gtk" ]; + # Code seems unmaintained. + meta.broken = true; }; avidemux_common = buildPlugin { diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index bffb038f6536..a9e2654f731b 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; - homepage = "https://bomi-player.github.io/"; + homepage = https://bomi-player.github.io/; license = licenses.gpl2Plus; maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 6eb9e94e9695..60c31cf07f92 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { - homepage = http://damien.douxchamps.net/ieee1394/coriander/; + homepage = https://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 5e8e63564f4f..8ceb7875be4d 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Linux DVB API applications and utilities"; - homepage = http://linuxtv.org/; + homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch b/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch deleted file mode 100644 index 8539186aaa56..000000000000 --- a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001 -From: John Stebbins -Date: Tue, 3 Nov 2015 10:16:01 -0800 -Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling - ---- -diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c -index 0d70597..373c2ab 100644 ---- a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m ) - hb_mux_data_t * track; - int meta_mux; - int max_tracks; -- int ii, ret; -+ int ii, jj, ret; - - int clock_min, clock_max, clock; - hb_video_framerate_get_limits(&clock_min, &clock_max, &clock); -@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m ) - } - } - -+ // Check for audio track associations -+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++) -+ { -+ audio = hb_list_item(job->list_audio, ii); -+ switch (audio->config.out.codec & HB_ACODEC_MASK) -+ { -+ case HB_ACODEC_FFAAC: -+ case HB_ACODEC_CA_AAC: -+ case HB_ACODEC_CA_HAAC: -+ case HB_ACODEC_FDK_AAC: -+ case HB_ACODEC_FDK_HAAC: -+ break; -+ -+ default: -+ { -+ // Mark associated fallback audio tracks for any non-aac track -+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ ) -+ { -+ hb_audio_t * fallback; -+ int codec; -+ -+ if (ii == jj) continue; -+ -+ fallback = hb_list_item( job->list_audio, jj ); -+ codec = fallback->config.out.codec & HB_ACODEC_MASK; -+ if (fallback->config.in.track == audio->config.in.track && -+ (codec == HB_ACODEC_FFAAC || -+ codec == HB_ACODEC_CA_AAC || -+ codec == HB_ACODEC_CA_HAAC || -+ codec == HB_ACODEC_FDK_AAC || -+ codec == HB_ACODEC_FDK_HAAC)) -+ { -+ hb_mux_data_t * fallback_track; -+ int * sd; -+ -+ track = audio->priv.mux_data; -+ fallback_track = fallback->priv.mux_data; -+ sd = (int*)av_stream_new_side_data(track->st, -+ AV_PKT_DATA_FALLBACK_TRACK, -+ sizeof(int)); -+ if (sd != NULL) -+ { -+ *sd = fallback_track->st->index; -+ } -+ } -+ } -+ } break; -+ } -+ } -+ - char * subidx_fmt = - "size: %dx%d\n" - "org: %d, %d\n" diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 047f23011855..7e87f03725f4 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "DVD backup and DVD authoring program"; - homepage = "http://k9copy-reloaded.sourceforge.net/"; + homepage = http://k9copy-reloaded.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ flosse ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index b36b539176ee..bc6cd015b865 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz"; sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/key-mon; + homepage = https://code.google.com/archive/p/key-mon; description = "Utility to show live keyboard and mouse status for teaching and screencasts"; license = licenses.asl20; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 33e64c65cf42..09cdf20ace0b 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kodi.tv/; + homepage = https://kodi.tv/; description = "Media center"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 51ff8fece630..e98500f8e76c 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -19,11 +19,11 @@ rec { }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.tv/showthread.php?tid=85724"; + homepage = https://forum.kodi.tv/showthread.php?tid=85724; description = "A program launcher for Kodi"; longDescription = '' Advanced Launcher allows you to start any Linux, Windows and - OS X external applications (with command line support or not) + macOS external applications (with command line support or not) directly from the Kodi GUI. Advanced Launcher also give you the possibility to edit, download (from Internet resources) and manage all the meta-data (informations and images) related @@ -49,7 +49,7 @@ rec { }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.tv/showthread.php?tid=287826"; + homepage = https://forum.kodi.tv/showthread.php?tid=287826; description = "A program launcher for Kodi"; longDescription = '' Advanced Emulator Launcher is a multi-emulator front-end for Kodi @@ -129,7 +129,7 @@ rec { sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=258159; + homepage = https://forum.kodi.tv/showthread.php?tid=258159; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; }; @@ -184,7 +184,7 @@ rec { }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.tv/showthread.php?tid=67110"; + homepage = https://forum.kodi.tv/showthread.php?tid=67110; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play @@ -234,7 +234,7 @@ rec { }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.tv/showthread.php?tid=157499"; + homepage = https://forum.kodi.tv/showthread.php?tid=157499; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' This add-on will close/minimise Kodi, launch Steam in Big @@ -263,7 +263,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=187421; + homepage = https://forum.kodi.tv/showthread.php?tid=187421; descritpion = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index be4363c8314d..93a8d2070542 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://zdfmediathk.sourceforge.net/; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.chaoflow ]; - platforms = platforms.linux; # also OS X and cygwin, but not investigated, yet + platforms = platforms.linux; # also macOS and cygwin, but not investigated, yet }; } diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 5ca530cfe9d2..3a297abb15c4 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -81,7 +81,7 @@ in buildPythonApplication rec { ] ++ optional enableBonjour avahi; meta = { - homepage = "http://www.getmiro.com/"; + homepage = http://www.getmiro.com/; description = "Video and audio feed aggregator"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0877df0a68cf..442e9d8eeb34 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "13.0.0"; + version = "15.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777"; + sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 9ae1b99f86fd..8e28f77ffeed 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -10,6 +10,7 @@ , vdpauSupport ? false, libvdpau ? null , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null , dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null , bluraySupport ? true, libbluray ? null , amrSupport ? false, amrnb ? null, amrwb ? null , cacaSupport ? true, libcaca ? null @@ -39,6 +40,7 @@ assert screenSaverSupport -> libXScrnSaver != null; assert vdpauSupport -> libvdpau != null; assert cddaSupport -> cdparanoia != null; assert dvdnavSupport -> libdvdnav != null; +assert dvdreadSupport -> libdvdread != null; assert bluraySupport -> libbluray != null; assert amrSupport -> (amrnb != null && amrwb != null); assert cacaSupport -> libcaca != null; @@ -110,6 +112,7 @@ stdenv.mkDerivation rec { ++ optional cacaSupport libcaca ++ optional xineramaSupport libXinerama ++ optional dvdnavSupport libdvdnav + ++ optional dvdreadSupport libdvdread ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia ++ optional jackaudioSupport libjack2 @@ -201,7 +204,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats"; - homepage = "http://mplayerhq.hu"; + homepage = http://mplayerhq.hu; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 674d6f46690b..27ce61eec6d1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -33,6 +33,7 @@ , vaapiSupport ? true, libva ? null , drmSupport ? !stdenv.isDarwin, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null +, archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null # scripts you want to be loaded by default @@ -65,27 +66,28 @@ assert libpngSupport -> available libpng; assert youtubeSupport -> available youtube-dl; assert vapoursynthSupport -> available vapoursynth; assert jackaudioSupport -> available libjack2; +assert archiveSupport -> available libarchive; assert vaapiSupport -> available libva; assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but # for purity reasons this behavior should be avoided. - wafVersion = "1.8.12"; + wafVersion = "1.9.8"; waf = fetchurl { urls = [ "http://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; - sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1"; + sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "16r3fyq472hzxnh6g3gm520pmw1ybslaki3pqjm2d9jnd2md1pa5"; + sha256 = "0d9pvsknjqmxj907y85fxh9xcbb5dafw2bh7rpwhgs9x4wdrbvv0"; }; patchPhase = '' @@ -101,6 +103,9 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity + (enableFeature archiveSupport "libarchive") + (enableFeature dvdreadSupport "dvdread") + (enableFeature dvdnavSupport "dvdnav") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") ]; @@ -136,6 +141,7 @@ in stdenv.mkDerivation rec { ++ optional vaapiSupport libva ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth + ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optionals waylandSupport [ wayland libxkbcommon ]; @@ -154,7 +160,7 @@ in stdenv.mkDerivation rec { ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ - --add-flags "--script=${concatStringsSep "," scripts}" \ + --add-flags "--scripts=${concatStringsSep "," scripts}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 9e36f790c782..d8f18f97ad9a 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; - homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; + homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; maintainers = [ lib.maintainers.profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 4320022192a4..71bb0405111c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; meta = with stdenv.lib; { - homepage = "https://www.mythtv.org/"; + homepage = https://www.mythtv.org/; description = "Open Source DVR"; license = licenses.gpl2; meta.platforms = platforms.linux; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0aebb4dcb64d..3707f32c9d3c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "19.0.3"; + version = "20.0.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b"; + sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld"; }; patches = [ ./find-xcb.patch ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { Software", software originally designed for recording and streaming live video content, efficiently ''; - homepage = "https://obsproject.com"; + homepage = https://obsproject.com; maintainers = with maintainers; [ jb55 MP2E ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index c9cffe3fa96d..1244421210e5 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "A point to point color terminal video chat"; - homepage = "https://github.com/mofarrell/p2pvc"; + homepage = https://github.com/mofarrell/p2pvc; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ trino ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 310ac974fca7..412cc1ad2728 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ]; meta = with stdenv.lib; { - homepage = "http://www.qstopmotion.org"; + homepage = http://www.qstopmotion.org; description = "Create stopmotion animation with a (web)camera"; longDescription = '' Qstopmotion is a tool to create stopmotion diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 4ca31916965c..72dbf87fdefe 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nixpkgs maintainer(s). If you wish to report any bugs upstream, please use the official build from shotcut.org instead. ''; - homepage = http://shotcut.org; + homepage = https://shotcut.org; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ea5af4ab1186..187f869bcfac 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete front-end for MPlayer"; - homepage = "http://smplayer.sourceforge.net/"; + homepage = http://smplayer.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index b10495434b99..67905033ba10 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple GUI screencast recorder, using ffmpeg"; - homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; + homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html; longDescription = '' vokoscreen is an easy to use screencast creator to record educational videos, live recordings of browser, installation, diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index b7f95fccda32..d85e4df7434d 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; - homepage = "https://github.com/xaverW/MediathekView/"; + homepage = https://github.com/xaverW/MediathekView/; license = licenses.gpl3; maintainers = [ maintainers.flosse ]; platforms = platforms.all; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index dfd926855790..211bd2f39e08 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, config +{ stdenv, fetchurl , pkgconfig, libtool , gtk2, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null -, termSupport ? true , ncurses ? null +, termSupport ? true, ncurses ? null , wxSupport ? true, wxGTK ? null -# Optional, undocumented dependencies , wgetSupport ? false, wget ? null , curlSupport ? false, curl ? null }: @@ -16,58 +15,17 @@ assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); +with stdenv.lib; stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r"; + sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; }; - # The huge list of configurable options - # Blatantly based on ffmpeg expressions - - termSupport = config.bochs.termSupport or true; - sdlSupport = config.bochs.sdlSupport or true; - wxSupport = config.bochs.wxSupport or false; - largefile = config.bochs.largefile or true; - idleHack = config.bochs.idleHack or true; - plugins = config.bochs.plugins or false; # Warning! Broken - a20Pin = config.bochs.a20Pin or true; - emulate64Bits = config.bochs.emulate64Bits or false; - smp = config.bochs.smp or false; - largeRamfile = config.bochs.largeRamfile or true; - repeatSpeedups = config.bochs.repeatSpeedups or false; - handlersChaining = config.bochs.handlersChaining or false; - traceLinking = config.bochs.traceLinking or false; - configurableMSRegs = config.bochs.configurableMSRegs or false; - showIPS = config.bochs.showIPS or true; - debugger = config.bochs.debugger or false; - disasm = config.bochs.disasm or false; - debuggerGui = config.bochs.debuggerGui or false; - gdbStub = config.bochs.gdbStub or false; - IODebug = config.Bochs.IODebug or false; - fpu = config.bochs.fpu or true; - svm = config.bochs.svm or false; - avx = config.bochs.avx or false; - evex = config.bochs.evex or false; - x86Debugger = config.bochs.x86Debugger or false; - pci = config.bochs.pci or true; - uhci = config.bochs.uhci or false; - ohci = config.bochs.ohci or false; - ne2k = config.bochs.ne2k or true; - pNIC = config.bochs.pNIC or true; - e1000 = config.bochs.e1000 or true; - clgd54xx = config.bochs.clgd54xx or true; - voodoo = config.bochs.voodoo or true; - cdrom = config.bochs.cdrom or true; - sb16 = config.bochs.sb16 or true; - es1370 = config.bochs.es1370 or true; - gameport = config.bochs.gameport or true; - busMouse = config.bochs.busMouse or false; - buildInputs = with stdenv.lib; [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] @@ -83,7 +41,6 @@ stdenv.mkDerivation rec { "--with-rfb=no" "--with-vncsrv=no" "--with-svga=no" # it doesn't compile on NixOS - "--with-wx=no" # These will always be "yes" on NixOS "--enable-ltdl-install=yes" @@ -100,69 +57,69 @@ stdenv.mkDerivation rec { # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation "--enable-3dnow=no" - "--enable-usb-xhci=no" "--enable-monitor-mwait=no" "--enable-raw-serial=no" ] # Boolean flags - ++ stdenv.lib.optional termSupport "--with-term" - ++ stdenv.lib.optional sdlSupport "--with-sdl2" - ++ stdenv.lib.optional wxSupport "--with-wx" - ++ stdenv.lib.optional largefile "--enable-largefile" - ++ stdenv.lib.optional idleHack "--enable-idle-hack" - ++ stdenv.lib.optional plugins "--enable-plugins" - ++ stdenv.lib.optional a20Pin "--enable-a20-pin" - ++ stdenv.lib.optional emulate64Bits "--enable-x86-64" - ++ stdenv.lib.optional smp "--enable-smp" - ++ stdenv.lib.optional largeRamfile "--enable-large-ramfile" - ++ stdenv.lib.optional repeatSpeedups "--enable-repeat-speedups" - ++ stdenv.lib.optional handlersChaining "--enable-handlers-chaining" - ++ stdenv.lib.optional traceLinking "--enable-trace-linking" - ++ stdenv.lib.optional configurableMSRegs "--enable-configurable-msrs" - ++ stdenv.lib.optional showIPS "--enable-show-ips" - ++ stdenv.lib.optional debugger "--enable-debugger" - ++ stdenv.lib.optional disasm "--enable-disasm" - ++ stdenv.lib.optional debuggerGui "--enable-debugger-gui" - ++ stdenv.lib.optional gdbStub "--enable-gdb-stub" - ++ stdenv.lib.optional IODebug "--enable-iodebug" - ++ stdenv.lib.optional fpu "--enable-fpu" - ++ stdenv.lib.optional svm "--enable-svm" - ++ stdenv.lib.optional avx "--enable-avx" - ++ stdenv.lib.optional evex "--enable-evex" - ++ stdenv.lib.optional x86Debugger "--enable-x86-debugger" - ++ stdenv.lib.optional pci "--enable-pci" - ++ stdenv.lib.optional uhci "--enable-usb" - ++ stdenv.lib.optional ohci "--enable-usb-ohci" - ++ stdenv.lib.optional ne2k "--enable-ne2000" - ++ stdenv.lib.optional pNIC "--enable-pnic" - ++ stdenv.lib.optional e1000 "--enable-e1000" - ++ stdenv.lib.optional clgd54xx "--enable-clgd54xx" - ++ stdenv.lib.optional voodoo "--enable-voodoo" - ++ stdenv.lib.optional cdrom "--enable-cdrom" - ++ stdenv.lib.optional sb16 "--enable-sb16" - ++ stdenv.lib.optional es1370 "--enable-es1370" - ++ stdenv.lib.optional busMouse "--enable-busmouse" - ; + ++ optionals termSupport [ "--with-term" ] + ++ optionals sdlSupport [ "--with-sdl2" ] + ++ optionals wxSupport [ "--with-wx" ] + # These are completely configurable, and they don't depend of external tools + ++ [ "--enable-cpu-level=6" # from 3 to 6 + "--enable-largefile" + "--enable-idle-hack" + "--enable-plugins=no" # Plugins are a bit buggy in Bochs + "--enable-a20-pin" + "--enable-x86-64" + "--enable-smp" + "--enable-large-ramfile" + "--enable-repeat-speedups" + "--enable-handlers-chaining" + "--enable-trace-linking" + "--enable-configurable-msrs" + "--enable-show-ips" + "--enable-debugger" #conflicts with gdb-stub option + "--enable-disasm" + "--enable-debugger-gui" + "--enable-gdb-stub=no" # conflicts with debugger option + "--enable-iodebug" + "--enable-fpu" + "--enable-svm" + "--enable-avx" + "--enable-evex" + "--enable-x86-debugger" + "--enable-pci" + "--enable-usb" + "--enable-usb-ohci" + "--enable-usb-ehci" + "--enable-usb-xhci" + "--enable-ne2000" + "--enable-pnic" + "--enable-e1000" + "--enable-clgd54xx" + "--enable-voodoo" + "--enable-cdrom" + "--enable-sb16" + "--enable-es1370" + "--enable-busmouse" ]; NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' - Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, - written in C++, that runs on most popular platforms. It includes - emulation of the Intel x86 CPU, common I/O devices, and a custom - BIOS. + Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written + in C++, that runs on most popular platforms. It includes emulation of the + Intel x86 CPU, common I/O devices, and a custom BIOS. ''; homepage = http://bochs.sourceforge.net/; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - -# TODO: study config.bochs.* implementation (like config.ffmpeg.* options) -# TODO: investigate the wxWidgets problem (maybe upstream devteam didn't update wxGTK GUI) -# TODO: investigate svga support - the Bochs sources explicitly cite /usr/include/svga.h +# TODO: plugins +# TODO: svga support - the Bochs sources explicitly cite /usr/include/vga.h +# TODO: a better way to organize the options diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index b7bbeb158c63..d02d78606545 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Management utility for CBFS formatted ROM images"; - homepage = http://www.coreboot.org; + homepage = https://www.coreboot.org; license = licenses.gpl2; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b811ab42ff22..e1935f39092b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -137,8 +137,8 @@ rec { echo "Generate man pages from cobra" cd ./components/cli mkdir -p ./man/man1 - go build -o /tmp/gen-manpages github.com/docker/cli/man - /tmp/gen-manpages --root . --target ./man/man1 + go build -o ./gen-manpages github.com/docker/cli/man + ./gen-manpages --root . --target ./man/man1 # Generate legacy pages from markdown echo "Generate legacy manpages" @@ -161,7 +161,7 @@ rec { ''; meta = { - homepage = http://www.docker.com/; + homepage = https://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook vdemeester ]; @@ -170,13 +170,13 @@ rec { }; docker_17_06 = dockerGen rec { - version = "17.06.0-ce"; - rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit - sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm"; - runcRev = "992a5be178a62e026f4069f443c6164912adbf09"; - runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k"; - containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a"; - containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; + version = "17.06.1-ce"; + rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit + sha256 = "08xhww2rhpyj73zgh5maycs85zpc0sm3ak8yyyd92dwgncmyi2im"; + runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; + runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; + containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429"; + containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index faa1076e2998..069d5836a42b 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Xen Subproject: Windows PV Driver"; - homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; + homepage = http://xenproject.org/downloads/windows-pv-drivers.html; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 97a1f0b3039b..1fa3e76d18fd 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows QEMU Drivers"; - homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; + homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index c4684a20914f..39ca93d4e1a8 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. ''; - homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; + homepage = http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 689d36e71101..19a28410d5c6 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ''Windows SPICE Drivers''; - homepage = "http://www.spice-space.org"; + homepage = http://www.spice-space.org; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 5cf2e0a30622..f7a2f6e6f308 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows VirtIO Drivers"; - homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; + homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d1bf5792a1b4..b790a15e607f 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-06-27"; - rev = "0d91d102b046eec535a6d67df9829b80b24e9ce9"; + name = "lkl-2017-08-09"; + rev = "083cdeece0577635d523244dcf0da86074e23e4e"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas"; + sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 4c0e0f11e7b3..14aaef5709a9 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/vmware/open-vm-tools"; + homepage = https://github.com/vmware/open-vm-tools; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d09926da7cdb..5da9db918557 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,10 +55,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ ./no-etc-install.patch ] - ++ optional nixosTestRunner ./force-uid0-on-9p.patch; + ++ optional nixosTestRunner ./force-uid0-on-9p.patch + ++ optional pulseSupport ./fix-hda-recording.patch; hardeningDisable = [ "stackprotector" ]; + preConfigure = '' + unset CPP # intereferes with dependency calculation + ''; + configureFlags = [ "--smbd=smbd" # use `smbd' from $PATH "--audio-drv-list=${audio}" diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch new file mode 100644 index 000000000000..b4e21f4f3477 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch @@ -0,0 +1,34 @@ +diff --git a/audio/paaudio.c b/audio/paaudio.c +index fea6071..c1169d4 100644 +--- a/audio/paaudio.c ++++ b/audio/paaudio.c +@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) + { + int error; + pa_sample_spec ss; ++ pa_buffer_attr ba; + struct audsettings obt_as = *as; + PAVoiceIn *pa = (PAVoiceIn *) hw; + paaudio *g = pa->g = drv_opaque; +@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) + ss.channels = as->nchannels; + ss.rate = as->freq; + ++ ba.fragsize = pa_frame_size (&ss) * g->conf.samples; ++ ba.maxlength = 5 * ba.fragsize; ++ ba.tlength = -1; ++ ba.prebuf = -1; ++ ba.minreq = -1; ++ + obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); + + pa->stream = qpa_simple_new ( +@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) + g->conf.source, + &ss, + NULL, /* channel map */ +- NULL, /* buffering attributes */ ++ &ba, /* buffering attributes */ + &error + ); + if (!pa->stream) { diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix index 5980141d8b9c..57aa6809d6c1 100644 --- a/pkgs/applications/virtualization/rancher-compose/default.nix +++ b/pkgs/applications/virtualization/rancher-compose/default.nix @@ -22,7 +22,7 @@ let meta = with lib; { description = "Docker compose compatible client to deploy to Rancher"; - homepage = "https://docs.rancher.com/rancher/rancher-compose/"; + homepage = https://docs.rancher.com/rancher/rancher-compose/; license = licenses.asl20; platforms = platforms.unix; maintainers = [maintainers.mic92]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index bca2e558b387..a23537847a19 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.27.0"; + version = "1.28.1"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2"; + sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index dad16ffb0f08..13dbf544c927 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.1"; + version = "1.4.2"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; + sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"; }; nativeBuildInputs = [ wrapGAppsHook intltool file ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6675068bda97..fbc0cc5ded0f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,11 @@ with stdenv.lib; let python = python2; buildType = "release"; - extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf"; - extpackRev = "115126"; - main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899"; - version = "5.1.22"; + # Manually sha256sum the extensionPack file, must be hex! + extpack = "14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721"; + extpackRev = "117224"; + main = "1af8h3d3sdpcxcp5g75qfq10z81l7m8gk0sz8zqix8c1wqsm0wdm"; + version = "5.1.26"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -88,7 +89,7 @@ in stdenv.mkDerivation { ''; patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ./linux-4.12.patch ]; + ++ [ ./qtx11extras.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 8865022c23e4..eb2e1ebf4a7a 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 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380"; + sha256 = "0vxhavlh55fdlm4zhvi21fyxzdydbn56y499bq5aghvsdsmwiy3d"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -62,9 +62,6 @@ stdenv.mkDerivation { for i in * do cd $i - # Files within the guest additions ISO are using DOS line endings - sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \ - | patch -d vboxguest -p4 find . -type f | xargs sed 's/depmod -a/true/' -i make cd .. diff --git a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch deleted file mode 100644 index 7157365466f9..000000000000 --- a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch +++ /dev/null @@ -1,80 +0,0 @@ -commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb -Author: vboxsync -Date: Wed May 17 09:42:23 2017 +0000 - - Runtime/r0drv: Linux 4.12 5-level page table adaptions - - - git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f - -diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -index 28dc33f963..41ed058860 100644 ---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - union - { - pgd_t Global; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ p4d_t Four; -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - pud_t Upper; - #endif -@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - u.Global = *pgd_offset(current->active_mm, ulAddr); - if (RT_UNLIKELY(pgd_none(u.Global))) - return NULL; -- --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ u.Four = *p4d_offset(&u.Global, ulAddr); -+ if (RT_UNLIKELY(p4d_none(u.Four))) -+ return NULL; -+ if (p4d_large(u.Four)) -+ { -+ pPage = p4d_page(u.Four); -+ AssertReturn(pPage, NULL); -+ pfn = page_to_pfn(pPage); /* doing the safe way... */ -+ AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31); -+ pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1); -+ return pfn_to_page(pfn); -+ } -+ u.Upper = *pud_offset(&u.Four, ulAddr); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - u.Upper = *pud_offset(&u.Global, ulAddr); -+#endif - if (RT_UNLIKELY(pud_none(u.Upper))) - return NULL; --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) - if (pud_large(u.Upper)) - { - pPage = pud_page(u.Upper); -@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) - pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1); - return pfn_to_page(pfn); - } --# endif -- -+#endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - u.Middle = *pmd_offset(&u.Upper, ulAddr); - #else /* < 2.6.11 */ - u.Middle = *pmd_offset(&u.Global, ulAddr); -diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -index 5afdee9e71..20aab0817f 100644 ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -159,6 +159,11 @@ - # include - #endif - -+/* for set_pages_x() */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+# include -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - # include - #else diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index f6205f5c467a..3429545557ad 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -53,7 +53,7 @@ callPackage (import ./generic.nix (rec { patches = [ (xsaPatch { name = "216-qemuu"; - sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1"; + sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn"; }) ]; meta.description = "Xen's fork of upstream Qemu"; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c519784a6233..2a685c590fa8 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Lightweight Virtualization on OS X Based on bhyve"; - homepage = "https://github.com/mist64/xhyve"; + description = "Lightweight Virtualization on macOS Based on bhyve"; + homepage = https://github.com/mist64/xhyve; maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 50c342269c71..116180f5ec36 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out PREFIX=\"\""; meta = with stdenv.lib; { - homepage = "https://github.com/venam/2bwm"; + homepage = https://github.com/venam/2bwm; description = "A fast floating WM written over the XCB library and derived from mcwm"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 6f56ff98998f..a441de5ed19f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm @@ -9,13 +9,13 @@ with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "awesomewm"; repo = "awesome"; rev = "v${version}"; - sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj"; + sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff"; }; nativeBuildInputs = [ @@ -38,13 +38,6 @@ with luaPackages; stdenv.mkDerivation rec { xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ]; - patches = [ - (fetchurl { - url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch"; - sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj"; - }) - ]; - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 8798d2b38329..16c624b09ccf 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -1,30 +1,27 @@ -{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, libxcb, libXinerama +, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm +}: stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.2"; + version = "0.9.3"; - - src = fetchurl { - url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz"; - sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k"; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "bspwm"; + rev = version; + sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; - buildPhase = '' - make PREFIX=$out - ''; + makeFlags = [ "PREFIX=$(out)" ]; - installPhase = '' - make PREFIX=$out install - ''; - - meta = { + meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; - homepage = http://github.com/baskerville/bspwm; - maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ]; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/baskerville/bspwm; + maintainers = with maintainers; [ meisternu epitrochoid ]; + license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 240bc19dd453..412cdf91e0bf 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "Compoziting window manager"; - homepage = "http://launchpad.net/compiz/"; + homepage = https://launchpad.net/compiz/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 8388e3870753..17baffbe8c73 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/chjj/compton/"; + homepage = https://github.com/chjj/compton/; description = "A fork of XCompMgr, a sample compositing manager for X servers"; longDescription = '' A fork of XCompMgr, which is a sample compositing manager for X diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index c2f9bec33c21..9f6c89375182 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 = http://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/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 27f80023bb37..56ae70dce086 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit patches; meta = with stdenv.lib; { - homepage = "http://www.6809.org.uk/evilwm/"; + homepage = http://www.6809.org.uk/evilwm/; description = "Minimalist window manager for the X Window System"; license = { diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 75df68427aab..7587dcb490ae 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional gestures libstroke; meta = { - homepage = "http://fvwm.org"; + homepage = http://fvwm.org; description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 024c9e5c796e..3bf089f83545 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; - homepage = "http://herbstluftwm.org/"; + homepage = http://herbstluftwm.org/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index ade6182ec7b0..fd47a104326e 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A simple screen locker like slock"; - homepage = http://i3wm.org/i3lock/; + homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 9d7b45025654..a979797d0801 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple screen locker like slock"; - homepage = http://i3wm.org/i3lock/; + homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn domenkozar ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 40050a690252..83c4e6828e1d 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 = "1594"; + version = "1621"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2"; + sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = "http://joewing.net/projects/jwm/"; + homepage = http://joewing.net/projects/jwm/; description = "Joe's Window Manager is a light-weight X11 window manager"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index fec3ae631328..ced8e2e0b9d5 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; - outputs = [ "out" "contrib" "doc" "info" ]; + outputs = [ "out" "contrib" "man" "doc" "info" ]; configureFlags = [ # >=1.4.9 requires this even with readline in inputs @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.nongnu.org/ratpoison/"; + homepage = http://www.nongnu.org/ratpoison/; description = "Simple mouse-free tiling window manager"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 0f362e02ebf1..37596f5f212b 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do wrapProgram $i \ - --prefix REP_DL_LOAD_PATH "$out/lib/rep" \ - --set REP_LOAD_PATH "$out/share/sawfish/lisp" + --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ + --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index f392945b36dd..ac725733d647 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap -, xwayland +, xwayland, pam, gdk_pixbuf }: let - version = "0.12.2"; + version = "0.13.0"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -14,18 +14,19 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; + sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; ''; makeFlags = "PREFIX=$(out)"; + cmakeFlags = "-DVERSION=${version}"; installPhase = "PREFIX=$out make install"; LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index b78b15f7914c..41a50668f19b 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X hotkey daemon"; - homepage = http://github.com/baskerville/sxhkd/; + homepage = https://github.com/baskerville/sxhkd/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 146bd7e1438b..79c73d80789f 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://github.com/sargon/trayer-srg; + homepage = https://github.com/sargon/trayer-srg; license = licenses.mit; description = "A lightweight GTK2-based systray for UNIX desktop"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix index 11e5460fecbc..0102fb05d8ee 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Alsa mixer application for Windowmaker"; - homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; + homepage = http://windowmaker.org/dockapps/?name=AlsaMixer.app; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index 6fe49745fa76..e211abe0ea54 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "System monitor for Windowmaker"; - homepage = "http://linux-bsd-unix.strefa.pl"; + homepage = http://linux-bsd-unix.strefa.pl; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index e7994eaf05f7..80a24635f67c 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Systemtray for Windowmaker"; - homepage = "http://wmsystemtray.sourceforge.net"; + homepage = http://wmsystemtray.sourceforge.net; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 0ca38b9b04e0..bea7c99a5112 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeFlags = "WMII_HGVERSION=hg${rev}"; meta = { - homepage = "https://code.google.com/archive/p/wmii/"; + homepage = https://code.google.com/archive/p/wmii/; description = "A small window manager controlled by a 9P filesystem"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index b09dfebfd127..906ba0efda24 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch ]; meta = with stdenv.lib; { - homepage = "http://github.com/alexkay/xmonad-log-applet"; + homepage = https://github.com/alexkay/xmonad-log-applet; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 11f672acb9ff..833aab16ceb1 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -16,6 +16,7 @@ mounts = { '/' => 'host', # Propagate environment variables envvars = [ 'TERM', 'DISPLAY', + 'XAUTHORITY', 'HOME', 'XDG_RUNTIME_DIR', 'LANG', diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 5634c82aa285..4d28ba08d103 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -1,28 +1,88 @@ +# N.B. It may be a surprise that the derivation-specific variables are exported, +# since this is just sourced by the wrapped binaries---the end consumers. This +# is because one wrapper binary may invoke another (e.g. cc invoking ld). In +# 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=( + NIX_CC_WRAPPER+START_HOOK + NIX_CC_WRAPPER+EXEC_HOOK + NIX_LD_WRAPPER+START_HOOK + NIX_LD_WRAPPER+EXEC_HOOK + + 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+LDFLAGS_HARDEN + + NIX+SET_BUILD_ID + NIX+DONT_SET_RPATH + NIX+ENFORCE_NO_NATIVE +) + +# Accumulate infixes for taking in the right input parameters. See setup-hook +# for details. +declare -a role_infixes=() +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then + role_infixes+=(_BUILD_) +fi +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then + role_infixes+=(_) +fi +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then + role_infixes+=(_TARGET_) +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 +done + # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. -export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" +NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE" + +# Export and assign separately in order that a failing $(..) will fail +# the script. if [ -e @out@/nix-support/libc-cflags ]; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" + NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi if [ -e @out@/nix-support/cc-cflags ]; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" + NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi if [ -e @out@/nix-support/gnat-cflags ]; then - export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" + NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" fi if [ -e @out@/nix-support/libc-ldflags ]; then - export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)" + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" fi if [ -e @out@/nix-support/cc-ldflags ]; then - export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)" + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi if [ -e @out@/nix-support/libc-ldflags-before ]; then - export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" + NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" fi -export NIX_CC_WRAPPER_FLAGS_SET=1 +# 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 b98833b3513b..aa8eb720486c 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,53 +1,69 @@ hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow) -hardeningFlags+=("${hardeningEnable[@]}") +# 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 hardeningCFlags=() hardeningLDFlags=() -hardeningDisable=${hardeningDisable:-""} -hardeningDisable+=" @hardening_unsupported_flags@" +declare -A hardeningDisableMap -if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: Value of '$hardeningDisable': $hardeningDisable >&2; fi +# 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 [[ ! $hardeningDisable =~ "all" ]]; then - if [[ -n "$NIX_DEBUG" ]]; then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi +if [[ -n "${NIX_DEBUG:-}" ]]; then + printf 'HARDENING: disabled flags:' >&2 + (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 + echo >&2 +fi + +if [[ -z "${hardeningDisableMap[all]:-}" ]]; then + if [[ -n "${NIX_DEBUG:-}" ]]; then + echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; + fi for flag in "${hardeningFlags[@]}" do - if [[ ! "${hardeningDisable}" =~ "$flag" ]]; then + if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then case $flag in fortify) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling fortify >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') ;; stackprotector) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackprotector >&2; fi - hardeningCFlags+=('-fstack-protector-strong' '--param ssp-buffer-size=4') + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi + hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi hardeningCFlags+=('-fPIE') if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningLDFlags+=('-pie') fi ;; pic) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling pic >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi hardeningCFlags+=('-fPIC') ;; strictoverflow) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling strictoverflow >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi hardeningCFlags+=('-fno-strict-overflow') ;; format) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling format >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; relro) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling relro >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi hardeningLDFlags+=('-z' 'relro') ;; bindnow) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; *) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 3ccdc34db5b2..1c654ea47567 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,17 +1,24 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi -if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then - source "$NIX_CC_WRAPPER_START_HOOK" -fi - -if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then + source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" +fi + source @out@/nix-support/utils.sh @@ -19,16 +26,17 @@ source @out@/nix-support/utils.sh # For instance, figure out if linker flags should be passed. # GCC prints annoying warnings when they are not needed. dontLink=0 -getVersion=0 nonFlagArgs=0 +# shellcheck disable=SC2193 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 expandResponseParams "$@" -n=0 -while [ $n -lt ${#params[*]} ]; do +declare -i n=0 +nParams=${#params[@]} +while (( "$n" < "$nParams" )); do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "$p" = -c ]; then dontLink=1 elif [ "$p" = -S ]; then @@ -55,10 +63,10 @@ while [ $n -lt ${#params[*]} ]; do nonFlagArgs=1 elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" fi fi - n=$((n + 1)) + n+=1 done # If we pass a flag like -Wl, then gcc will call the linker unless it @@ -71,77 +79,80 @@ if [ "$nonFlagArgs" = 0 ]; then fi # Optionally filter out paths not refering to the store. -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -L ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -I ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -isystem ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" else rest+=("$p") fi - n=$((n + 1)) + n+=1 done - params=("${rest[@]}") + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then rest=() - for i in "${params[@]}"; do - if [[ "$i" = -m*=native ]]; then - skip $i + # Old bash empty array hack + for p in ${params+"${params[@]}"}; do + if [[ "$p" = -m*=native ]]; then + skip "$p" else - rest+=("$i") + rest+=("$p") fi done - params=("${rest[@]}") + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" fi - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" + NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" fi -LD=@ldPath@/ld source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_CFLAGS_COMPILE ${hardeningCFlags[@]}) +extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}") extraBefore=() if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter+=($NIX_CFLAGS_LINK ${hardeningLDFlags[@]}) + extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK "${hardeningLDFlags[@]}") # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") + # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). + for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do + extraBefore+=("-Wl,$i") done - for i in $NIX_LDFLAGS; do + for i in $NIX_@infixSalt@_LDFLAGS; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") else extraAfter+=("-Wl,$i") fi done - export NIX_LDFLAGS_SET=1 + export NIX_@infixSalt@_LDFLAGS_SET=1 fi # As a very special hack, if the arguments are just `-v', then don't @@ -154,24 +165,23 @@ if [ "$*" = -v ]; then fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 fi -if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_CC_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then + source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 676fbd006881..b3971808a2b4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -8,10 +8,9 @@ { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" -, dyld ? null # TODO: should this be a setup-hook on dyld? , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null -, buildPackages ? {}, hostPlatform, targetPlatform -, runCommand ? null +, buildPackages ? {} +, useMacosReexportHack ? false }: with stdenv.lib; @@ -52,75 +51,28 @@ let "-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; - # TODO(@Ericson2314) Make unconditional - infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget; - infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_"); - _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget); - # We want to prefix all NIX_ flags with the target triple - preWrap = textFile: - # TODO: Do even when not cross on next mass-rebuild - # TODO: use @target_tripple@ for consistency - if targetPlatform == hostPlatform - then textFile - else runCommand "sed-nix-env-vars" {} ('' - cp --no-preserve=mode ${textFile} $out + # The "infix salt" is a arbitrary string added in the middle of env vars + # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used + # without interfering. For the moment, it is defined as the target triple, + # adjusted to be a valid bash identifier. This should be considered an + # unstable implementation detail, however. + infixSalt = dashlessTarget; - sed -i $out \ - -e 's^NIX_^NIX_${infixSalt_}^g' \ - -e 's^addCVars^addCVars${_infixSalt}^g' \ - -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g' - - '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) '' - cat << 'EOF' >> $out - for CMD in ar as nm objcopy ranlib strip strings size ld windres - do - # which is not part of stdenv, but compgen will do for now - if - PATH=$_PATH type -p ${prefix}$CMD > /dev/null - then - export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD}; - fi - done - EOF - - sed -i $out -e 's_envHooks_crossEnvHooks_g' - '' + '' - - # NIX_ things which we don't both use and define, we revert them - #asymmetric=$( - # for pre in "" "\\$" - # do - # grep -E -ho $pre'NIX_[a-zA-Z_]*' ./* | sed 's/\$//' | sort | uniq - # done | sort | uniq -c | sort -nr | sed -n 's/^1 NIX_//gp') - - # hard-code for now - asymmetric=("CXXSTDLIB_COMPILE" "CC") - - # The ([^a-zA-Z_]|$) bussiness is to ensure environment variables that - # begin with `NIX_CC` don't also get blacklisted. - for var in "''${asymmetric[@]}" - do - sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g" - done - ''); - - # The dynamic linker has different names on different platforms. + # The dynamic linker has different names on different platforms. This is a + # shell glob that ought to match it. 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.isArm32 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) - else ""; + /**/ 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 targetPlatform.isArm32 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.system == "x86_64-darwin" 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 buildPackages.stdenv.mkDerivation { @@ -130,6 +82,8 @@ let # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c" cp "$src" expand-response-params.c "$CC" -std=c99 -O3 -o "$out" expand-response-params.c + strip -S $out + ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"} ''; } else ""; @@ -145,26 +99,30 @@ stdenv.mkDerivation { inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; + binPrefix = prefix; + inherit infixSalt; + + outputs = [ "out" "man" ]; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile - prefix infixSalt infixSalt_ _infixSalt; + prefix; 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"))) + (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"))) + (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)})) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; buildCommand = '' - mkdir -p $out/bin $out/nix-support + mkdir -p $out/bin $out/nix-support $man/nix-support wrap() { local dst="$1" @@ -175,39 +133,39 @@ stdenv.mkDerivation { } '' - # TODO(@Ericson2314): Unify logic next hash break - + optionalString (libc != null) (if (targetPlatform.isDarwin) then '' - echo $dynamicLinker > $out/nix-support/dynamic-linker - - echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook - '' else if dynamicLinker != null then '' - dynamicLinker="${libc_lib}/lib/$dynamicLinker" - echo $dynamicLinker > $out/nix-support/dynamic-linker - - 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 + + optionalString (libc != null) ('' + if [[ -z ''${dynamicLinker+x} ]]; then + echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 + dynamicLinker="${libc_lib}/lib/ld*.so.?" 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). - echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before - '' else '' - dynamicLinker=`eval 'echo $libc/lib/ld*.so.?'` + # 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 - ldflagsBefore="-dynamic-linker $dlinker" + 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). - echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') + optionalString (libc != null) '' @@ -275,16 +233,17 @@ 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). - echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + 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 - echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs + printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" exec="$ldPath/${prefix}ld" - wrap ld-solaris ${preWrap ./ld-solaris-wrapper.sh} + wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + '' @@ -295,64 +254,75 @@ stdenv.mkDerivation { ln -s $ldPath/${prefix}as $out/bin/${prefix}as fi - wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' + (if !useMacosReexportHack then '' + wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' else '' + ldInner="${prefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} + wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then - wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold + wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold fi if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd + wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi - export real_cc=${prefix}cc - export real_cxx=${prefix}c++ + # We export environment variables pointing to the wrapped nonstandard + # cmds, lest some lousy configure script use those to guess compiler + # version. + export named_cc=${prefix}cc + export named_cxx=${prefix}c++ + export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" if [ -e $ccPath/${prefix}gcc ]; then - wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc + wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc ln -s ${prefix}gcc $out/bin/${prefix}cc - export real_cc=${prefix}gcc - export real_cxx=${prefix}g++ + export named_cc=${prefix}gcc + export named_cxx=${prefix}g++ elif [ -e $ccPath/clang ]; then - wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang + wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang ln -s ${prefix}clang $out/bin/${prefix}cc - export real_cc=clang - export real_cxx=clang++ + export named_cc=${prefix}clang + export named_cxx=${prefix}clang++ fi if [ -e $ccPath/${prefix}g++ ]; then - wrap ${prefix}g++ ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}g++ + wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++ ln -s ${prefix}g++ $out/bin/${prefix}c++ elif [ -e $ccPath/clang++ ]; then - wrap ${prefix}clang++ ${preWrap ./cc-wrapper.sh} $ccPath/clang++ + wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ ln -s ${prefix}clang++ $out/bin/${prefix}c++ fi if [ -e $ccPath/cpp ]; then - wrap ${prefix}cpp ${preWrap ./cc-wrapper.sh} $ccPath/cpp + wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp fi '' + optionalString cc.langFortran or false '' - wrap ${prefix}gfortran ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gfortran + wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran ln -sv ${prefix}gfortran $out/bin/${prefix}g77 ln -sv ${prefix}gfortran $out/bin/${prefix}f77 '' + optionalString cc.langJava or false '' - wrap ${prefix}gcj ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcj + wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj '' + optionalString cc.langGo or false '' - wrap ${prefix}gccgo ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gccgo + wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo '' + optionalString cc.langAda or false '' - wrap ${prefix}gnatgcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gnatgcc - wrap ${prefix}gnatmake ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatmake - wrap ${prefix}gnatbind ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatbind - wrap ${prefix}gnatlink ${preWrap ./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink + wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc + wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake + wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind + wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink '' + optionalString cc.langVhdl or false '' @@ -360,7 +330,7 @@ stdenv.mkDerivation { '' + '' - substituteAll ${preWrap ./setup-hook.sh} $out/nix-support/setup-hook.tmp + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook rm $out/nix-support/setup-hook.tmp @@ -379,9 +349,9 @@ stdenv.mkDerivation { '' + '' - substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${preWrap ./utils.sh} $out/nix-support/utils.sh + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh + substituteAll ${./utils.sh} $out/nix-support/utils.sh '' + extraBuildCommands; @@ -399,5 +369,7 @@ 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 0d74527dd8ad..1a09f4841098 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,24 +1,32 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + +# N.B. Gnat is not used during bootstrapping, so we don't need to +# worry about the old bash empty array `set -u` workarounds. + path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" + PATH="@coreutils_bin@/bin" fi -if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_START_HOOK" -fi - -if [ -z "$NIX_GNAT_WRAPPER_FLAGS_SET" ]; then +if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" +fi + source @out@/nix-support/utils.sh # Figure out if linker flags should be passed. GCC prints annoying # warnings when they are not needed. dontLink=0 -getVersion=0 nonFlagArgs=0 for i in "$@"; do @@ -30,7 +38,7 @@ for i in "$@"; do nonFlagArgs=1 elif [ "$i" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" fi fi done @@ -47,37 +55,33 @@ fi # Optionally filter out paths not refering to the store. params=("$@") -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do - p=${params[n]} - p2=${params[$((n+1))]} + for p in "${params[@]}"; do if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then - skip $p + skip "${p:2}" elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then - skip $p + skip "${p:2}" else rest+=("$p") fi - n=$((n + 1)) done params=("${rest[@]}") fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then rest=() - for i in "${params[@]}"; do - if [[ "$i" = -m*=native ]]; then - skip $i + for p in "${params[@]}"; do + if [[ "$p" = -m*=native ]]; then + skip "$p" else - rest+=("$i") + rest+=("$p") fi done params=("${rest[@]}") @@ -85,38 +89,42 @@ fi # Add the flags for the GNAT compiler proper. -extraAfter=($NIX_GNATFLAGS_COMPILE) +extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) extraBefore=() -if [ "`basename $0`x" = "gnatmakex" ]; then - extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ") +if [ "$(basename "$0")x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ") fi -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") -#done +#if [ "$dontLink" != 1 ]; then +# # Add the flags that should be passed to the linker (and prevent +# # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). +# for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do +# extraBefore+=("-largs" "$i") +# done +# for i in $NIX_@infixSalt@_LDFLAGS; do +# if [ "${i:0:3}" = -L/ ]; then +# extraAfter+=("$i") +# else +# extraAfter+=("-largs" "$i") +# fi +# done +# export NIX_@infixSalt@_LDFLAGS_SET=1 +#fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "${params[@]}" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index c9958dbbb413..ee973d3270f9 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -1,33 +1,40 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + +# N.B. Gnat is not used during bootstrapping, so we don't need to +# worry about the old bash empty array `set -u` workarounds. # Add the flags for the GNAT compiler proper. -extraAfter="--GCC=@out@/bin/gcc" +extraAfter=("--GCC=@out@/bin/gcc") extraBefore=() -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") +## Add the flags that should be passed to the linker (and prevent +## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). +#for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do +# extraBefore+=("-largs" "$i") #done +#for i in $NIX_@infixSalt@_LDFLAGS; do +# if [ "${i:0:3}" = -L/ ]; then +# extraAfter+=("$i") +# else +# extraAfter+=("-largs" "$i") +# fi +#done +#export NIX_@infixSalt@_LDFLAGS_SET=1 # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "$@"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "$@" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" fi -exec @prog@ ${extraBefore[@]} "$@" ${extraAfter[@]} +exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 263ea5408e9a..72c999ff8bc8 100755 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -1,40 +1,25 @@ #!@shell@ +set -eu -o pipefail +shopt -s nullglob -set -e -set -u - +declare -a args=("$@") # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@ld@ -z ignore" - -args=("$@"); +declare -a argsBefore=(-z ignore) argsAfter=() # This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. # GNU binutils does not have this problem: # http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter -i=0; -while [[ $i -lt $# ]]; do +while (( $# )); do case "${args[$i]}" in - -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; - -L*) cmd="$cmd ${args[$i]}" ;; - *) ;; + -L) argsBefore+=("$1" "$2"); shift ;; + -L?*) argsBefore+=("$1") ;; + *) argsAfter+=("$1") ;; esac - i=($i+1); -done - -i=0; -while [[ $i -lt $# ]]; do - case "${args[$i]}" in - -L) i=($i+1); ;; - -L*) ;; - *) cmd="$cmd ${args[$i]}" ;; - esac - i=($i+1); + shift done # Trace: set -x -exec $cmd - -exit 0 +exec "@ld@" "${argsBefore[@]}" "${argsAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 056cfa920535..d5fdc837cf5f 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,37 +1,44 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" + PATH="@coreutils_bin@/bin" fi -if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then - source "$NIX_LD_WRAPPER_START_HOOK" -fi - -if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then + source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" +fi + source @out@/nix-support/utils.sh # Optionally filter out paths not refering to the store. expandResponseParams "$@" -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" + && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -L ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -rpath ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "${p:0:1}" = / ] && badPath "$p"; then # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 @@ -40,149 +47,132 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ # Our ld is not built with sysroot support (Can we fix that?) : else - rest=("${rest[@]}" "$p") + rest+=("$p") fi - n=$((n + 1)) + n+=1 done - params=("${rest[@]}") + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) fi -LD=@prog@ source @out@/nix-support/add-hardening.sh -extra=(${hardeningLDFlags[@]}) +extraAfter=("${hardeningLDFlags[@]}") extraBefore=() -if [ -z "$NIX_LDFLAGS_SET" ]; then - extra+=($NIX_LDFLAGS) - extraBefore+=($NIX_LDFLAGS_BEFORE) +if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then + extraAfter+=($NIX_@infixSalt@_LDFLAGS) + extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) fi -extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN) +extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN) + +declare -a libDirs +declare -A libs +relocatable= + +# Find all -L... switches for rpath, and relocatable flags for build id. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then + prev= + # Old bash thinks empty arrays are undefined, ugh. + for p in \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} + do + case "$prev" in + -L) + libDirs+=("$p") + ;; + -l) + libs["lib${p}.so"]=1 + ;; + -dynamic-linker | -plugin) + # Ignore this argument, or it will match *.so and be added to rpath. + ;; + *) + case "$p" in + -L/*) + libDirs+=("${p:2}") + ;; + -l?*) + libs["lib${p:2}.so"]=1 + ;; + "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) + # This is a direct reference to a shared library. + libDirs+=("${p%/*}") + libs["${p##*/}"]=1 + ;; + -r | --relocatable | -i) + relocatable=1 + esac + ;; + esac + prev="$p" + done +fi # Add all used dynamic libraries to the rpath. -if [ "$NIX_DONT_SET_RPATH" != 1 ]; then - - libPath="" - addToLibPath() { - local path="$1" - if [ "${path:0:1}" != / ]; then return 0; fi - case "$path" in - *..*|*./*|*/.*|*//*) - local path2 - if path2=$(readlink -f "$path"); then - path="$path2" - fi - ;; - esac - case $libPath in - *\ $path\ *) return 0 ;; - esac - libPath="$libPath $path " - } - - addToRPath() { - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi - case $rpath in - *\ $1\ *) return 0 ;; - esac - rpath="$rpath $1 " - } - - libs="" - addToLibs() { - libs="$libs $1" - } - - rpath="" - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - n=0 - while [ $n -lt ${#allParams[*]} ]; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if [ "${p:0:3}" = -L/ ]; then - addToLibPath ${p:2} - elif [ "$p" = -L ]; then - addToLibPath ${p2} - n=$((n + 1)) - elif [ "$p" = -l ]; then - addToLibs ${p2} - n=$((n + 1)) - elif [ "${p:0:2}" = -l ]; then - addToLibs ${p:2} - elif [ "$p" = -dynamic-linker ]; then - # Ignore the dynamic linker argument, or it - # will get into the next 'elif'. We don't want - # the dynamic linker path rpath to go always first. - n=$((n + 1)) - elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then - # This is a direct reference to a shared library, so add - # its directory to the rpath. - path="$(dirname "$p")"; - addToRPath "${path}" - fi - n=$((n + 1)) - done - - # Second, for each directory in the library search path (-L...), +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then + # For each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. # It's important to add the rpath in the order of -L..., so # the link time chosen objects will be those of runtime linking. - - for i in $libPath; do - for j in $libs; do - if [ -f "$i/lib$j.so" ]; then - addToRPath $i + declare -A rpaths + for dir in "${libDirs[@]}"; do + if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then + dir="$dir2" + fi + if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + continue + fi + for path in "$dir"/*; do + file="${path##*/}" + if [ "${libs[$file]:-}" ]; then + # This library may have been provided by a previous directory, + # but if that library file is inside an output of the current + # derivation, it can be deleted after this compilation and + # should be found in a later directory, so we add all + # directories that contain any of the libraries to rpath. + rpaths["$dir"]=1 + extraAfter+=(-rpath "$dir") break fi done done - - - # Finally, add `-rpath' switches. - for i in $rpath; do - extra+=(-rpath $i) - done fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? -if [ "$NIX_SET_BUILD_ID" = 1 ]; then - for p in "${params[@]}"; do - if [ "$p" = "-r" -o "$p" = "--relocatable" -o "$p" = "-i" ]; then - relocatable=1 - break - fi - done - if [ -z "$relocatable" ]; then - extra+=(--build-id) - fi +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then + extraAfter+=(--build-id) fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extra flags to @prog@:" >&2 - for i in ${extra[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + # Old bash workaround, see above. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 fi -if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_LD_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then + source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]} +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash new file mode 100644 index 000000000000..b7aa7ea5c092 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -0,0 +1,106 @@ +#! @shell@ + +set -eu -o pipefail + +path_backup="$PATH" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +declare -r recurThreshold=300 + +declare overflowCount=0 +for ((n=0; n < $#; ++n)); do + case "${!n}" in + -l*) let overflowCount+=1 ;; + -reexport-l*) let overflowCount+=1 ;; + *) ;; + esac +done + +declare -a allArgs=() + +if (( "$overflowCount" <= "$recurThreshold" )); then + allArgs=("$@") +else + declare -a childrenLookup=() childrenLink=() + + while (( $# )); do + case "$1" in + -L/*) + childrenLookup+=("$1") + allArgs+=("$1") + ;; + -L) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -l) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -lazy_framework | -lto_library) + # We aren't linking any "azy_library", "to_library", etc. + allArgs+=("$1") + ;; + -lazy-l | -weak-l) allArgs+=("$1") ;; + # We can't so easily prevent header issues from these. + -lSystem) allArgs+=("$1") ;; + # Special case as indirection seems like a bad idea for something + # so fundamental. Can be removed for simplicity. + -l?* | -reexport-l?*) childrenLink+=("$1") ;; + *) allArgs+=("$1") ;; + esac + + shift + done + + declare n=0 + while (( $n < "${#childrenLink[@]}" )); do + if [[ "${childrenLink[n]}" = -l* ]]; then + childrenLink[n]="-reexport${childrenLink[n]}" + fi + let ++n + done + unset n + + declare -r outputNameLibless=$(basename $( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + elif [[ "${outputName:0:3}" = lib ]]; then + echo "${outputName:3}" + else + echo "${outputName}" + fi)) + declare -ra children=("$outputNameLibless-reexport-delegate-0" \ + "$outputNameLibless-reexport-delegate-1") + + mkdir -p "$out/lib" + + PATH="$PATH:@out@/bin" + + symbolBloatObject=$outputNameLibless-symbol-hack.o + if [[ ! -e $symbolBloatObject ]]; then + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ + | @binPrefix@as -- -o $symbolBloatObject + fi + + # first half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" + + # second half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" + + allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +fi + +PATH="$path_backup" +exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index f4f7ab181d3e..e43c1609edb1 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -1,47 +1,152 @@ -export NIX_CC=@out@ +# CC Wrapper hygiene +# +# For at least cross compilation, we need to depend on multiple cc-wrappers at +# once---specifically up to one per sort of dependency. This follows from having +# different tools targeting different platforms, and different flags for those +# tools. For example: +# +# # Flags for compiling (whether or not linking) C code for the... +# NIX_BUILD_CFLAGS_COMPILE # ...build platform +# NIX_CFLAGS_COMPILE # ...host platform +# NIX_TARGET_CFLAGS_COMPILE # ...target platform +# +# Notice that these platforms are the 3 *relative* to the package using +# cc-wrapper, not absolute like `x86_64-pc-linux-gnu`. +# +# The simplest solution would be to have separate cc-wrappers per (3 intended +# use-cases * n absolute concrete platforms). For the use-case axis, we would +# @-splice in 'BUILD_' '' 'TARGET_' to use the write environment variables when +# building the cc-wrapper, and likewise prefix the binaries' names so they didn't +# clobber each other on the PATH. But the need for 3x cc-wrappers, along with +# non-standard name prefixes, is annoying and liable to break packages' build +# systems. +# +# Instead, we opt to have just one cc-wrapper per absolute platform. Matching +# convention, the binaries' names can just be prefixed with their target +# platform. On the other hand, that means packages will depend on not just +# multiple cc-wrappers, but the exact same cc-wrapper derivation multiple ways. +# That means the exact same cc-wrapper derivation must be able to avoid +# conflicting with itself, despite the fact that `setup-hook.sh`, the `addCvars` +# function, and `add-flags.sh` are all communicating with each other with +# environment variables. Yuck. +# +# The basic strategy is: +# +# - Everyone exclusively *adds information* to relative-platform-specific +# environment variables, like `NIX_TARGET_CFLAGS_COMPILE`, to communicate +# with the wrapped binaries. +# +# - The wrapped binaries will exclusively *read* cc-wrapper-derivation-specific +# environment variables distinguished with with `infixSalt`, like +# `NIX_@infixSalt@_CFLAGS_COMPILE`. +# +# - `add-flags`, beyond its old task of reading extra flags stuck inside the +# cc-wrapper derivation, will convert the relative-platform-specific +# variables to cc-wrapper-derivation-specific variables. This conversion is +# the only time all but one of the cc-wrapper-derivation-specific variables +# are set. +# +# This ensures the flow of information is exclusive from +# relative-platform-specific variables to cc-wrapper-derivation-specific +# variables. This allows us to support the general case of a many--many relation +# between relative platforms and cc-wrapper derivations. +# +# For more details, read the individual files where the mechanisms used to +# accomplish this will be individually documented. -addCVars () { - if [ -d $1/include ]; then - export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" + +# 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 + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + return 1 ;; + esac + + if [[ -d "$1/include" ]]; then + export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi - if [ -d $1/lib64 -a ! -L $1/lib64 ]; then - export NIX_LDFLAGS+=" -L$1/lib64" + if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib64" fi - if [ -d $1/lib ]; then - export NIX_LDFLAGS+=" -L$1/lib" + if [[ -d "$1/lib" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib" fi - if test -d $1/Library/Frameworks; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -F$1/Library/Frameworks" + if [[ -d "$1/Library/Frameworks" ]]; then + export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi } -envHooks+=(addCVars) +# Since the same cc-wrapper derivation can be depend on in multiple ways, we +# need to accumulate *each* role (i.e. target platform relative the depending +# derivation) in which the cc-wrapper derivation is used. +# `NIX_CC_WRAPPER_@infixSalt@_TARGET_*` tracks this (needs to be an exported env +# var so can't use fancier data structures). +# +# 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 -# Note: these come *after* $out in the PATH (see setup.sh). +# 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) +# Note 1: these come *after* $out in the PATH (see setup.sh). +# Note 2: phase separation makes this look useless to shellcheck. + +# shellcheck disable=SC2157 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 fi +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then addToSearchPath _PATH @coreutils_bin@/bin fi -if [ -z "$crossConfig" ]; then - export CC=@real_cc@ - export CXX=@real_cxx@ -else - export BUILD_CC=@real_cc@ - export BUILD_CXX=@real_cxx@ -fi +# Export tool environment variables so various build systems use the right ones. + +export NIX_${role}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 "@binPrefix@$CMD" > /dev/null + then + export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + fi +done + +# No local scope in sourced file +unset role diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 87e48da9c8d5..7e9979f10ae8 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,5 +1,5 @@ skip () { - if [ -n "$NIX_DEBUG" ]; then + if [ -n "${NIX_DEBUG:-}" ]; then echo "skipping impure path $1" >&2 fi } @@ -24,11 +24,15 @@ badPath() { } expandResponseParams() { - params=("$@") + declare -ga params=("$@") local arg for arg in "$@"; do if [[ "$arg" == @* ]]; then + # phase separation makes this look useless + # shellcheck disable=SC2157 if [ -n "@expandResponseParams@" ]; then + # params is used by caller + #shellcheck disable=SC2034 readarray -d '' params < <("@expandResponseParams@" "$@") return 0 else diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4ebe3c0615d3..17d7f2da035c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -6,6 +6,7 @@ findutils, go, jshon, + jq, lib, pkgs, pigz, @@ -42,7 +43,7 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) mkdir src - ln -sT ${docker.src}/pkg/tarsum src/tarsum + ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum go build cp tarsum $out @@ -234,11 +235,10 @@ rec { # Files to add to the layer. contents ? null, # Additional commands to run on the layer before it is tar'd up. - extraCommands ? "" + extraCommands ? "", uid ? 0, gid ? 0 }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync ]; } '' @@ -253,6 +253,8 @@ rec { echo "No contents to add to layer." fi + chmod ug+w layer + if [[ -n $extraCommands ]]; then (cd layer; eval "$extraCommands") fi @@ -260,7 +262,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -312,6 +314,8 @@ rec { echo "Adding $item..." rsync -ak --chown=0:0 $item/ layer/ done + + chmod ug+w layer ''; postMount = '' @@ -375,7 +379,7 @@ rec { # Docker config; e.g. what command to run on the container. config ? null, # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", + extraCommands ? "", uid ? 0, gid ? 0, # Optional bash script to run as root on the image when provisioning. runAsRoot ? null, # Size of the virtual machine disk to provision when building the image. @@ -398,16 +402,17 @@ rec { if runAsRoot == null then mkPureLayer { name = baseName; - inherit baseJson contents extraCommands; + inherit baseJson contents extraCommands uid gid; } else mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils ]; - imageName = name; - imageTag = tag; + buildInputs = [ jshon pigz coreutils findutils jq ]; + # Image name and tag must be lowercase + imageName = lib.toLower name; + imageTag = lib.toLower tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; @@ -431,6 +436,9 @@ rec { if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" + # Do not import the base image configuration and manifest + chmod a+w image image/*.json + rm -f image/*.json if [[ -z "$fromImageName" ]]; then fromImageName=$(jshon -k < image/repositories|head -n1) @@ -489,6 +497,24 @@ rec { # Use the temp folder we've been working on to create a new image. mv temp image/$layerID + # Create image json and image manifest + imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") + currentID=$layerID + while [[ -n "$currentID" ]]; do + layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) + imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") + + currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true)) + done + + imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) + echo "$imageJson" > "image/$imageJsonChecksum.json" + manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") + echo "$manifestJson" > image/manifest.json + # Store the json under the name image/repositories. jshon -n object \ -n object -s "$layerID" -i "$imageTag" \ @@ -498,7 +524,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out + tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index e41b1fd6a215..bd733f1b9baf 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation { linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" } - for pkg in $requires; do + # Iterate over the array of inputs (avoiding nix's own interpolation) + for pkg in "''${requires[@]}"; do linkEmacsPackage $pkg done diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 835fbec6bf0e..dd0bac49cb6d 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -7,8 +7,10 @@ let ver = if builtins.length components == 1 then version else hash; in ver; + bowerName = name: lib.replaceStrings ["/"] ["-"] name; + fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${name}-${bowerVersion version}"; + name = "${bowerName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a6ddf132cd5b..a9bfac320fb8 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,7 +5,7 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, addPrefixes ? false, ... }@args: +{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args: fetchurl ({ postFetch = '' @@ -21,7 +21,10 @@ fetchurl ({ --addnewprefix=b/ \ ''} \ --clean "$out" > "$tmpfile" - mv "$tmpfile" "$out" + ${patchutils}/bin/filterdiff \ + -p1 \ + ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \ + "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "addPrefixes"]) +} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"]) diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index 722fd2566ef3..bd71f93c5291 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -5,10 +5,11 @@ let mirrors = import ./mirrors.nix; in { url ? builtins.head urls , urls ? [] , sha256 +, name ? baseNameOf (toString url) }: import { - inherit system sha256; + inherit system sha256 name; url = # Handle mirror:// URIs. Since currently diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index c4fd18e46caf..7c2bdf260b4e 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -39,7 +39,6 @@ tryDownload() { curlexit=$?; fi done - stopNest } @@ -51,7 +50,6 @@ finish() { fi runHook postFetch - stopNest exit 0 } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 41bfc84c247b..d612db64c122 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -132,7 +132,7 @@ rec { http://ftp.riken.jp/net/samba ]; - # BitlBee mirrors, see http://www.bitlbee.org/main.php/mirrors.html . + # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ http://get.bitlbee.org/ http://get.bitlbee.be/ @@ -159,8 +159,9 @@ rec { cpan = [ http://ftp.gwdg.de/pub/languages/perl/CPAN/ ftp://download.xs4all.nl/pub/mirror/CPAN/ - ftp://ftp.nl.uu.net/pub/CPAN/ + http://ftp.tuwien.ac.at/pub/CPAN/ http://ftp.funet.fi/pub/CPAN/ + https://cpan.metacpan.org/ http://cpan.perl.org/ http://backpan.perl.org/ # for old releases ]; @@ -266,15 +267,14 @@ rec { # Apache mirrors (see http://www.apache.org/mirrors/). apache = [ http://www.eu.apache.org/dist/ - ftp://ftp.inria.fr/pub/Apache/ - http://apache.cict.fr/ + http://wwwftp.ciril.fr/pub/apache/ ftp://ftp.fu-berlin.de/unix/www/apache/ - ftp://crysys.hit.bme.hu/pub/apache/dist/ + http://ftp.tudelft.nl/apache/ http://mirror.cc.columbia.edu/pub/software/apache/ http://www.apache.org/dist/ http://archive.apache.org/dist/ # fallback for old releases ftp://ftp.funet.fi/pub/mirrors/apache.org/ - http://apache.cs.uu.nl/dist/ + http://apache.cs.uu.nl/ http://apache.cs.utah.edu/ ]; diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 1145d32ba022..751dba56930e 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -23,7 +23,6 @@ lib.overrideDerivation (fetchurl ({ postFetch = '' export PATH=${unzip}/bin:$PATH - mkdir $out unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" @@ -32,8 +31,6 @@ lib.overrideDerivation (fetchurl ({ renamed="$TMPDIR/${baseNameOf url}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" - - shopt -s dotglob '' + (if stripRoot then '' if [ $(ls "$unpackDir" | wc -l) != 1 ]; then @@ -43,12 +40,11 @@ lib.overrideDerivation (fetchurl ({ fi fn=$(cd "$unpackDir" && echo *) if [ -f "$unpackDir/$fn" ]; then - mv "$unpackDir/$fn" "$out" - else - mv "$unpackDir/$fn"/* "$out/" + mkdir $out fi + mv "$unpackDir/$fn" "$out" '' else '' - mv "$unpackDir"/* "$out/" + mv "$unpackDir" "$out" '') #*/ + extraPostFetch; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])) diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index a8e8a370ec0d..22e32814927e 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh # tools like gcov, the manpages, etc. as well (including for binutils # and Glibc). if test -z "$nativeTools"; then - echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages + printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index fad6f00d8211..da1d4105c89f 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation { priority = 5; buildCommand = '' - mkdir -p $out/share/autostart + mkdir -p $out/etc/xdg/autostart target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target chmod +rw $target echo "X-KDE-autostart-phase=${phase}" >> $target ${lib.optionalString (after != null) ''echo "${after}" >> $target''} ${lib.optionalString (condition != null) ''echo "${condition}" >> $target''} - cp $target $out/share/autostart + cp $target $out/etc/xdg/autostart ''; # this will automatically put 'package' in the environment when you diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/build-support/setup-hooks/die.sh new file mode 100644 index 000000000000..0db41e030f4c --- /dev/null +++ b/pkgs/build-support/setup-hooks/die.sh @@ -0,0 +1,21 @@ +# Exit with backtrace and error message +# +# Usage: die "Error message" +die() { + # Let us be a little sloppy with errors, because otherwise the final + # invocation of `caller` below will cause the script to exit. + set +e + + # Print our error message + printf "\nBuilder called die: %b\n" "$*" + printf "Backtrace:\n" + + # Print a backtrace. + local frame=0 + while caller $frame; do + ((frame++)); + done + printf "\n" + + exit 1 +} diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 8fe661026774..1b36f5f555da 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -1,4 +1,4 @@ -# On Mac OS X, binaries refer to dynamic library dependencies using +# On macOS, binaries refer to dynamic library dependencies using # either relative paths (e.g. "libicudata.dylib", searched relative to # $DYLD_LIBRARY_PATH) or absolute paths # (e.g. "/nix/store/.../lib/libicudata.dylib"). In Nix, the latter is diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh index e3a08b2598d9..cf8416c0838d 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh @@ -1,4 +1,4 @@ -# On Mac OS X, frameworks are linked to the system CoreFoundation but +# On macOS, frameworks are linked to the system CoreFoundation but # dynamic libraries built with nix use a pure version of CF this # causes segfaults for binaries that depend on it at runtime. This # can be solved in two ways. diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index eebde886a884..f9d435df655b 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -1,3 +1,12 @@ +# Assert that FILE exists and is executable +# +# assertExecutable FILE +assertExecutable() { + local file="$1" + [[ -f "$file" && -x "$file" ]] || \ + die "Cannot wrap '$file' because it is not an executable file" +} + # construct an executable file that wraps the actual executable # makeWrapper EXECUTABLE ARGS @@ -24,6 +33,8 @@ makeWrapper() { local params varName value command separator n fileNames local argv0 flagsBefore flags + assertExecutable "$original" + mkdir -p "$(dirname "$wrapper")" echo "#! $SHELL -e" > "$wrapper" @@ -32,26 +43,20 @@ makeWrapper() { for ((n = 2; n < ${#params[*]}; n += 1)); do p="${params[$n]}" - if test "$p" = "--set"; then + if [[ "$p" == "--set" ]]; then varName="${params[$((n + 1))]}" value="${params[$((n + 2))]}" n=$((n + 2)) echo "export $varName=\"$value\"" >> "$wrapper" - fi - - if test "$p" = "--unset"; then + elif [[ "$p" == "--unset" ]]; then varName="${params[$((n + 1))]}" n=$((n + 1)) echo "unset $varName" >> "$wrapper" - fi - - if test "$p" = "--run"; then + elif [[ "$p" == "--run" ]]; then command="${params[$((n + 1))]}" n=$((n + 1)) echo "$command" >> "$wrapper" - fi - - if test "$p" = "--suffix" -o "$p" = "--prefix"; then + elif [[ ("$p" == "--suffix") || ("$p" == "--prefix") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" value="${params[$((n + 3))]}" @@ -63,9 +68,7 @@ makeWrapper() { echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper" fi fi - fi - - if test "$p" = "--suffix-each"; then + elif [[ "$p" == "--suffix-each" ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" values="${params[$((n + 3))]}" @@ -73,9 +76,7 @@ makeWrapper() { for value in $values; do echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper" done - fi - - if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then + elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" fileNames="${params[$((n + 3))]}" @@ -87,17 +88,15 @@ makeWrapper() { echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper" fi done - fi - - if test "$p" = "--add-flags"; then + elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" n=$((n + 1)) flagsBefore="$flagsBefore $flags" - fi - - if test "$p" = "--argv0"; then + elif [[ "$p" == "--argv0" ]]; then argv0="${params[$((n + 1))]}" n=$((n + 1)) + else + die "makeWrapper doesn't understand the arg $p" fi done @@ -131,6 +130,9 @@ filterExisting() { wrapProgram() { local prog="$1" local hidden + + assertExecutable "$prog" + hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped while [ -e "$hidden" ]; do hidden="${hidden}_" @@ -138,5 +140,5 @@ wrapProgram() { mv "$prog" "$hidden" # Silence warning about unexpanded $0: # shellcheck disable=SC2016 - makeWrapper "$hidden" "$prog" --argv0 '$0' "$@" + makeWrapper "$hidden" "$prog" --argv0 '$0' "${@:2}" } diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 62a6491b8dc0..60d4ccf99ed1 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -40,9 +40,9 @@ _overrideFirst outputLib "lib" "out" _overrideFirst outputDoc "doc" "out" _overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries -_overrideFirst outputMan "man" "doc" "$outputBin" +_overrideFirst outputMan "man" "$outputBin" _overrideFirst outputDevman "devman" "devdoc" "$outputMan" -_overrideFirst outputInfo "info" "doc" "$outputMan" +_overrideFirst outputInfo "info" "$outputBin" # Add standard flags to put files into the desired outputs. diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh new file mode 100644 index 000000000000..2fd2a2d6da6f --- /dev/null +++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh @@ -0,0 +1,5 @@ +setupDebugInfoDirs () { + addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug +} + +envHooks+=(setupDebugInfoDirs) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 9891128a6231..79b8d5b73fa1 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -39,7 +39,7 @@ wrapGAppsHook() { targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) for targetDir in "${targetDirs[@]}"; do if [[ -d "${targetDir}" ]]; then - find "${targetDir}" -type f -executable -print0 \ + find -L "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do echo "Wrapping program ${file}" wrapProgram "${file}" "${gappsWrapperArgs[@]}" diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 4debd9636396..14553c33e039 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -26,6 +26,7 @@ rec { , text , executable ? false # run chmod +x ? , destination ? "" # relative path appended to $out eg "/bin/foo" + , checkPhase ? "" # syntax checks, e.g. for scripts }: runCommand name { inherit text executable; @@ -44,6 +45,8 @@ rec { echo -n "$text" > "$n" fi + ${checkPhase} + (test -n "$executable" && chmod +x "$n") || true ''; @@ -54,6 +57,20 @@ rec { writeScript = name: text: writeTextFile {inherit name text; executable = true;}; writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; + # Create a Shell script, check its syntax + writeShellScriptBin = name : text : + writeTextFile { + inherit name; + executable = true; + destination = "/bin/${name}"; + text = '' + #!${stdenv.shell} + ${text} + ''; + checkPhase = '' + ${stdenv.shell} -n $out + ''; + }; # Create a forest of symlinks to the files in `paths'. symlinkJoin = @@ -84,7 +101,7 @@ rec { mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + lib.optionalString (deps != []) '' - echo ${toString deps} > $out/nix-support/propagated-native-build-inputs + printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d5cfc419fc72..d886e9a56fa4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -750,6 +750,7 @@ rec { { name, fullName, size ? 4096, urlPrefix , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [], postInstall ? "" + , extraDebs ? [] , QEMU_OPTS ? "", memSize ? 512 }: let @@ -760,7 +761,7 @@ rec { in (fillDiskWithDebs { inherit name fullName size postInstall QEMU_OPTS memSize; - debs = import expr {inherit fetchurl;}; + debs = import expr {inherit fetchurl;} ++ extraDebs; }) // {inherit expr;}; @@ -1954,22 +1955,22 @@ rec { }; debian8i386 = { - name = "debian-8.8-jessie-i386"; - fullName = "Debian 8.8 Jessie (i386)"; + name = "debian-8.9-jessie-i386"; + fullName = "Debian 8.9 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58"; + sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.8-jessie-amd64"; - fullName = "Debian 8.8 Jessie (amd64)"; + name = "debian-8.9-jessie-amd64"; + fullName = "Debian 8.9 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6"; + sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 6ced5785ecfb..b77b79338c75 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"; + sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux development manual pages"; - homepage = http://www.kernel.org/doc/man-pages/; + homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index e41b26d41fbe..5659cac6703d 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { For a list of implementations and tips, see ${homepage}. ''; - homepage = "http://mustache.github.io/"; + homepage = http://mustache.github.io/; license = lib.licenses.mit; maintainers = with lib.maintainers; [ profpatsch ]; platforms = lib.platforms.all; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 36416c6f827c..cf138abee88f 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = { description = "A simple offline API documentation browser"; longDescription = '' - Zeal is a simple offline API documentation browser inspired by Dash (OS X + Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = "http://zealdocs.org/"; + homepage = http://zealdocs.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 562aa8be4eff..ba0bab61eec5 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,28 +1,24 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "andagii-${version}"; +let version = "1.0.2"; +in fetchzip { + name = "andagii-${version}"; - src = fetchzip { - url = http://www.i18nguy.com/unicode/andagii.zip; - sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k"; - stripRoot = false; - curlOpts = "--user-agent 'Mozilla/5.0'"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + url = http://www.i18nguy.com/unicode/andagii.zip; + curlOpts = "--user-agent 'Mozilla/5.0'"; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf ''; + sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your # own risk Debian claims it is GPL - good enough for me. meta = with stdenv.lib; { - homepage = http://www.i18nguy.com/unicode/unicode-font.HTML; + homepage = http://www.i18nguy.com/unicode/unicode-font.html; description = "Unicode Plane 1 Osmanya script font"; maintainers = with maintainers; [ raskin rycee ]; license = "unknown"; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index da34a2f43aa6..3ac2c9432997 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,26 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "anonymousPro-${version}"; +let version = "1.002"; +in fetchzip rec { + name = "anonymousPro-${version}"; - src = fetchurl { - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; - }; - - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with stdenv.lib; { - homepage = http://www.marksimonson.com/fonts/view/anonymous-pro; + homepage = https://www.marksimonson.com/fonts/view/anonymous-pro; description = "TrueType font set intended for source code"; longDescription = '' Anonymous Pro (2009) is a family of four fixed-width fonts diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 59be4fd14c89..c2e64cb63dd1 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "arkpandora-${version}"; +{ stdenv, fetchurl, unzip }: + +let version = "2.04"; +in fetchurl { + name = "arkpandora-${version}"; - src = fetchurl { - urls = [ - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51"; - }; - - installPhase = '' + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + downloadToTemp = true; + recursiveHash = true; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index b392ac79b2da..37d9a1995674 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchzip, mkfontscale, mkfontdir }: -{ - arphic-ukai = stdenv.mkDerivation rec { +let + version = "0.2.20080216.2"; +in { + arphic-ukai = fetchzip { name = "arphic-ukai-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + meta = with stdenv.lib; { description = "CJK Unicode font Kai style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; @@ -32,27 +28,21 @@ }; }; - arphic-uming = stdenv.mkDerivation rec { + arphic-uming = fetchzip { name = "arphic-uming-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + meta = with stdenv.lib; { description = "CJK Unicode font Ming style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 9941b4791b58..1a83ce17646e 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,21 +1,14 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "aurulent-sans-0.1"; - src = fetchgit { - url = "https://github.com/deepfire/hartke-aurulent-sans.git"; - rev = "refs/tags/${name}"; - sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; - }; - - dontBuild = true; - - installPhase = '' - fontDir=$out/share/fonts/opentype - mkdir -p $fontDir - cp *.otf $fontDir + url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 16534d4d6cbe..97333f7d953a 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,22 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let + version = "10.0.0"; +in fetchzip { name = "babelstone-han-${version}"; - version = "9.0.2"; - src = fetchurl { - url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip"; - sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' + url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip; + postFetch = '' mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; + sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r"; meta = with stdenv.lib; { description = "Unicode CJK font with over 32600 Han characters"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index f948a9642ff7..555bba63354c 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,28 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "baekmuk-ttf-2.2"; - src = fetchurl { - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8"; - }; - - dontBuild = true; - - installPhase = let - fonts_dir = "$out/share/fonts"; - doc_dir = "$out/share/doc/${name}"; - in '' - mkdir -pv ${fonts_dir} - mkdir -pv ${doc_dir} - cp ttf/*.ttf ${fonts_dir} - cp COPYRIGHT* ${doc_dir} + url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts $out/share/doc/${name} + cp ttf/*.ttf $out/share/fonts + cp COPYRIGHT* $out/share/doc/${name} ''; + sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; - homepage = "http://kldp.net/projects/baekmuk/"; + homepage = http://kldp.net/projects/baekmuk/; license = "BSD-like"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index bffa7edb6049..8d87154c1df0 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,20 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "bakoma-ttf"; - src = fetchurl { - url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2; - sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; - }; + url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km; - dontBuild = true; - - installPhase = '' + postFetch = '' + tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype ''; + sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index 8e432db84183..5bf4d454b062 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "cabin-1.005"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; - sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; - }; + url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd"; + meta = with stdenv.lib; { description = "A humanist sans with 4 weights and true italics"; longDescription = '' diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 110405839a12..56d8273f78ab 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "caladea-${version}"; +let version = "20130214"; +in fetchzip rec { + name = "caladea-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf ''; + sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index bc1402270aa4..dfdf367337c3 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "camingo-code-${version}"; +let version = "1.0"; +in fetchzip rec { + name = "camingo-code-${version}"; - src = fetchurl { - url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; - sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s"; - }; - - buildInputs = [ unzip ]; - - installPhase = '' + url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v camingo-code/*.ttf $out/share/fonts/truetype/ - cp -v camingo-code/*.txt $out/share/doc/${name}/ + cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/ + cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/ ''; + sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1"; meta = with stdenv.lib; { homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 98ce946044dd..de2edad451b9 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index b90d89c9779c..2243435bc5db 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,23 +1,22 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "carlito-${version}"; +let version = "20130920"; +in fetchzip rec { + name = "carlito-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab"; - }; + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; + sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv"; + meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 9334468d76c9..1e4df0c9221e 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontdir mkfontscale ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6"; meta = { description = "A Unicode font"; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index ed7ce93e1896..d17021feb81e 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "cm-unicode-${version}"; +let version = "0.7.0"; +in fetchzip rec { + name = "cm-unicode-${version}"; - src = fetchurl { - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; - }; + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v *.otf $out/share/fonts/opentype/ cp -v README FontLog.txt $out/share/doc/${name} ''; + sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + meta = with stdenv.lib; { homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; description = "Computer Modern Unicode fonts"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index c773f3955921..0dd4f727ad25 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,25 +1,18 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comfortaa-${version}"; +let version = "2.004"; +in fetchzip rec { + name = "comfortaa-${version}"; - src = fetchurl { - url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; - sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z"; - }; - - phases = ["unpackPhase" "installPhase"]; - - buildInputs = [unzip]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt $out/share/doc/${name}/ - cp -v donate.html $out/share/doc/${name}/ + url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; + postFetch = '' + mkdir -p $out/share/fonts $out/share/doc + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} ''; + sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h"; meta = with stdenv.lib; { homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 5d3da910e0b2..07fc172ca513 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl -, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "comic-neue-${version}"; +let version = "2.2"; +in fetchzip rec { + name = "comic-neue-${version}"; - src = fetchurl { - url = "http://comicneue.com/${name}.zip"; - sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n"; - }; + url = "http://comicneue.com/${name}.zip"; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = name; - - installPhase = '' - mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name} - cp -v OTF/*.otf $out/share/fonts/opentype - cp -v Web/*.ttf $out/share/fonts/truetype - cp -v Web/*.eot $out/share/fonts/EOT - cp -v Web/*.woff $out/share/fonts/WOFF - cp -v Web/*.woff2 $out/share/fonts/WOFF2 - cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name} + postFetch = '' + mkdir -vp $out/share/{doc,fonts} + unzip -j $downloadedFile comic-neue-2.2/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile comic-neue-2.2/\*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile comic-neue-2.2/\*.eot -d $out/share/fonts/EOT + unzip -j $downloadedFile comic-neue-2.2/\*.woff -d $out/share/fonts/WOFF + unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2 + unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name} ''; + sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q"; + meta = with stdenv.lib; { homepage = http://comicneue.com/; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 31c89215ea77..2a1273214bd6 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,32 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comic-relief-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "comic-relief-${version}"; - src = fetchurl { - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; - }; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src - ''; - - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/doc/${name} mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - cp -v FONTLOG.txt $out/share/doc/${name} + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + meta = with stdenv.lib; { homepage = http://loudifier.com/comic-relief/; description = "A font metric-compatible with Microsoft Comic Sans"; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 9bc041822643..91c8ed1163d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -59,8 +59,12 @@ stdenv.mkDerivation { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + meta = with stdenv.lib; { - homepage = "http://corefonts.sourceforge.net/"; + homepage = http://corefonts.sourceforge.net/; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index f612f0770647..e96c13b7822b 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "crimson-${version}"; +let version = "2014.10"; +in fetchzip rec { + name = "crimson-${version}"; - src = fetchurl { - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b"; - }; + url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - phases = ["unpackPhase" "installPhase"]; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 - installPhase = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype cp -v README.md $out/share/doc/${name} ''; + sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + meta = with stdenv.lib; { homepage = https://aldusleaf.org/crimson.html; description = "A font family inspired by beautiful oldstyle typefaces"; diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 08783e46cdea..236058c0b271 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "culmus-${version}"; +let version = "0.130"; +in fetchzip { + name = "culmus-${version}"; - src = fetchurl { - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1"; - }; - - installPhase = '' + url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; + + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype/ ''; - + + sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6"; + meta = { description = "Culmus Hebrew fonts"; longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows."; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 267a0b80a1f8..1e888fe0784b 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,34 +1,7 @@ {fetchFromGitHub, stdenv, fontforge, perl, FontTTF}: -let version = "2.37" ; in - -stdenv.mkDerivation rec { - name = "dejavu-fonts-${version}"; - buildInputs = [fontforge perl FontTTF]; - - src = fetchFromGitHub { - owner = "dejavu-fonts"; - repo = "dejavu-fonts"; - rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; - }; - - outputs = [ "out" "minimal" ]; - - buildFlags = "full-ttf"; - - preBuild = "patchShebangs scripts"; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - for i in $(find build -name '*.ttf'); do - cp $i $out/share/fonts/truetype; - done; - '' + '' - local fname=share/fonts/truetype/DejaVuSans.ttf - moveToOutput "$fname" "$minimal" - ln -s "$minimal/$fname" "$out/$fname" - ''; +let + version = "2.37"; meta = { description = "A typeface family based on the Bitstream Vera fonts"; @@ -49,4 +22,54 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; }; + + full-ttf = stdenv.mkDerivation { + name = "dejavu-fonts-full-${version}"; + buildInputs = [fontforge perl FontTTF]; + + src = fetchFromGitHub { + owner = "dejavu-fonts"; + repo = "dejavu-fonts"; + rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; + }; + + buildFlags = "full-ttf"; + + preBuild = "patchShebangs scripts"; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp build/*.ttf $out/share/fonts/truetype/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1cxprzsr826d888ha4zxx28i9jfj1k74q9kfv3v2rf603460iha9"; + inherit meta; + }; + + minimal = stdenv.mkDerivation { + name = "dejavu-fonts-minimal-${version}"; + buildCommand = '' + install -D ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0ybsynp9904vmd3qv5b438swhx43m5q6gfih3i32iw33rks8nkpj"; + inherit meta; + }; +in stdenv.mkDerivation { + name = "dejavu-fonts-${version}"; + 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 + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1nf0h15p8yvjx36syq1034i3hix99lm8p54iyjw8dpa19i9jfkmd"; + inherit meta; + + passthru.minimal = minimal; } diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index d08887a5cdee..b94004b24bb4 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { for i in Dina_r700-*.bdf; do bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i done - gzip *.pcf + gzip -n *.pcf fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { preferLocalBuild = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0v0qn5zwq4j1yx53ypg6w6mqx6dk8l1xix0188b0k4z3ivgnflyb"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index a206bd7f9115..66feaf0ff544 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2.92"; +in fetchzip rec { name = "dina-font-${version}"; - src = fetchurl { - url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; - }; + url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = - '' + postFetch = '' mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts + unzip -j $downloadedFile \*.bdf -d $out/share/fonts ''; + sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 84c57fc7e8f8..f564507c777c 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for i in */etc/*.bdf; do fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz" echo -n "Installing font $fontOut..." >&2 - ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut" + ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 -n > "$fontOut" echo " done." >&2 done cp */etc/dosemu.alias "$fontPath/fonts.alias" @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { ${mkfontscale}/bin/mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1miqv0ral5vazx721wildjlzvji5r7pbgm39c0cpj5ywafaikxr8"; + meta = { description = "Various fonts from the DOSEmu project"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 28b9ee2f1e71..01157e8b7e4c 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "dosis-1.007"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; - sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; - }; + url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq"; + meta = with stdenv.lib; { description = "A very simple, rounded, sans serif family"; longDescription = '' diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index fd32f478b715..c2a4868a091c 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -50,9 +50,13 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/droid ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3"; + meta = { description = "Droid Family fonts by Google Android"; - homepage = "https://github.com/google/fonts"; + homepage = https://github.com/google/fonts; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 0956250e36ce..53a5d9f73cc1 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "eb-garamond-${version}"; +let version = "0.016"; +in fetchzip rec { + name = "eb-garamond-${version}"; - src = fetchzip { - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z"; - }; + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "otf/"*.otf $out/share/fonts/opentype/ - cp -v Changes README.markdown README.xelualatex $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" ''; + sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + meta = with stdenv.lib; { homepage = http://www.georgduffner.at/ebgaramond/; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index eea190d0a88c..10305a8c2d2b 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let + version = "3.1.1"; +in fetchzip { name = "emacs-all-the-icons-fonts-${version}"; - version = "2.6.4"; - src = fetchFromGitHub { - owner = "domtronn"; - repo = "all-the-icons.el"; - rev = version; - sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; - }; + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/all-the-icons - for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons ''; + sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq"; + meta = with stdenv.lib; { description = "Icon fonts for emacs all-the-icons"; longDescription = '' diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index d0bf8d34714f..560aed970bbf 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source emoji set"; - homepage = "http://emojione.com/"; + homepage = http://emojione.com/; license = licenses.cc-by-40; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index e0f79b2722ce..96d64e138935 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "encode-sans-1.002"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Encode-Sans"; - rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; - sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; - }; + url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + meta = with stdenv.lib; { description = "A versatile sans serif font family"; longDescription = '' diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 203b68f5e5d2..40880d022db0 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1"; + meta = with stdenv.lib; { description = '' Readable bitmap font inspired by Envy Code R diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index a87c89d1df9f..de52ae411efb 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,28 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "fantasque-sans-mono-${version}"; +let version = "1.7.1"; +in fetchzip rec { + name = "fantasque-sans-mono-${version}"; - src = fetchurl { - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb"; - }; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile README.md -d $out/share/doc/${name} ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "OTF/"*.otf $out/share/fonts/opentype - cp -v README.md $out/share/doc/${name} - ''; + sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0"; meta = with stdenv.lib; { homepage = https://github.com/belluzj/fantasque-sans; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index e14505f61bdd..5cfd2ec1f472 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "fira-code-${version}"; +let version = "1.204"; +in fetchzip { + name = "fira-code-${version}"; - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"; - }; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sourceRoot = "otf"; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; description = "Monospace font with programming ligatures"; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index e8868764271c..c19fbccb1420 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,11 +1,16 @@ -{ stdenv, runCommand, fetchurl, unzip }: +{ stdenv, fetchzip }: -runCommand "fira-code-symbols-20160811" { - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; - sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg"; - }; - buildInputs = [ unzip ]; +fetchzip { + name = "fira-code-symbols-20160811"; + + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile -d $out/share/fonts/opentype + ''; + + sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; meta = with stdenv.lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -18,7 +23,4 @@ runCommand "fira-code-symbols-20160811" { maintainers = [ maintainers.profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -} '' - mkdir -p $out/share/fonts/opentype - unzip "$src" -d $out/share/fonts/opentype -'' +} diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 3997ba27719b..4fc6aab95108 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip { name = "fira-mono-3.206"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - sha256 = "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"; - }; + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraMonoFonts3206"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0m4kdjh4xjyznybpgh21a0gibv4wsxq0rqyl3wv942zk6mclmgdf"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Monospace font for Firefox OS"; diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index f777ae33e0bf..cddb8cd726a5 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "fira-4.106"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - sha256 = "123xwd7abb96lsla1v579vfpvc7fwixhq78221qxrw4dv8mgf8id"; - }; + url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - buildInputs = [unzip]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4106"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "174nwmpvxqg1qjfj6h3yvrphs1s3n6zricdh27iaxilajm0ilbgs"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Sans-serif font for Firefox OS"; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index 55995f6d11d7..34548b972442 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -1,28 +1,26 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "font-awesome-${version}"; +let version = "4.7.0"; +in fetchzip rec { + name = "font-awesome-${version}"; - src = fetchFromGitHub { - owner = "FortAwesome"; - repo = "Font-Awesome"; - rev = "v${version}"; - sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc"; - }; + url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - buildCommand = '' - mkdir -p $out/share/fonts/truetype - cp $src/fonts/*.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype ''; + sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; + meta = with stdenv.lib; { description = "Font Awesome - TTF font"; longDescription = '' Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the TTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; + homepage = http://fortawesome.github.io/Font-Awesome/; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ abaldeau ]; diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index 360cacb551d7..e1be0da428a8 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip +, version ? "0.3.5" +, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk" +}: -let version = "0.3.5"; in -stdenv.mkDerivation { +fetchzip { name = "fontconfig-penultimate-${version}"; - src = fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8"; - }; + url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip"; + inherit sha256; - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d - cp *.conf $out/etc/fonts/conf.d + unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 00d5cfba27a0..87b3abe2911f 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,20 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "freefont-ttf-20120503"; - src = fetchurl { - url = "mirror://gnu/freefont/${name}.zip"; - sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw"; - }; + url = "mirror://gnu/freefont/${name}.zip"; - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "0h0x2hhr7kvjiycf7fv800xxwa6hcpiz54bqx06wsqc7z61iklvd"; + meta = { description = "GNU Free UCS Outline Fonts"; longDescription = '' diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 28bea4c2c8bd..359074099ba1 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -1,62 +1,51 @@ -{stdenv, fetchurl, unzip, lib }: +{stdenv, fetchzip, lib}: + let fonts = { - symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5"; + symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v"; + aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij"; + akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7"; description = "Sumero-Akkadian Cuneiform"; }; - anatolian = { version = "5.02"; file = "Anatolian.zip"; sha256 = "0arm58sijzk0bqmfb70k1sjvq79wgw16hx3j2g4l8qz4sv05bp8l"; + anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc"; description = "Anatolian Hieroglyphs"; }; - maya = { version = "4.14"; file = "Maya.zip"; sha256 = "0l97racgncrhb96mfbsx8dr5n4j289iy0nnwhxf9b21ns58a9x4f"; + maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh"; description = "Maya Hieroglyphs"; }; - unidings = { version = "8.00"; file = "Unidings.zip"; sha256 = "1i0z3mhgj4680188lqpmk7rx3yiz4l7yybb4wq6zk35j75l28irm"; + unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; - musica = { version = "3.12"; file = "Musica.zip"; sha256 = "079vyb0mpxvlcf81d5pqh9dijkcvidfbcyvpbgjpmgzzrrj0q210"; + musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6"; description = "Musical Notation"; }; - analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f"; + analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj"; description = "Coptic, Gothic, Deseret"; }; - # the following are also available from http://users.teilar.gr/~g1951d/ - # but not yet packaged: - # - Aroania - # - Anaktoria - # - Alexander - # - Avdira - # - Asea - # - Aegean + textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl"; + description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf"; + description = "Aegean"; }; + abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8"; + description = "AbydosFont"; }; }; - mkpkg = name_: {version, file, sha256, description}: - stdenv.mkDerivation rec { - name = "${name_}-${version}"; - src = fetchurl { - url = "http://users.teilar.gr/~g1951d/${file}"; - inherit sha256; - }; + mkpkg = name_: {version, file, sha256, description}: fetchzip rec { + name = "${name_}-${version}"; + url = "http://users.teilar.gr/~g1951d/${file}"; + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty + ''; + inherit sha256; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ - - mkdir -p "$out/doc/${name}" - cp -v *.docx *.pdf *.xlsx "$out/doc/${name}/" - ''; - - meta = { - inherit description; - # In lieu of a license: - # Fonts in this site are offered free for any use; - # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. - license = stdenv.lib.licenses.free; - homepage = http://users.teilar.gr/~g1951d/; - platforms = stdenv.lib.platforms.unix; - }; + meta = { + inherit description; + # In lieu of a license: + # Fonts in this site are offered free for any use; + # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. + license = stdenv.lib.licenses.free; + homepage = http://users.teilar.gr/~g1951d/; + platforms = stdenv.lib.platforms.unix; }; - + }; in -lib.mapAttrs mkpkg fonts + lib.mapAttrs mkpkg fonts diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 2c7b1eea5773..4c1e484253cf 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,28 +1,25 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-book-basic-${version}"; +let major = "1"; minor = "102"; version = "${major}.${minor}"; +in fetchzip rec { + name = "gentium-book-basic-${version}"; - src = fetchzip { - name = "${name}.zip"; - url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip"; - sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0"; - }; + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} ''; + sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + meta = with stdenv.lib; { - homepage = "http://software.sil.org/gentium/"; + homepage = http://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; maintainers = with maintainers; [ ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 9e4a88ab770d..2e2ffdeb5bb4 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-${version}"; +let version = "5.000"; +in fetchzip rec { + name = "gentium-${version}"; - src = fetchzip { - url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip"; - sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6"; - }; + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -vr documentation/ FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; + sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + meta = with stdenv.lib; { - homepage = "http://software.sil.org/gentium/"; + homepage = http://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 diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 0c9dfa40982f..a0af38cfd240 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0"; + meta = with stdenv.lib; { homepage = https://blog.golang.org/go-fonts; description = "The Go font family"; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 2bd0d5800b43..f4043697e7b5 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7"; + meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index fd3425e3c7c3..de281c278e62 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2016-08-30"; + version = "2017-06-28"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197"; - sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3"; + rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc"; + sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg"; }; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf"; + outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22"; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index a5f43d4169b2..492d89a674ce 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let baseName = "gyre-fonts"; version = "2.005"; +in fetchzip { name="${baseName}-${version}"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; - sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; - }; - buildInputs = [unzip]; + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.otf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype ''; + sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; + meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; longDescription = '' diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 689e1e054dc0..f997f10db1dd 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hack-font-${version}"; +let version = "2.020"; +in fetchzip rec { + name = "hack-font-${version}"; - src = let - version_ = with stdenv.lib; - concatStringsSep "_" (splitString "." version); - in fetchurl { - sha256 = "16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - }; + url = let + version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); + in "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/hack - cp *.ttf $out/share/fonts/hack + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack ''; + sha256 = "0cpsglb9vnhmpsn496aqisfvmq3yxvjnj7c361dspy0fn6z8x60c"; + meta = with stdenv.lib; { description = "A typeface designed for source code"; longDescription = '' diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 01be8afd7aac..27459b2d1f3f 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hanazono-${version}"; +let version = "20141012"; +in fetchzip { + name = "hanazono-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-20141012.zip"; - sha256 = "020jhqnzm9jvkmfvvyk1my26ncwxbnb9yc8v7am252jwrifji9q6"; - }; + url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/hanazono - cp *.ttf $out/share/fonts/hanazono - mkdir -p $out/share/doc/hanazono - cp *.txt $out/share/doc/hanazono + postFetch = '' + mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; + sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + meta = with stdenv.lib; { description = "Free kanji font containing 96,327 characters"; homepage = http://fonts.jp/hanazono/; diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 3bca24379142..96af2e573a2f 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,27 +1,22 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "hasklig-${version}"; +let version = "1.1"; +in fetchzip { + name = "hasklig-${version}"; - src = fetchurl { - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q"; - }; + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/opentype cp *.otf $out/share/fonts/opentype ''; + sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + meta = with stdenv.lib; { - homepage = "https://github.com/i-tu/Hasklig"; + homepage = https://github.com/i-tu/Hasklig; description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 13e98462b215..a614017b8095 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "helvetica-neue-lt-std-${version}"; +let version = "2013.06.07"; # date of most recent file in distribution +in fetchzip rec { + name = "helvetica-neue-lt-std-${version}"; - src = fetchurl { - url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - sha256 = "0nrjdj2a11dr6d3aihvjxzrkdi0wq6f2bvaiimi5iwmpyz80n0h6"; - }; + url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "Helvetica Neue LT Std"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Helvetica\ Neue\ LT\ Std/\*.otf -d $out/share/fonts/opentype ''; + sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; + meta = { homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; description = "Helvetica Neue LT Std font"; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index caa67256a1fe..13aeae803124 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "inconsolata-${version}"; +let version = "1.010"; +in fetchzip { + name = "inconsolata-${version}"; - src = fetchurl { - url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"; - }; + url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - phases = [ "installPhase" ]; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v $src $out/share/fonts/opentype/inconsolata.otf - ''; + sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7"; meta = with stdenv.lib; { homepage = http://www.levien.com/type/myfonts/inconsolata.html; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 8cfda1a5e9c8..5217b175ed20 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "input-fonts-${version}"; - version = "2016-10-06"; # date of the download and checksum + version = "2017-08-10"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "http://input.fontbureau.com/download/"; - sha256 = "06hrsrb5a6hzrgkkhk0gdj92rhgr433vgn4j5g3pd8f1ijlfqn4y"; + sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; }; nativeBuildInputs = [ unzip ]; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cp -a *.txt "$out"/share/doc/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; longDescrition = '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 053a3ae76c1d..b72e5a27391f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,27 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "iosevka-${version}"; +let version = "1.13.1"; +in fetchzip rec { + name = "iosevka-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - src = fetchurl { - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; - }; - - sourceRoot = "."; - - installPhase = '' - fontdir=$out/share/fonts/iosevka - - mkdir -p $fontdir - cp -v iosevka-* $fontdir + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; + sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7"; + meta = with stdenv.lib; { - homepage = "http://be5invis.github.io/Iosevka/"; + homepage = https://be5invis.github.io/Iosevka/; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' Slender monospace sans-serif and slab-serif typeface inspired by Pragmata diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index e6d4b6734bf3..dfeab5124c84 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ipaexfont-003.01"; - src = fetchurl { - url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - sha256 = "0nmfyh10rzkvp0qmrla0dahkmmxq47678y4v8fdm8fpdzmf0kpn7"; - }; + url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - cp *.ttf $out/share/fonts/opentype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; + sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + meta = with stdenv.lib; { description = "Japanese font package with Mincho and Gothic fonts"; longDescription = '' diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 1f37630835d9..c056f14f46fd 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "ipafont-003.03"; - src = fetchurl { - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; - }; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - buildInputs = [ unzip ]; - - unpackPhase = '' - unzip $src + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp ./IPAfont00303/*.ttf $out/share/fonts/opentype/ - ''; + sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; meta = { description = "Japanese font package with Mincho and Gothic fonts"; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 875d63ee8ce1..8b1ddd0c7538 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "junicode-0.7.8"; - src = fetchurl { - url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl"; - }; + url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - buildInputs = [ unzip ]; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf + ''; - installPhase = - '' - mkdir -p $out/share/fonts/junicode-ttf - cp fonts/*.ttf $out/share/fonts/junicode-ttf - ''; + sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956"; meta = { homepage = http://junicode.sourceforge.net/; - description = "A Unicode font"; + description = "A Unicode font for medievalists"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 3680205e23b4..852fdec82f82 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "kawkab-mono-20151015"; - src = fetchurl { - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - sha256 = "16pv9s4q7199aacbzfi2d10rcrq77vyfvzcy42g80nhfrkz1cb0m"; - }; + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - buildInputs = [ unzip ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + meta = { description = "An arab fixed-width font"; - homepage = "http://makkuk.com/kawkab-mono/"; + homepage = https://makkuk.com/kawkab-mono/; license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index ea2c15752d7f..c24e68981296 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: let version = "20030809"; in -stdenv.mkDerivation { +fetchzip { name = "kochi-substitute-naga10-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; - }; + url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sourceRoot = "kochi-substitute-${version}"; - - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf ''; + sha256 = "1bjb5cr3wf3d5y7xj1ly2mkv4ndwvg615rb1ql6lsqc2icjxk7j9"; + meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 6337387b3763..f49d20e3ba7c 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hcrf51npc1w2jsz5aiw07dgw96vs4wmsz4ai9zyaswipvf8ddy"; + meta = { description = "Japanese font, a free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 8d1111090aab..91d85ce9a0dd 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lato-2.0"; - src = fetchurl { - url = http://www.latofonts.com/download/Lato2OFL.zip; - sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"; - }; + url = http://www.latofonts.com/download/Lato2OFL.zip; - sourceRoot = "Lato2OFL"; - - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/lato - cp *.ttf $out/share/fonts/lato + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato ''; + sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + meta = with stdenv.lib; { homepage = http://www.latofonts.com/; diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index e02ee967b677..82ceebae3275 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp */share/fonts/opentype/*.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0"; + meta = { description = "Font Collection by The League of Moveable Type"; @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { well-made, free & open-source, @font-face ready fonts. ''; - homepage = "https://www.theleagueofmoveabletype.com/"; + homepage = https://www.theleagueofmoveabletype.com/; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 964210c8dfe5..2e1f89ed1e72 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "liberastika-${version}"; +let version = "1.1.5"; +in fetchzip rec { + name = "liberastika-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj"; - }; + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile AUTHORS ChangeLog COPYING README -d "$out/share/doc/${name}" ''; + sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp"; + meta = with stdenv.lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = https://sourceforge.net/projects/lib-ka/; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index 64779b5d388f..18f236068a2f 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-baskerville-1.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; - sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; - }; + url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a"; + meta = with stdenv.lib; { description = "A webfont family optimized for body text"; longDescription = '' diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 691d5556e8f2..96f366973f0e 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-bodoni-2.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; - sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; - }; + url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw"; + meta = with stdenv.lib; { description = "Bodoni fonts adapted for today's web requirements"; longDescription = '' diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 5037cb81f393..ec932ab978c2 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; + meta = with stdenv.lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = http://www.impallari.com/librecaslon; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index 473102d77efd..9ca37e356409 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-franklin-1.014"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; - sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; - }; + url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z"; + meta = with stdenv.lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; homepage = https://github.com/impallari/Libre-Franklin; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index e694ba4db75e..6876000d6e41 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmodern-2.004.4"; - - src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; - sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; - }; - installPhase = '' + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + + postFetch = '' + tar xzvf $downloadedFile + mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r ./* $out/texmf-dist/ - cp -r fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.004.4/* $out/texmf-dist/ + cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/ - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix index 6e136c39eb00..c6e0788eed38 100644 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmmath-0.903"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64"; - name = "lmmath-0.903.zip"; - }; - buildInputs = [unzip]; + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sourceRoot = "."; + postFetch = '' + unzip $downloadedFile - installPhase = '' mkdir -p $out/texmf-dist/fonts/opentype mkdir -p $out/share/fonts/opentype cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index 84752fe6a1d7..850fd1a1f94c 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -65,6 +65,10 @@ in cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/lobstertwo; description = "Script font with many ligatures"; diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index c0454bc2730a..c847b4cdd270 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,57 +1,59 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchzip, lib }: let fonts = { - assamese = { version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; }; - bengali = { version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; }; - devanagari = { version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; }; - gujarati = { version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; }; - gurmukhi = { version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi - kannada = { version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; }; - malayalam = { version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; }; - marathi = { version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; }; - nepali = { version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; }; - odia = { version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya - tamil-classical = { version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; }; - tamil = { version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; }; - telugu = { version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; }; + assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; }; + bengali = { label = "Bengali"; version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; }; + devanagari = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; }; + gujarati = { label = "Gujarati"; version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; }; + malayalam = { label = "Malayalam"; version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; }; + marathi = { label = "Marathi"; version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; }; + nepali = { label = "Nepali"; version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; }; + odia = { label = "Odia"; version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; }; + tamil = { label = "Tamil"; version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; }; + telugu = { label = "Telugu"; version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; }; - konkani = { version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; }; - maithili = { version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; }; - sindhi = { version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; }; + konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; }; + maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; }; }; - mkpkg = license: name: {version, sha256}: - stdenv.mkDerivation { - name = "lohit-${name}-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/o/lohit/lohit-${name}-ttf-${version}.tar.gz"; - inherit sha256; - }; + mkpkg = license: name: {label, version, sha256}: fetchzip { + name = "lohit-${name}-${version}"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ + url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz"; - mkdir -p $out/etc/fonts/conf.d - cp -v *.conf $out/etc/fonts/conf.d + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 - mkdir -p "$out/share/doc/lohit-${name}" - cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" - ''; + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype/ - meta = { - inherit license; - homepage = https://fedorahosted.org/lohit/; - maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; - # Set a non-zero priority to allow easy overriding of the - # fontconfig configuration files. - priority = 5; - platforms = stdenv.lib.platforms.unix; - }; + mkdir -p $out/etc/fonts/conf.d + cp -v *.conf $out/etc/fonts/conf.d + + mkdir -p "$out/share/doc/lohit-${name}" + cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" + ''; + + inherit sha256; + + meta = { + inherit license; + description = "Free and open source fonts for Indian languages (" + label + ")"; + homepage = https://pagure.io/lohit; + maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; + platforms = stdenv.lib.platforms.unix; }; + }; in # Technically, GPLv2 with usage exceptions diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index e3f47cb8b0d4..48b2f4c516b6 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "marathi-cursive-${version}"; +let version = "1.2"; +in fetchzip rec { + name = "marathi-cursive-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - sha256 = "0zhqkkfkz5mhfz8xv305s16h80p9v1iva829fznxd2c44ngyplmc"; - }; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - buildInputs = [ p7zip ]; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile + cd MarathiCursive - unpackCmd = "7z x $curSrc"; - - installPhase = '' mkdir -p $out/share/fonts/marathi-cursive cp -v *.otf *.ttf $out/share/fonts/marathi-cursive mkdir -p $out/share/doc/${name} cp -v README *.txt $out/share/doc/${name} ''; + sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v"; + meta = with stdenv.lib; { - homepage = https://github.com/MihailJP/marathi-cursive; + homepage = https://github.com/MihailJP/MarathiCursive; description = "Modi script font with Graphite and OpenType support"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.mit; # It's the M+ license, M+ is MIT(-ish) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix new file mode 100644 index 000000000000..ea44c9c79b1e --- /dev/null +++ b/pkgs/data/fonts/material-icons/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "material-icons-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = "${version}"; + sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0"; + }; + + buildCommand = '' + mkdir -p $out/share/fonts/truetype + cp $src/iconfont/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "System status icons by Google, featuring material design"; + homepage = https://material.io/icons; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mpcsh ]; + }; +} diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index fe123f6622d0..8a11a98ebd23 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1cppf8sk6r5wjnnas9n6iyag6pj9jvaic66lvwpqg3742s5akx6x"; + meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = https://github.com/andreberg/Meslo-Font/; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index d93c0fb96d41..cc481a136ba7 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mononoki-${version}"; +let version = "1.2"; +in fetchzip { + name = "mononoki-${version}"; - src = fetchurl { - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg"; - }; + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" ]; - - unpackPhase = '' + postFetch = '' mkdir -p $out/share/fonts/mononoki - unzip $src -d $out/share/fonts/mononoki + unzip -j $downloadedFile -d $out/share/fonts/mononoki ''; + sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; + meta = with stdenv.lib; { homepage = https://github.com/madmalik/mononoki; description = "A font for programming and code review"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 70fd2060ff1e..7d7be9a41a61 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -2,22 +2,23 @@ # # https://aur.archlinux.org/packages/ttf-montserrat/ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "montserrat-${version}"; +let version = "1.0"; +in fetchzip { + name = "montserrat-${version}"; - src = fetchurl { - url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x"; - }; + url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/montserrat cp *.ttf $out/share/fonts/montserrat ''; + sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; + meta = with stdenv.lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; homepage = "http://www.fontspace.com/julieta-ulanovsky/montserrat"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 49d857ec575a..5729561c5809 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,23 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "MPH-2B-Damase"; - src = fetchurl { - url = http://www.wazu.jp/downloads/damase_v.2.zip; - sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; - }; + url = http://www.wazu.jp/downloads/damase_v.2.zip; - buildInputs = [unzip]; - - unpackPhase = '' - unzip $src; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; + sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 839d61206c2e..b70166b7ec17 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mplus-${version}"; +let version = "062"; +in fetchzip rec { + name = "mplus-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - sha256 = "1f44vmnma5njhfiz351gwblxmdh9njv486864zrxqaa1h5pvdhha"; - }; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z"; + meta = with stdenv.lib; { description = "M+ Outline Fonts"; homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 493a26e5556e..8986a9adb7a8 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "mro-unicode-2013-05-25" { - src = fetchurl { - url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; - sha256 = "1za74ych0sh97ks6qp9iqq9jankgnkrq65s350wsbianwi72di45"; - }; +fetchzip { + name = "mro-unicode-2013-05-25"; + + url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + + sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; meta = with lib; { homepage = https://github.com/phjamr/MroUnicode; @@ -14,7 +17,3 @@ runCommand "mro-unicode-2013-05-25" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/MroUnicode-Regular.ttf -'' diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index f90cb98b8024..054c2ca91f6e 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { # cp $riqa/*.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1wa0j65iz20ij37dazd1rjg8x625m6q1y8g5h7ia48pbc88sr01q"; + meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; longDescription = '' @@ -46,7 +50,7 @@ stdenv.mkDerivation rec { Al-Hussaini (Nafees Raqam) one of the finest calligraphers of Pakistan ''; - homepage = "http://www.cle.org.pk/software/localization.htm"; + homepage = http://www.cle.org.pk/software/localization.htm; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index d0d831f8cc71..4b725cbf5f8d 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./install.sh ${withFont} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0bxna3llj6kf1rndvkw8w81blmgwy9l8kricynlf0l3mdd6li1f4"; + meta = with stdenv.lib; { description = '' Nerd Fonts is a project that attempts to patch as many developer targeted @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others. ''; - homepage = "https://github.com/ryanoasis/nerd-fonts"; + homepage = https://github.com/ryanoasis/nerd-fonts; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = with platforms; unix; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index cc2a2617f344..35d69aa7f078 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = "norwester"; +let version = "1.2"; + pname = "norwester"; +in fetchzip rec { name = "${pname}-${version}"; - src = fetchurl { - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - sha256 = "0syg8ss7mpli4cbxvh3ld7qrlbhb2dfv3wchm765iw6ndc05g92d"; - }; + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - phases = [ "installPhase" ]; - - buildInputs = [ unzip ]; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -D -j $src ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ + unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ ''; + sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + meta = with stdenv.lib; { - homepage = "http://jamiewilson.io/norwester"; + homepage = http://jamiewilson.io/norwester; description = "A condensed geometric sans serif by Jamie Wilson"; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 28fce3799683..73059cbcc33a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: rec { # 18MB - noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation { + noto-fonts = let version = "git-2016-03-29"; in fetchzip { name = "noto-fonts-${version}"; - src = fetchFromGitHub { - owner = "googlei18n"; - repo = "noto-fonts"; - rev = "e8b0af48b15d64bd490edab4418b5e396cf29644"; - sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f"; - }; + url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip; + postFetch = '' + unzip $downloadedFile - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' mkdir -p $out/share/fonts/noto - cp hinted/*.ttf $out/share/fonts/noto + cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto # Also copy unhinted & alpha fonts for better glyph coverage, # if they don't have a hinted version # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) - cp -n unhinted/*.ttf $out/share/fonts/noto - cp -n alpha/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64"; meta = with stdenv.lib; { inherit version; @@ -49,27 +42,16 @@ rec { }; }; # 89MB - noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation { + noto-fonts-cjk = let version = "1.004"; in fetchzip { name = "noto-fonts-cjk-${version}"; - src = fetchurl { - # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file - url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; - sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6"; - }; - - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/noto - cp *.ttc $out/share/fonts/noto + # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file + url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index 411af37932af..4e55b5098c80 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "oldsindhi-${version}"; +let version = "0.1"; +in fetchzip rec { + name = "oldsindhi-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - sha256 = "1sbmxyxi81k88hkfw7gnnpgd5vy2vyj5y5428cd6nz4zlaclgq8z"; - }; + url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - buildInputs = [ p7zip ]; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile - unpackCmd = "7z x $curSrc"; - - installPhase = '' mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README *.txt $out/share/doc/${name} + cp -v OldSindhi/*.ttf $out/share/fonts/truetype/ + cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name} ''; + sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q"; + meta = with stdenv.lib; { homepage = https://github.com/MihailJP/oldsindhi; description = "Free Sindhi Khudabadi font"; diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index 125a4b636a99..95f8f3be7d65 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { cp -v FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/oldstand; description = "An attempt to revive a specific type of Modern style of serif typefaces"; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 5d9bb5843607..9b1324639720 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,29 +1,24 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "open-dyslexic-${version}"; +let version = "2014-11-11"; +in fetchzip { + name = "open-dyslexic-${version}"; - src = fetchgit { - url = "https://github.com/antijingoist/open-dyslexic.git"; - rev = "f4b5ba89018b44d633608907e15f93fb3fabbabc"; - sha256 = "04pa7c2cary6pqxsmxqrg7wi19szg7xh8panmvqvmc7jas0mzg6q"; - }; + url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v 'otf/'*.otf $out/share/fonts/opentype - - mkdir -p $out/share/doc/open-dyslexic - cp -v README.md $out/share/doc/open-dyslexic + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic ''; + sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; + meta = with stdenv.lib; { homepage = http://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; - license = "Bitstream Vera License (http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; + license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; maintainers = [maintainers.rycee]; }; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index c0d533ca6204..6f3762c971c9 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -1,29 +1,25 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD - -stdenv.mkDerivation rec { +fetchzip { name = "opensans-ttf-20140617"; - src = fetchurl { - url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4"; - }; + url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - sourceRoot = "."; - - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf"; + meta = { description = "Open Sans fonts"; longDescription = '' Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = "http://en.wikipedia.org/wiki/Open_Sans"; + homepage = https://en.wikipedia.org/wiki/Open_Sans; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index d68bf37f4da8..e0ef1ecda813 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "orbitron-${version}"; +let version = "20110526"; +in fetchzip { + name = "orbitron-${version}"; - src = fetchFromGitHub { - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; - sha256 = "1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf"; - }; + url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' otfdir=$out/share/fonts/opentype/orbitron ttfdir=$out/share/fonts/ttf/orbitron mkdir -p $otfdir $ttfdir - cp -v Orbitron*.otf $otfdir - cp -v Orbitron*.ttf $ttfdir + unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir + unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir ''; + sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + meta = with stdenv.lib; { - homepage = "https://www.theleagueofmoveabletype.com/orbitron"; + homepage = https://www.theleagueofmoveabletype.com/orbitron; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = '' Geometric sans-serif for display purposes by Matt McInerney''; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index e24d61d5ba1c..8bb4e82747ad 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "overpass-${version}"; +let version = "3.0.2"; +in fetchzip rec { + name = "overpass-${version}"; - src = fetchFromGitHub { - owner = "RedHatBrand"; - repo = "Overpass"; - rev = version; - sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6"; - }; + url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip"; - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/opentype - cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype - cp -v LICENSE.md README.md $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; + sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s"; + meta = with stdenv.lib; { homepage = http://overpassfont.org/; description = "Font heavily inspired by Highway Gothic"; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index 1054986288a8..109b3c3a0b3a 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "oxygenfonts-20160824"; - src = fetchFromGitHub { - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; - sha256 = "134kx3d0g3zdkw8kl8p6j37fzw3bl163jv2dx4dk1451f3ramcnh"; - }; + url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype/ - cp OxygenSans-version-0.4/*/*.ttf $out/share/fonts/truetype/ - cp Oxygen-Monospace/*.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype ''; + sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + meta = with stdenv.lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; longDescription = '' diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 7c7a8c530e21..6124d0c79b66 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-mono"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTMono.zip"; - sha256 = "1wqaai7d6xh552vvr5svch07kjn1q89ab5jimi2z0sbd0rbi86vl"; - }; + url = "http://www.paratype.ru/uni/public/PTMono.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + meta = with stdenv.lib; { - homepage = "http://www.paratype.ru/public/"; + homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index fe9d30854708..499871a4228d 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-sans"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSans.zip"; - sha256 = "1j9gkbqyhxx8pih5agr9nl8vbpsfr9vdqmhx73ji3isahqm3bhv5"; - }; + url = "http://www.paratype.ru/uni/public/PTSans.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + meta = with stdenv.lib; { - homepage = "http://www.paratype.ru/public/"; + homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index b0304c373867..409aaf526f81 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-serif"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - sha256 = "0x3l58c1rvwmh83bmmgqwwbw9av1mvvq68sw2hdkyyihjvamyvvs"; - }; + url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + meta = with stdenv.lib; { - homepage = "http://www.paratype.ru/public/"; + homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 7650c13961ee..b57cf22569d2 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "pecita-${version}"; +let version = "5.4"; +in fetchzip rec { + name = "pecita-${version}"; - src = fetchurl { - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; - }; + url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + postFetch = '' + tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf ''; + sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + meta = with stdenv.lib; { homepage = http://pecita.eu/police-en.php; description = "Handwritten font with connected glyphs"; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 7298dbb18cef..b27290707b6b 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp ${italic} $out/share/fonts/opentype/Poly-Italic.otf ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "11d7ldryfxi0wzfrg1bhw23a668a44vdb8gggxryvahmp5ahmq2h"; + meta = { description = "Medium contrast serif font"; longDescription = '' diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index dbfb49f1bedd..9f42324e6d6d 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,34 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation { - name = "powerline-fonts-2015-12-11"; +fetchzip { + name = "powerline-fonts-2017-05-25"; - src = fetchFromGitHub { - owner = "powerline"; - repo = "fonts"; - rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92"; - sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn"; - }; + url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip; - dontBuild = true; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v */*.otf $out/share/fonts/opentype + unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype mkdir -p $out/share/fonts/truetype - cp -v */*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype mkdir -p $out/share/fonts/bdf - cp -v */BDF/*.bdf $out/share/fonts/bdf + unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf mkdir -p $out/share/fonts/pcf - cp -v */PCF/*.pcf.gz $out/share/fonts/pcf + unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf mkdir -p $out/share/fonts/psf - cp -v */PSF/*.psf.gz $out/share/fonts/psf + unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf ''; + sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388"; + meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; description = "Patched fonts for Powerline users"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 98227605ac84..0c6eede969f1 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "profont"; - src = fetchurl { - url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; - sha256 = "19ww5iayxzxxgixa9hgb842xd970mwghxfz2vsicp8wfwjh6pawr"; - }; + url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; - buildInputs = [ unzip ]; + postFetch = '' + unzip -j $downloadedFile - phases = [ "unpackPhase" "installPhase" ]; - installPhase = - '' - mkdir -p $out/share/doc/$name $out/share/fonts/misc + mkdir -p $out/share/doc/$name $out/share/fonts/misc - cp LICENSE $out/share/doc/$name/LICENSE + cp LICENSE $out/share/doc/$name/LICENSE - for f in *.pcf; do - gzip -c "$f" > $out/share/fonts/misc/"$f".gz - done - ''; + for f in *.pcf; do + gzip -c "$f" > $out/share/fonts/misc/"$f".gz + done + ''; + + sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw"; meta = with stdenv.lib; { homepage = http://tobiasjung.name; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 9a4cfb3093bc..9637a6c85b02 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "proggyfonts-0.1"; src = fetchurl { - url = "http://kaictl.net/software/${name}.tar.gz"; + url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "06jsf3rw6q4l1jrw1161h4vxa1xbvpry5x12d8sh5g7hjk88p77g"; + meta = with stdenv.lib; { homepage = http://upperbounds.net; description = "A set of fixed-width screen fonts that are designed for code listings"; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 116fdd25a04e..34c8a74a7626 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-sans-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "quattrocento-sans-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1"; - }; + url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "quattrocento-sans-v${version}"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype + unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} ''; + sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocentosans/; description = "A classic, elegant and sober sans-serif typeface"; diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 7ef62d2300c5..a78001bb4ae6 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "quattrocento-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n"; - }; + url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocento/; description = "A classic, elegant, sober and strong serif typeface"; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index e754135755a6..2ba9069d48be 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "raleway-${version}"; +let version = "2016-08-30"; +in fetchzip { + name = "raleway-${version}"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; - sha256 = "1i6a14ynm29gqjr7kfk118v69vjpd3g4ylwfvhwa66xax09jkhlr"; - }; - dontBuild = true; + url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype - find -type f -maxdepth 1 -exec cp "{}" $out/ \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*-Original.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt \*.md -d $out ''; + sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + meta = { description = "Raleway is an elegant sans-serif typeface family"; @@ -35,7 +32,7 @@ stdenv.mkDerivation rec { It also has a sister display family, Raleway Dots. ''; - homepage = src.meta.homepage; + homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; maintainers = with stdenv.lib.maintainers; [ profpatsch ]; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index a0511c6a353d..3fbcefc3187c 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -4,23 +4,27 @@ let inherit (python2.pkgs) fonttools; common = - {version, url, sha256, buildInputs}: + {version, url, sha256, buildInputs, postPatch ? null, outputHash}: stdenv.mkDerivation rec { name = "liberation-fonts-${version}"; src = fetchurl { inherit url sha256; }; - inherit buildInputs; + inherit buildInputs postPatch; installPhase = '' mkdir -p $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + mkdir -p "$out/share/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + inherit outputHash; + meta = with stdenv.lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' @@ -36,7 +40,7 @@ let ''; license = licenses.ofl; - homepage = https://fedorahosted.org/liberation-fonts/; + homepage = https://pagure.io/liberation-fonts/; maintainers = [ maintainers.raskin ]; @@ -47,26 +51,35 @@ let in { liberation_ttf_v1_from_source = common rec { version = "1.07.4"; - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz"; + url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; - buildInputs = [ fontforge fonttools ]; + buildInputs = [ fontforge ]; + outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; }; liberation_ttf_v1_binary = common rec { version = "1.07.4"; - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; + url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; buildInputs = [ ]; + outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; }; liberation_ttf_v2_from_source = common rec { version = "2.00.1"; - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz"; + url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; buildInputs = [ fontforge fonttools ]; + postPatch = '' + substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ + 'font = ttLib.TTFont(fontfile)' \ + 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' + ''; + outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; }; liberation_ttf_v2_binary = common rec { version = "2.00.1"; - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; + url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; buildInputs = [ ]; + outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; }; } diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index e9eff414bc1d..175acb22d7b2 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Mono; description = "Google Roboto Mono fonts"; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 5a8a3f3c1201..c5ce13ad7ae4 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Slab; description = "Google Roboto Slab fonts"; diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index fbb364b9d721..00c4bb7fb886 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "roboto-${version}"; +let version = "2.136"; +in fetchzip rec { + name = "roboto-${version}"; - src = fetchurl { - url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201"; - }; + url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7"; + meta = { homepage = https://github.com/google/roboto; description = "The Roboto family of fonts"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 57639d8e6ab9..90b32f251ef6 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "sampradaya-2015-05-26" { - src = fetchurl { - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; - sha256 = "0110k1yh5kz3f04wp72bfz59pxjc7p6jv7m5p0rqn1kqbf7g3pck"; - }; +fetchzip { + name = "sampradaya-2015-05-26"; + + url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + + sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; meta = with lib; { homepage = https://bitbucket.org/OorNaattaan/sampradaya/; @@ -14,7 +17,3 @@ runCommand "sampradaya-2015-05-26" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/Sampradaya.ttf -'' diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 942a284e2c0d..034c36a63cec 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2016-03-03"; +in fetchzip { name = "shrikhand-${version}"; - src = fetchFromGitHub { - owner = "jonpinhorn"; - repo = "shrikhand"; - rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394"; - sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk"; - }; + url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf; - installPhase = '' - install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf - ''; + postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; + + sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; meta = with stdenv.lib; { homepage = https://jonpinhorn.github.io/shrikhand/; diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix index 147f4edc5198..883e43b4381f 100644 --- a/pkgs/data/fonts/signwriting/default.nix +++ b/pkgs/data/fonts/signwriting/default.nix @@ -13,6 +13,10 @@ runCommand "signwriting-1.1.4" { sha256 = "0am5wbf7jdy9szxkbsc5f3959cxvbj7mr0hy1ziqmkz02c6xjw2m"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q"; + meta = with lib; { homepage = https://github.com/Slevinski/signwriting_2010_fonts; description = "Typeface for written sign languages"; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index c5ad1d1e1b60..b695143fa592 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "siji-${date}"; +let date = "2016-05-13"; +in fetchzip { + name = "siji-${date}"; - src = fetchFromGitHub { - owner = "stark"; - repo = "siji"; - rev = "95369afac3e661cb6d3329ade5219992c88688c1"; - sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; - }; + url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; - installPhase = '' - mkdir -p $out/share/fonts/pcf - cp -v */*.pcf $out/share/fonts/pcf + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.pcf -d $out/share/fonts/pcf ''; + sha256 = "1799hs7zd8w7qyja4mii9ggmrm786az7ldsqwx9mbi51b56ym640"; + meta = { - homepage = "https://github.com/stark/siji"; + homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; liscense = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index f5d065fd9c4a..95c568821879 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-code-pro-${version}"; +let version = "2.030"; +in fetchzip { + name = "source-code-pro-${version}"; - src = fetchFromGitHub { - owner = "adobe-fonts"; - repo = "source-code-pro"; - rev = "2.030R-ro/1.050R-it"; - name = "2.030R-ro-1.050R-it"; - sha256 = "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n"; - }; + url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip; - phases = "unpackPhase installPhase"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv"; + meta = { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with stdenv.lib.maintainers; [ relrod ]; platforms = with stdenv.lib.platforms; all; - homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/"; + homepage = https://blog.typekit.com/2012/09/24/source-code-pro/; license = stdenv.lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 240f0ff5d290..dc0d31758514 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.004R"; - name = "source-han-sans-${variant}-${version}"; revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa"; + in fetchzip { + name = "source-han-sans-${variant}-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSans* ) + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype - ''; + inherit sha256; meta = { description = "${language} subset of an open source Pan-CJK sans-serif typeface"; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw"; + sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q"; + sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha"; + sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj"; + sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr"; }; } diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix index 148f5a4538f5..ac85d31d3316 100644 --- a/pkgs/data/fonts/source-han-serif/default.nix +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -1,27 +1,21 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.000R"; - name = "source-han-serif-${variant}-${version}"; revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + in fetchzip { + name = "source-han-serif-${variant}-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSerif* ) - ''; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + inherit sha256; + meta = { description = "${language} subset of an open source Pan-CJK serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06"; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 83b6a3f2d578..4ae9ceac01df 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "source-sans-pro-2.010"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz"; - sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2"; - }; - phases = "unpackPhase installPhase"; + url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourcesans; description = "A set of OpenType fonts designed by Adobe for UIs"; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index 0ccb0299a364..d627d813daa7 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-serif-pro-${version}"; +let version = "1.017"; +in fetchzip { + name = "source-serif-pro-${version}"; - src = fetchurl rec { - url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz"; - sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg"; - }; + url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip"; - phases = "unpackPhase installPhase"; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourceserifpro; description = "A set of OpenType fonts to complement Source Sans Pro"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f32d865c95c7..1ae85da3f7f3 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -1,25 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "stix-otf-${version}"; +let version = "1.1.1"; +in fetchzip rec { + name = "stix-otf-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q"; - }; + url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "Fonts/STIX-Word"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index d4ec083a0708..f535c0d7e7b5 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "stix-two-${version}"; +let version = "2.0.0"; +in fetchzip { + name = "stix-two-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g"; - }; + url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - buildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 0b9a63f2cb38..7778c4a98b81 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -1,11 +1,14 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: { -tai-ahom = runCommand "tai-ahom-2015-07-06" { - src = fetchurl { - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; - sha256 = "0zpjsylm29qc3jdv5kv0689pcirai46j7xjp5dppi0fmzxaxqnsk"; - }; +tai-ahom = fetchzip { + name = "tai-ahom-2015-07-06"; + + url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + + sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; meta = with lib; { homepage = https://github.com/enabling-languages/tai-languages; @@ -14,11 +17,7 @@ tai-ahom = runCommand "tai-ahom-2015-07-06" { license = licenses.ofl; # See font metadata platforms = platforms.all; }; -} -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/AhomUnicode.ttf -''; +}; # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index c934bdb70e39..d0e7b89888c3 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation { mkdir -p "$out/share/fonts/opentype/public" cp ${toString srcs} "$out/share/fonts/opentype/public" ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; + meta = { description = ''Tempora font''; license = stdenv.lib.licenses.gpl2 ; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 01959f91195f..8750dfbd52d4 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "terminus-font-ttf-${version}"; +let version = "4.40.1"; +in fetchzip rec { + name = "terminus-font-ttf-${version}"; - src = fetchurl { - url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; - }; + url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - nativeBuildInputs = [ unzip ]; + postFetch = '' + unzip -j $downloadedFile - installPhase = '' for i in *.ttf; do local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" @@ -20,6 +18,8 @@ stdenv.mkDerivation rec { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; + sha256 = "0cfkpgixdz47y94s9j26pm7n4hvad23vb2q4315kgahl4294zcpg"; + meta = with stdenv.lib; { description = "A clean fixed width TTF font"; longDescription = '' diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 29c4c250fb96..c1ee2250c9a2 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "terminus-font-4.40"; + name = "terminus-font-4.46"; src = fetchurl { url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz"; - sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4"; + sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf"; }; - buildInputs = [ perl bdftopcf mkfontdir mkfontscale ]; + buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; patchPhase = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 2b2a71bf7b49..e499eb412bac 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { bdftopcf -o ''${i/bdf/pcf} $i done - gzip *.pcf + gzip -n *.pcf ''; installPhase = '' @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq"; + meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { particularily useful while programming, to fit a lot of code on your screen. ''; - homepage = "https://github.com/lucy/tewi-font"; + homepage = https://github.com/lucy/tewi-font; license = { fullName = "GNU General Public License with a font exception"; url = "https://www.gnu.org/licenses/gpl-faq.html#FontException"; diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index c385c3d40a92..2dbe7e720d2f 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "theano-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "theano-${version}"; - src = fetchzip { - stripRoot = false; - url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp"; - }; + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/theano; description = "An old-style font designed from historic samples"; diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 45d88901ea77..1a4954e6ce40 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "tipa-1.3"; - + src = fetchurl { url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz"; sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m"; @@ -13,9 +13,13 @@ stdenv.mkDerivation { mkdir -p "$PREFIX" "$out/share" make install PREFIX="$PREFIX" - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1g2cclykr6ax584rlcri8w2h385n624sgfx2fm45r0cwkg1p77h2"; + meta = { description = "Phonetic font for TeX"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 0ab7657cc6f7..a4d479ea33c5 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "ttf-bitstream-vera-1.10"; - src = fetchurl { - url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; - }; + url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - dontBuild = true; - - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 fontDir=$out/share/fonts/truetype mkdir -p $fontDir cp *.ttf $fontDir ''; + sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 8db10d7f582c..2c58f197f188 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: + let pname = "ttf-envy-code-r"; version = "PR7"; -in -stdenv.mkDerivation rec { +in fetchzip { name = "${pname}-0.${version}"; - src = fetchurl { - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff"; - }; + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - buildInputs = [unzip]; - - installPhase = '' - for f in *.ttf; do - install -Dm 644 "$f" "$out/share/fonts/truetype/$f" - done - install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt" + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" ''; + sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; + meta = with stdenv.lib; { homepage = http://damieng.com/blog/tag/envy-code-r; description = "Free scalable coding font by DamienG"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 61e12848d97e..e78f86fede44 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ubuntu-font-family-0.83"; - buildInputs = [unzip]; - src = fetchurl { - url = "http://font.ubuntu.com/download/${name}.zip"; - sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"; - }; + url = "http://font.ubuntu.com/download/${name}.zip"; - installPhase = - '' - mkdir -p $out/share/fonts/ubuntu - cp *.ttf $out/share/fonts/ubuntu - ''; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu + ''; + + sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; meta = { description = "Ubuntu Font Family"; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index b9af7fad165e..75ab2f40b6f1 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; + meta = with stdenv.lib; { description = "Unicode bitmap fonts"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 63f74bb41b4a..ce18893ced7d 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7"; + meta = { description = "Unicode VGA font"; maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index bd99d20480bf..4d9f3fc71047 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1s7gpxxj760aw3rpk760s3w8qdkn819rs7si1qj4grm3s6hb2gd8"; + meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; homepage = http://unifoundry.com/unifont.html; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 7f7b53526e50..8a3fd2d60353 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "unifont_upper-${version}"; +let version = "9.0.03"; +in fetchzip rec { + name = "unifont_upper-${version}"; - ttf = fetchurl { - url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - sha256 = "015v39y6nnyz4ld006349jzk9isyaqp4cnvmz005ylfnicl4zwhi"; - }; + url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - phases = "installPhase"; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - installPhase = - '' - mkdir -p $out/share/fonts/truetype - cp -v ${ttf} $out/share/fonts/truetype/unifont_upper.ttf - ''; + sha256 = "0anja3wrdjw0czqqk6wpf9yrkp0b11hb98wzmrpyij9gfgrspd71"; meta = with stdenv.lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index d318f5db7a7e..64e01124a67d 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = http://unifoundry.com/LICENSE.txt; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://pelulamu.net/unscii/"; + homepage = http://pelulamu.net/unscii/; }; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 5fea1f795fd3..f84d067eed83 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,24 +1,14 @@ -{stdenv, fetchurl, cabextract}: +{stdenv, fetchzip, cabextract}: -stdenv.mkDerivation { +fetchzip { name = "vista-fonts-1"; - src = fetchurl { - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; - }; + url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - buildInputs = [cabextract]; + postFetch = '' + ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile + ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab - unpackPhase = '' - cabextract --lowercase --filter ppviewer.cab $src - cabextract --lowercase --filter '*.TTF' ppviewer.cab - sourceRoot=. - ''; - - dontBuild = true; - - installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -31,6 +21,8 @@ stdenv.mkDerivation { done ''; + sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index c0665b2f0ccf..038f03169402 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "wqy-microhei-0.2.0-beta"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; - installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc''; + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc + ''; + + sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; meta = { description = "A (mainly) Chinese Unicode font"; diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 92f043c7fc07..9718763d004a 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "wqy-zenhei-${version}"; +let version = "0.9.45"; +in fetchzip rec { + name = "wqy-zenhei-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; - dontBuild = true; + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts + install -m644 *.ttc $out/share/fonts/ + ''; - installPhase = - '' - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ - ''; + sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; meta = { description = "A (mainly) Chinese Unicode font"; @@ -25,4 +23,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 12f8c1c741e9..c3ba435cbbf9 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/khaledhosny/xits-math"; + homepage = https://github.com/khaledhosny/xits-math; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index d1fa36540707..0a0ff4263ec6 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.0"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "08pkk4299dj442dby15lwxwz7bax5d3828v1f81mbll084k7vssm"; + sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm"; }; dontBuild = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Elementary icon theme"; - homepage = "https://launchpad.net/elementaryicons"; + homepage = https://launchpad.net/elementaryicons; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ simonvandel ]; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 083ea80a69d6..e5a3faf7742b 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Default fallback theme used by implementations of the icon theme specification"; - homepage = http://icon-theme.freedesktop.org/releases/; + homepage = https://icon-theme.freedesktop.org/releases/; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index e0ea56831b4d..9e793caf9de8 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; - homepage = http://snwh.org/paper; + homepage = https://snwh.org/paper; license = with licenses; [ cc-by-sa-40 lgpl3 ]; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 70bf0186f1cc..6f9396d1b941 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20170616"; + version = "20170715"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = "${version}"; - sha256 = "008nkmxp3f9qqljif3v9ns3a8mflzffv2mm5zgjng9pmdl5x70j4"; + sha256 = "0mpmgpjwc7azhypvrlnxaa0c4jc6g7vgy242apxrn8jcv9ndmwyk"; }; dontBuild = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Papirus icon theme for Linux"; - homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; + homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; license = licenses.lgpl3; platforms = platforms.all; }; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index cf78a9f9901a..b6def37def6f 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme ''; meta = with lib; { - homepage = "http://jimmac.musichall.cz"; + homepage = http://jimmac.musichall.cz; description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-nc-sa-30; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 5095fce8958e..275ae6dc2d86 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF - cp ${certdata2pem} certdata2pem.py + cat ${certdata2pem} > certdata2pem.py + patch -p1 < ${./fix-unicode-ca-names.patch} ${optionalString includeEmail '' # Disable CAs used for mail signing substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] ''' @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://curl.haxx.se/docs/caextract.html; + homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ wkennington fpletz ]; diff --git a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch new file mode 100644 index 000000000000..07d3629196a7 --- /dev/null +++ b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch @@ -0,0 +1,20 @@ +--- a/certdata2pem.py 2017-08-01 23:10:00.000000000 +0300 ++++ b/certdata2pem.py 2017-08-01 23:08:21.131297636 +0300 +@@ -88,7 +88,7 @@ + \# Read blacklist. + blacklist = [] + if os.path.exists('blacklist.txt'): +- for line in open('blacklist.txt', 'r'): ++ for line in io.open('blacklist.txt', 'r', encoding='utf-8'): + line = line.strip() + if line.startswith('#') or len(line) == 0: + continue +@@ -101,7 +101,7 @@ + if obj['CKA_CLASS'] != 'CKO_NSS_TRUST': + continue + if obj['CKA_LABEL'] in blacklist: +- print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) ++ print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8')) + elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR': + trust[obj['CKA_LABEL']] = True + elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR': diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3db05bd4d518..1cbf5e2adafa 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = "http://ddccontrol.sourceforge.net/"; + homepage = http://ddccontrol.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix new file mode 100644 index 000000000000..3d3bca29d15f --- /dev/null +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl }: + +let + + rootHints = fetchurl { + url = "https://www.internic.net/domain/named.root"; + sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473"; + }; + + rootKey = ./root.key; + rootDs = ./root.ds; + +in + +stdenv.mkDerivation { + name = "dns-root-data-2017-07-26"; + + buildCommand = '' + mkdir $out + cp ${rootHints} $out/root.hints + cp ${rootKey} $out/root.key + cp ${rootDs} $out/root.ds + ''; + + meta = with lib; { + description = "DNS root data including root zone and DNSSEC key"; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds new file mode 100644 index 000000000000..7578e0405d9d --- /dev/null +++ b/pkgs/data/misc/dns-root-data/root.ds @@ -0,0 +1,2 @@ +. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5 +. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key new file mode 100644 index 000000000000..c0da7b3f60fa --- /dev/null +++ b/pkgs/data/misc/dns-root-data/root.key @@ -0,0 +1,2 @@ +. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} +. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/data/misc/dns-root-data/update-root-key.sh new file mode 100755 index 000000000000..9a3141aef197 --- /dev/null +++ b/pkgs/data/misc/dns-root-data/update-root-key.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p busybox unbound + +TMP=`mktemp` +unbound-anchor -a "$TMP" +grep -Ev "^($$|;)" "$TMP" | sed -e 's/ ;;.*//' > root.key + +unbound-anchor -F -a "$TMP" +sed '/^;/d' < "$TMP" > root.ds +rm $TMP diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 2bdeb2977641..4d824e6e8d77 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; + homepage = http://www.freedesktop.org/wiki/Software/media-player-info/; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix new file mode 100644 index 000000000000..1c14bcc9f981 --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchFromGitHub, imagemagick }: + +stdenv.mkDerivation { + name = "nixos-icons-2017-03-16"; + srcs = fetchFromGitHub { + owner = "NixOS"; + repo = "nixos-artwork"; + rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b"; + sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; + }; + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + buildInputs = [ imagemagick ]; +} diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 254f13825abc..2eebe61b142e 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -29,7 +29,7 @@ in name = "gnome-dark-2015-02-27"; description = "Gnome Dark background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; }; }; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 59f4724e1bee..f0f6505cb247 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://poppler.freedesktop.org/; + homepage = https://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 7e2eefd3f1c3..484aa4e5a232 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool , libxml2, glib}: -let version = "1.7"; in +let version = "1.8"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "0bjd2j1rqrj150mr04j7ib71lfdlgbf235fg8d70g8mszqf7ik7a"; + sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a"; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 7784e59e4b2b..843055a2c450 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "TZDIR=$(out)/share/zoneinfo" "ETCDIR=$(TMPDIR)/etc" "LIBDIR=$(dev)/lib" - "MANDIR=$(man)/man" + "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" ]; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a527765688d6..a955f5cf8a48 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ruby }: +{ lib, stdenv, fetchurl }: let @@ -10,8 +10,6 @@ let inherit sha256; }; - buildInputs = [ ruby ]; - dontBuild = true; installPhase = '' @@ -23,9 +21,6 @@ let # Backwards compatibility. Will remove eventually. mkdir -p $out/xml/xsl ln -s $dst $out/xml/xsl/docbook - - ln -sv $dst/epub/bin $out - chmod +x $out/bin/dbtoepub ''; meta = { diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 578e0180ec39..7debe119aa1c 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Frank Wen's pro-quality GM/GS soundfont"; - homepage = "http://www.hammersound.net/"; + homepage = http://www.hammersound.net/; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index a8b5e08abd65..c132f565632c 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -2,6 +2,7 @@ rec { #### CORE EFL efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; + efl_1_19 = callPackage ./efl.nix { eflVersion = "1.19.1"; openjpeg = pkgs.openjpeg_1; }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; @@ -10,5 +11,5 @@ rec { econnman = callPackage ./econnman.nix { }; terminology = callPackage ./terminology.nix { }; rage = callPackage ./rage.nix { }; - ephoto = callPackage ./ephoto.nix { }; + ephoto = callPackage ./ephoto.nix { efl = efl_1_19; }; } diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 60e63dc68ed9..7739e2bd09ec 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; @@ -11,12 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus ]; + buildInputs = [ efl python2Packages.python dbus curl ]; pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; postInstall = '' wrapPythonPrograms + wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib ''; meta = { diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index e9302fca674b..00980d4a94d1 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -4,15 +4,20 @@ , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , curl, libinput, systemd, writeText +# Support more than one version because for now ephoto does not work with efl-1.20.x +, eflVersion ? "1.20.2" }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.19.1"; + version = eflVersion; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc"; + sha256 = { + "1.19.1" = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc"; + "1.20.2" = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55"; + }.${version}; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 968cf8baf6ab..7976176af1b9 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, -mesa_glu , xkeyboard_config }: +mesa_glu, xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.8"; + version = "0.21.9"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0cjjiip12hd8bfjl9ccl3vzl81pxh1wpymxk2yvrzf6ap5girhps"; + sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index b0606e957922..ee6013dae290 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl }: +{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; @@ -9,13 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31"; }; - nativeBuildInputs = [ - pkgconfig - ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - efl - ]; + buildInputs = [ efl curl ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" @@ -29,6 +25,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; + postInstall = '' + wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib + ''; + meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; homepage = http://smhouston.us/ephoto/; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index a92221050580..4d102b31e3b9 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav + curl ]; NIX_CFLAGS_COMPILE = [ @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; + postInstall = '' + wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib + ''; + meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index fc36a7e7a656..5f2db064af24 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl }: +{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ efl ]; + buildInputs = [ efl curl ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-1" ]; + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib + done + ''; + meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index b33afb50e99a..e7f687d96068 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.pygtk.org"; + homepage = http://www.pygtk.org; description = "Python bindings for GNOME desktop packages"; license = licenses.lgpl21; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 9e099a17d277..f571cf8738f6 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://pygtk.org/"; + homepage = http://pygtk.org/; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 36608f4294bd..75db62554360 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tray status icon, which notifies us when new email arrives"; - homepage = "http://www.nongnu.org/mailnotify/"; + homepage = http://www.nongnu.org/mailnotify/; license = with licenses; [ gpl3 ]; platforms = platforms.unix; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 7b23d91e5490..dc8181414ce1 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index d1f748c993d8..afa27a93bad5 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" ]; buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index de06c671e725..d5be7137c8fa 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gtkglext/; + homepage = https://projects.gnome.org/gtkglext/; description = "GtkGLExt, an OpenGL extension to GTK+"; longDescription = '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index c802f9636eb1..8da7fab90371 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, libnotify, gtkspell3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}: let majVer = gnome3.version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { libcanberra_gtk3 bogofilter gnome3.libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas dconf + gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.glib_networking openldap ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix new file mode 100644 index 000000000000..1179b2fdc5cf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, + wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Ghex; + description = "Hex editor for GNOME desktop environment"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix new file mode 100644 index 000000000000..edaa51d94784 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "ghex-3.18.3"; + + src = fetchurl { + url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz; + sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix index a827831c801c..f14a1ef3c47d 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -1,15 +1,15 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup -, gnome3, wrapGAppsHook }: +, gnome3, wrapGAppsHook, telepathy_logger }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ telepathy_idle ]; + propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas + telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix index e59df06f8a05..58d5a5b8cdc5 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, vala_0_32 , pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup +, wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11_kit, openssh }: @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg + gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr + libsecret avahi libsoup p11_kit vala_0_32 openssh ]; preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix index d63b6e86af3b..2d71f1da5925 100644 --- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }: +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }: let majorVersion = "0.4"; @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; + [ glib gtk clutter at_spi2_core dbus pythonPackages.python + pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - preBuild = '' + postPatch = '' patchShebangs . substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" ''; diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix index 7629e5b56550..559e9b8575a2 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix @@ -4,12 +4,23 @@ , librsvg, gobjectIntrospection , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps +, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + patches = [ + (fetchpatch { + name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630 + url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96"; + sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy"; + }) + ]; + # 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*/ ]; buildInputs = [ intltool perl perlXMLParser libxml2 @@ -43,10 +54,12 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") ''; + enableParallelBuilding = true; + doCheck = false; # would need pythonPackages.dogTail, which is missing meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; + homepage = https://www.gnome.org/projects/evince/; description = "GNOME's document viewer"; longDescription = '' diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix index 36572a58e17e..07997a5c095a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evince-3.22.0"; + name = "evince-3.22.1"; src = fetchurl { - url = mirror://gnome/sources/evince/3.22/evince-3.22.0.tar.xz; - sha256 = "22ebabf890057e8b43020ffdebdbb57d6a586beba031838f0f0c8a596c479d46"; + url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz; + sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix index b67795ea59c1..c2038ecdce60 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python +{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] ++ stdenv.lib.optional valaSupport vala_0_32; @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + for f in $(find $out/libexec/ -type f -executable); do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" done ''; diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix index d3b2d814b164..1729ec066233 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; + homepage = https://projects.gnome.org/gconf/; description = "A system for storing application preferences"; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix index ac5572decb8c..1141db03c407 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_24, pango, readline, glib, libxml2, dbus }: +, spidermonkey_31, pango, readline, glib, libxml2, dbus }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ]; - propagatedBuildInputs = [ spidermonkey_24 ]; + propagatedBuildInputs = [ spidermonkey_31 ]; postInstall = '' sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix index 1f4ef08f9b12..7af8d7c531b3 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix @@ -1,11 +1,11 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - name = "gjs-${major}.0"; - major = "1.46"; + name = "gjs-${major}.4"; + major = "1.47"; src = fetchurl { url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz"; - sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4"; + sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix index 8097cf32ba6e..66cc2cb24c73 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix @@ -1,9 +1,9 @@ { stdenv, intltool, fetchurl, evolution_data_server, db , pkgconfig, gtk3, glib, libsecret , libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: +, libsoup, vala_0_32, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -18,19 +18,17 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify + gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.defaultIconTheme librsvg libchamplain clutter_gtk geocode_glib - vala_0_32 automake115x autoconf db ]; + vala_0_32 automake autoconf db ]; preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; patches = [ ./gio_unix.patch ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index eac25b3e5693..b116c2902da3 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook , libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas + [ 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 - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker + gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook + networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker cracklib ]; preBuild = '' @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { ''; preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + ) for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix index c329d68674a4..f22f4665c142 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; + homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix index d0ec2307a852..16d7151ea096 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool +, bash, wrapGAppsHook, itstool , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix index 90209634fbf1..ee8c3a902d59 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; meta = { - homepage = "http://www.gnome.org"; + homepage = http://www.gnome.org; description = "Gnome menu specification"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix index 85c15042614b..29f6ae3e860e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu +, telepathy_glib, intltool, dbus_libs, icu, glib_networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3 }: @@ -11,16 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper - libsecret dbus_glib telepathy_glib intltool icu libsoup + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook + libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix index 29ebe8b0ca64..34f8cee625aa 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; + homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; description = "Utility used in the GNOME desktop environment for taking screenshots"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix index 8f77b7e5e3b1..2ce3f9e39271 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon - pythonEnv gobjectIntrospection ]; + pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; @@ -39,11 +39,13 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix index 50ee229cfa49..aa6f48ac420b 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix index bdbdefecf229..8c3bf86edcfe 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper + gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix index d0453ba8ebbf..43e27cdb4814 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = "https://developer.gnome.org/gtksourceviewmm/"; + homepage = https://developer.gnome.org/gtksourceviewmm/; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix index 05344a33025e..4141afeb821d 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME CSS2 parsing and manipulation toolkit"; - homepage = "https://git.gnome.org/browse/libcroco"; + homepage = https://git.gnome.org/browse/libcroco; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix index c6c9323c010a..689ece9ad788 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix index 1ba143539d40..9f1f30965330 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix index 72ebd543e902..b086e3860597 100644 --- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt +, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite + gnome3.gsettings_desktop_schemas wrapGAppsHook + file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { ''; preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix index cbb52c9aaa12..4f56439311ec 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix index 3181348d843c..09b83e14923f 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 12a9ae0b5afe..1944cc98cfb2 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -14,7 +14,7 @@ let callPackage = pkgs.newScope self; version = "3.22"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; + maintainers = with pkgs.lib.maintainers; [ lethalman ]; corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus @@ -268,6 +268,8 @@ let gedit = callPackage ./apps/gedit { }; + ghex = callPackage ./apps/ghex { }; + glade = callPackage ./apps/glade { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix index bc42c900de9e..cf200cb32925 100644 --- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Nemiver"; + homepage = https://wiki.gnome.org/Apps/Nemiver; description = "Easy to use standalone C/C++ debugger"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix index 3d3e424d0da8..a4cad01488d5 100644 --- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + homepage = https://wiki.gnome.org/Apps/Swell%20Foop; description = "Puzzle game, previously known as Same GNOME"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix index d27e10f104c3..69d89bd58795 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.4"; + version = "${majorVersion}.6"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd"; + sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"; }; preConfigure = '' diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix index 3ceabe70ad80..37cdfc730ab8 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, +{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base, glib, gobjectIntrospection, telepathy_glib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = ''./autogen.sh''; buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool + which intltool glib gobjectIntrospection pkgconfig libtool makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 4612c35ad250..4aedc10e056a 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; - version = "v20"; + version = "20"; src = fetchFromGitHub { owner = "phocean"; diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index d5de6f5f6bc1..94f878097ded 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -86,7 +86,7 @@ rec { };}) '' mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages + printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages ''; # Given manifest module data, return the module diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix index 53df146ab533..5aeba4be3a6e 100644 --- a/pkgs/desktops/kde-4.14/kde-workspace.nix +++ b/pkgs/desktops/kde-4.14/kde-workspace.nix @@ -30,6 +30,8 @@ kde { --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 ''; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # gcc-6 + enableParallelBuilding = false; # frequent problems on Hydra meta = { diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 9793ff9c2502..8c6eb5965154 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 = http://lxde.org/; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 27a5903a61b5..b17ab4fda659 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool ]; meta = { - homepage = "http://lxde.org/"; + homepage = http://lxde.org/; license = stdenv.lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index a05905547fd6..1225f425b263 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; - homepage = "http://lxde.org/"; + homepage = http://lxde.org/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ryneeverett ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 7b38d2eec6fd..20e785ec5fda 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -45,4 +45,13 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; + + patches = [ + # Fixes a FTBFS with CMake v3.8 + (fetchpatch { + url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch; + sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf"; + }) + ]; + } diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index cb10df5a1b72..8aea9a6458b3 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { liblxqt libqtxdg lxqt-common + qtx11extras ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 550025f8e87b..8e2332dad5c7 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, menu-cache, muparser }: stdenv.mkDerivation rec { @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { qtbase qttools qtsvg + qtx11extras kwindowsystem liblxqt libqtxdg diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 197c5470d2bd..089b54de15e4 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple multi-page document viewer for the MATE desktop"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix new file mode 100644 index 000000000000..ab2831159f90 --- /dev/null +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }: + +stdenv.mkDerivation rec { + name = "caja-extensions-${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 = "0hgala7zkfsa60jflq3s4n9yd11dhfdcla40l83cmgc3r1az7cmw"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + gtk3 + dbus_glib + gupnp + mate.caja + mate.mate-desktop + imagemagick + ]; + + postPatch = '' + for f in image-converter/caja-image-{resizer,rotator}.c; do + substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert" + done + ''; + + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + + meta = with stdenv.lib; { + description = "Set of extensions for Caja file manager"; + homepage = http://mate-desktop.org; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch new file mode 100644 index 000000000000..7490a368efd9 --- /dev/null +++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch @@ -0,0 +1,30 @@ +diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c +index 023c22e..414913b 100644 +--- a/libcaja-private/caja-module.c ++++ b/libcaja-private/caja-module.c +@@ -258,11 +258,25 @@ caja_module_setup (void) + { + static gboolean initialized = FALSE; + GList *res; ++ gchar *caja_extension_dirs; ++ gchar **dir_vector; + + if (!initialized) + { + initialized = TRUE; + ++ caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS"); ++ ++ if (caja_extension_dirs) ++ { ++ dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0); ++ ++ for (gchar **dir = dir_vector; *dir != NULL; ++ dir) ++ load_module_dir (*dir); ++ ++ g_strfreev(dir_vector); ++ } ++ + load_module_dir (CAJA_EXTENSIONDIR); + + eel_debug_call_at_shutdown (free_module_objects); diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix new file mode 100644 index 000000000000..cb315d7f09a2 --- /dev/null +++ b/pkgs/desktops/mate/caja/cajaWithExtensions.nix @@ -0,0 +1,11 @@ +{ 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 aea006fc4867..8f38a5ef7e69 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606"; + sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"; }; nativeBuildInputs = [ @@ -26,11 +26,15 @@ stdenv.mkDerivation rec { mate.mate-desktop ]; + patches = [ + ./caja-extension-dirs.patch + ]; + configureFlags = [ "--disable-update-mimedb" ]; meta = { description = "File manager for the MATE desktop"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 528f792a600d..fd326b6bbbbb 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -2,6 +2,13 @@ rec { atril = callPackage ./atril { }; caja = callPackage ./caja { }; + caja-extensions = callPackage ./caja-extensions { }; + cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix { + extensions = [ caja-extensions ]; + }; + engrampa = callPackage ./engrampa { }; + eom = callPackage ./eom { }; + pluma = callPackage ./pluma { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix new file mode 100644 index 000000000000..dea2bea5ee9b --- /dev/null +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "engrampa-${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 = "0d98zhqqc7qdnxcf0195kd04xmhijc0w2qrn6q61zd0daiswnv98"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + libxml2 + gnome3.gtk + mate.caja + mate.mate-desktop + ]; + + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + + meta = { + description = "Archive Manager for MATE"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix new file mode 100644 index 000000000000..1c27958b0c97 --- /dev/null +++ b/pkgs/desktops/mate/eom/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "eom-${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 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + dbus_glib + exempi + lcms2 + libexif + libjpeg + librsvg + libxml2 + shared_mime_info + gnome3.gtk + gnome3.libpeas + mate.mate-desktop + ]; + + meta = { + description = "An image viewing and cataloging program for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 7bd7a3f27701..a433104b1fa7 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 2afd700d9333..8854580a7cab 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 3d820553b4ac..05edfc1dd6d4 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${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 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; + sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index ce0366b36690..239a01c759af 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${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 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm"; + sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fd907c562806..9d620b283018 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 = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; + sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1"; }; buildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 0a8b37b4e015..45be1d8710d7 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.20" = "19"; - "3.22" = "10"; + "3.20" = "22"; + "3.22" = "13"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g"; - "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb"; + "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4"; + "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"; }."${major-ver}"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; - homepage = "http://mate-desktop.org"; + homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix new file mode 100644 index 000000000000..a290c404469c --- /dev/null +++ b/pkgs/desktops/mate/pluma/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "pluma-${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 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + isocodes + wrapGAppsHook + ]; + + buildInputs = [ + enchant + libxml2 + python + gnome3.gtksourceview + gnome3.libpeas + gnome3.defaultIconTheme + mate.mate-desktop + ]; + + meta = { + description = "Powerful text editor for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix new file mode 100644 index 000000000000..3e8ca1f388e9 --- /dev/null +++ b/pkgs/desktops/maxx/default.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg + +, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm +, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 +, gdk_pixbuf, mesa_noglu, ncurses + +, xclock, xsettingsd }: + +let + version = "Indy-1.1.0"; + + deps = [ + stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm + libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 + gdk_pixbuf mesa_noglu ncurses + ]; + runtime_deps = [ + xclock xsettingsd + ]; +in stdenv.mkDerivation { + name = "MaXX-${version}"; + + srcs = [ + (fetchurl { + url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz"; + sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y"; + }) + (fetchurl { + url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz"; + sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708"; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + while IFS= read -r -d $'\0' i; do + substituteInPlace "$i" --replace /opt/MaXX $out/opt/MaXX + done < <(find "." -type f -exec grep -Iq /opt/MaXX {} \; -and -print0) + + substituteInPlace bin/adminterm \ + --replace /bin/bash ${bash}/bin/bash + + substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \ + --replace "cp " "cp --no-preserve=mode " + ''; + + installPhase = '' + maxx=$out/opt/MaXX + mkdir -p "$maxx" $out/share + + mv -- ./* "$maxx" + ln -s $maxx/share/icons $out/share + + wrapProgram $maxx/etc/skel/Xsession.dt \ + --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \ + --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" \ + --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps} + + while IFS= read -r -d $'\0' i; do + if isELF "$i"; then + bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` + patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i" + if [ "$bin" -eq 0 ]; then + wrapProgram "$i" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt/MaXX=$maxx + fi + fi + done < <(find "$maxx" -type f -print0) + + cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/bin + for i in $maxx/bin/cpp $maxx/bin/cc1 + do + wrapProgram "$i" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt/MaXX=$maxx + done + ''; + + meta = with stdenv.lib; { + description = "A replica of IRIX Interactive Desktop"; + homepage = http://www.maxxinteractive.com; + license = { + url = http://www.maxxinteractive.com/site/?page_id=97; + free = true; + }; + maintainers = [ maintainers.gnidorah ]; + platforms = ["x86_64-linux"]; + hydraPlatforms = []; + longDescription = '' + A clone of IRIX Interactive Desktop made in agreement with SGI. + Provides simple and fast retro desktop environment. + ''; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a592a623510f..a962d3054f81 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -71,6 +71,8 @@ let propagateBin = propagate "bin"; callPackage = self.newScope { + inherit propagate propagateBin; + mkDerivation = args: let inherit (args) name; @@ -90,7 +92,7 @@ let ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; + homepage = http://www.kde.org; } // (args.meta or {}); in mkDerivation (args // { diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index c1a6e8672740..7513c83c107c 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.10.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index b81755ed7579..5625aa656ceb 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, propagate, extra-cmake-modules, kwayland, libXrandr, qtx11extras }: @@ -13,4 +13,5 @@ mkDerivation { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" ''; + setupHook = propagate "out"; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index fa4ad3fcd296..db019db358bb 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework, - qtscript, qtdeclarative, + qtscript, qtdeclarative }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 50f53d70a987..0bfad2b5c8e4 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative + libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative + libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index d1824f305279..4e582bcef10a 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,339 @@ { bluedevil = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/bluedevil-5.10.3.tar.xz"; - sha256 = "03qkd08nwqkc25wvj4964xgrj40m6vhzqg67fdqamav6d5np106g"; - name = "bluedevil-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz"; + sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r"; + name = "bluedevil-5.10.5.tar.xz"; }; }; breeze = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-5.10.3.tar.xz"; - sha256 = "048z84dsrx9ln5whg7vbp0amhhsnggh1jm4z6nmraizms2ay0w8a"; - name = "breeze-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz"; + sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v"; + name = "breeze-5.10.5.tar.xz"; }; }; breeze-grub = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-grub-5.10.3.tar.xz"; - sha256 = "1ghg7vc9ad6bw0b0q88srjwm8h9khyl93ljr2riaw3wh23slkw5z"; - name = "breeze-grub-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz"; + sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if"; + name = "breeze-grub-5.10.5.tar.xz"; }; }; breeze-gtk = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-gtk-5.10.3.tar.xz"; - sha256 = "0ai2hkd79g1y8clk0650qijq5w5fmaamhbapw6yddf4v4a40vspc"; - name = "breeze-gtk-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz"; + sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a"; + name = "breeze-gtk-5.10.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/breeze-plymouth-5.10.3.tar.xz"; - sha256 = "1249ywi5s8ba5mzgi2773xz04g3shzc61bwsfcgpvzyc61q3dsl9"; - name = "breeze-plymouth-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz"; + sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35"; + name = "breeze-plymouth-5.10.5.tar.xz"; }; }; discover = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/discover-5.10.3.tar.xz"; - sha256 = "189pv0zbl7mzswk65nlj8yq5ymj3ska8a52ws852blnccj8x18qn"; - name = "discover-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz"; + sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf"; + name = "discover-5.10.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kactivitymanagerd-5.10.3.tar.xz"; - sha256 = "1y4xyg5swr2abiiqp67b95jfj4xbmgw1y51vj6njcdrkkkksz7qh"; - name = "kactivitymanagerd-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz"; + sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7"; + name = "kactivitymanagerd-5.10.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kde-cli-tools-5.10.3.tar.xz"; - sha256 = "1xmk45hj96qmfcprccsnlzr0hms98yvnnz8wkylgbnj75rcfq7ws"; - name = "kde-cli-tools-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz"; + sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk"; + name = "kde-cli-tools-5.10.5.tar.xz"; }; }; kdecoration = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kdecoration-5.10.3.tar.xz"; - sha256 = "14ayrnv1q1rhjclh2pbjwnzssqk2m9zlpm64011y258r5q9mw8h3"; - name = "kdecoration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz"; + sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3"; + name = "kdecoration-5.10.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kde-gtk-config-5.10.3.tar.xz"; - sha256 = "049dk79wgqgk2jiicqyv32m6nhj6k7hw5qrhagg8js28b6sqkw0m"; - name = "kde-gtk-config-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz"; + sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5"; + name = "kde-gtk-config-5.10.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kdeplasma-addons-5.10.3.tar.xz"; - sha256 = "1lzkwa51845f97qz43j1k284hwjbg05cry7lj16nlaq0rlwncgps"; - name = "kdeplasma-addons-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz"; + sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5"; + name = "kdeplasma-addons-5.10.5.tar.xz"; }; }; kgamma5 = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kgamma5-5.10.3.tar.xz"; - sha256 = "19mcdj1xcsf43k3n77ybqj9i99l6m8yryw3bhcbzfxk0c6ccx9cy"; - name = "kgamma5-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz"; + sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1"; + name = "kgamma5-5.10.5.tar.xz"; }; }; khotkeys = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/khotkeys-5.10.3.tar.xz"; - sha256 = "1xbxbqvpnci2fanwvdrr6rnwabh3yfamndfhmy4gjik26y0i8yz4"; - name = "khotkeys-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz"; + sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is"; + name = "khotkeys-5.10.5.tar.xz"; }; }; kinfocenter = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kinfocenter-5.10.3.tar.xz"; - sha256 = "0a94wz7fbck08aw3xrvn2hjbj3px5ivfzkh6hhqcxblnc5ahr0fk"; - name = "kinfocenter-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz"; + sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm"; + name = "kinfocenter-5.10.5.tar.xz"; }; }; kmenuedit = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kmenuedit-5.10.3.tar.xz"; - sha256 = "1y4riijwp1g3bji2wd21m7raf95prajd3sxcgr140sg0lq8zg8h2"; - name = "kmenuedit-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz"; + sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam"; + name = "kmenuedit-5.10.5.tar.xz"; }; }; kscreen = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kscreen-5.10.3.tar.xz"; - sha256 = "03l8ammyir82w8kdl4sm8lkp1nr0qghk04g838p34m05ah8hb7nl"; - name = "kscreen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz"; + sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf"; + name = "kscreen-5.10.5.tar.xz"; }; }; kscreenlocker = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kscreenlocker-5.10.3.tar.xz"; - sha256 = "07k0smksglzq44llpn80xs7p8salfryphihran7frb1mvyg09yzx"; - name = "kscreenlocker-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.tar.xz"; + sha256 = "07c8x4pj9adwwm5036wbrrw2sj8xi9d8b6d7qya6bam9xrq0mxkb"; + name = "kscreenlocker-5.10.5.tar.xz"; }; }; ksshaskpass = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/ksshaskpass-5.10.3.tar.xz"; - sha256 = "10cy8d4dbg8dzkh428x3vl6n2hh73b3fxnal8a2wwx23flhmg04c"; - name = "ksshaskpass-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz"; + sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw"; + name = "ksshaskpass-5.10.5.tar.xz"; }; }; ksysguard = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/ksysguard-5.10.3.tar.xz"; - sha256 = "0mgzqd3abhs03k815kij6n6jpiqhd13vzbyifcp4r0q8kh34b71s"; - name = "ksysguard-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz"; + sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn"; + name = "ksysguard-5.10.5.tar.xz"; }; }; kwallet-pam = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwallet-pam-5.10.3.tar.xz"; - sha256 = "0pysv9lfljar4krdkwns7fyyi0zz5629prfmdxs2aww6cq4d2x7m"; - name = "kwallet-pam-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz"; + sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4"; + name = "kwallet-pam-5.10.5.tar.xz"; }; }; kwayland-integration = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwayland-integration-5.10.3.tar.xz"; - sha256 = "1gfx5mxy1zan5shhddi4b6k578l19rkld2zkfa4g97hhvc0h83s9"; - name = "kwayland-integration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz"; + sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy"; + name = "kwayland-integration-5.10.5.tar.xz"; }; }; kwin = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwin-5.10.3.tar.xz"; - sha256 = "0vbrf7vm8s7hrzkgsjsqggswadvrr1k2g85y7w1pb781way7xwj3"; - name = "kwin-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz"; + sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc"; + name = "kwin-5.10.5.tar.xz"; }; }; kwrited = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/kwrited-5.10.3.tar.xz"; - sha256 = "0cjyvz5wg37dbnacsf3hz05bkwzpbznmlsy5plhqxr6wmq6q6l9q"; - name = "kwrited-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz"; + sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9"; + name = "kwrited-5.10.5.tar.xz"; }; }; libkscreen = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/libkscreen-5.10.3.tar.xz"; - sha256 = "02hcsfmjzajbpki2pmpdycgccjqadd98vzam56sihsvivgxykw4h"; - name = "libkscreen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz"; + sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6"; + name = "libkscreen-5.10.5.tar.xz"; }; }; libksysguard = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/libksysguard-5.10.3.tar.xz"; - sha256 = "13s7j53jjyhd5kryyd1sy6yrx69h5smi7xg49d8as8zbf3rki08h"; - name = "libksysguard-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz"; + sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn"; + name = "libksysguard-5.10.5.tar.xz"; }; }; milou = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/milou-5.10.3.tar.xz"; - sha256 = "18bgwpxfv5n4nxvs6xj6ihk22bpmb1b4cs9dxhfn931r8lnzzixb"; - name = "milou-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz"; + sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz"; + name = "milou-5.10.5.tar.xz"; }; }; oxygen = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/oxygen-5.10.3.tar.xz"; - sha256 = "07jqm9nl84b2s9i461mz4b8i1x22376k9n1g9prcjzxyy3494flv"; - name = "oxygen-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz"; + sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9"; + name = "oxygen-5.10.5.tar.xz"; }; }; plasma-desktop = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-desktop-5.10.3.tar.xz"; - sha256 = "1vwls9gavcipv8k2fwx9kzzldfcxch3g61nsc77dw0lrhcaf301d"; - name = "plasma-desktop-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz"; + sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm"; + name = "plasma-desktop-5.10.5.tar.xz"; }; }; plasma-integration = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-integration-5.10.3.tar.xz"; - sha256 = "1vpgwzvqjcr6hgrh57777i21fbmixl6vrlyscdyk0912mdzplf5n"; - name = "plasma-integration-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz"; + sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn"; + name = "plasma-integration-5.10.5.tar.xz"; }; }; plasma-nm = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-nm-5.10.3.tar.xz"; - sha256 = "1d8kncwcxw601n73m7igr2h09mk54qa2zgshrbd0h3496dw4xzxq"; - name = "plasma-nm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz"; + sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi"; + name = "plasma-nm-5.10.5.tar.xz"; }; }; plasma-pa = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-pa-5.10.3.tar.xz"; - sha256 = "1dhkkfl39x17bd0hv3w0lclzlsialg7a7zydcjm345izpdgd11vx"; - name = "plasma-pa-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz"; + sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1"; + name = "plasma-pa-5.10.5.tar.xz"; }; }; plasma-sdk = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-sdk-5.10.3.tar.xz"; - sha256 = "0m426fj5d07bqj0n1gxcn7brjwf7xrsj50hy14hky246wchvqh43"; - name = "plasma-sdk-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz"; + sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb"; + name = "plasma-sdk-5.10.5.tar.xz"; }; }; plasma-tests = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-tests-5.10.3.tar.xz"; - sha256 = "04pn5bzhs0y6msir2px985jghhswas9zn37jb4zdy0sxd9yhabqb"; - name = "plasma-tests-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz"; + sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8"; + name = "plasma-tests-5.10.5.tar.xz"; }; }; plasma-workspace = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-5.10.3.tar.xz"; - sha256 = "0wfzdjpgd9fwycy4ww2j7xryh82wg4jfipnh9hicq2mss0x53mv9"; - name = "plasma-workspace-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz"; + sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl"; + name = "plasma-workspace-5.10.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-wallpapers-5.10.3.tar.xz"; - sha256 = "0vhdypkkcranpb7zv2ghh0d5x5698d7vvyv1k7xcgsd1bwf3037f"; - name = "plasma-workspace-wallpapers-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz"; + sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88"; + name = "plasma-workspace-wallpapers-5.10.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/plymouth-kcm-5.10.3.tar.xz"; - sha256 = "0ss5wkqa729f2bs8s9ss4bslpj0946kylbg2g2vmfzzr5a68ri6d"; - name = "plymouth-kcm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz"; + sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y"; + name = "plymouth-kcm-5.10.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.3"; + version = "1-5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/polkit-kde-agent-1-5.10.3.tar.xz"; - sha256 = "0csllzr47f173f8dymfhhplig7w55j3kfqr14i12lc3yhy5g5ns6"; - name = "polkit-kde-agent-1-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz"; + sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2"; + name = "polkit-kde-agent-1-5.10.5.tar.xz"; }; }; powerdevil = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/powerdevil-5.10.3.tar.xz"; - sha256 = "0xjk8andskvygmb8ll0hxk8spc9ac0v3kyzyrd444va3q617zbi7"; - name = "powerdevil-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz"; + sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7"; + name = "powerdevil-5.10.5.tar.xz"; }; }; sddm-kcm = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/sddm-kcm-5.10.3.tar.xz"; - sha256 = "1gcla1lk8idxj4j4sr13wv3q2v6c4ylhgjqj1ik9qr9rk7r2ny8c"; - name = "sddm-kcm-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz"; + sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw"; + name = "sddm-kcm-5.10.5.tar.xz"; }; }; systemsettings = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/systemsettings-5.10.3.tar.xz"; - sha256 = "0mfcyvzl5z3yqq0bbpwzhphir0vjjhvpifp17ra4w80j3f2c14jh"; - name = "systemsettings-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz"; + sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2"; + name = "systemsettings-5.10.5.tar.xz"; }; }; user-manager = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/user-manager-5.10.3.tar.xz"; - sha256 = "10iis34bpi0vic3x4r6gss8frfxg4zv9v8mg1rpbmrrs5q8799fn"; - name = "user-manager-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz"; + sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq"; + name = "user-manager-5.10.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.3"; + version = "5.10.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.3/xdg-desktop-portal-kde-5.10.3.tar.xz"; - sha256 = "1hnbw211fn6aayx46h92nmjvdc0ar1bsy1dn1lg2a5575kq2lzgd"; - name = "xdg-desktop-portal-kde-5.10.3.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz"; + sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba"; + name = "xdg-desktop-portal-kde-5.10.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index e7edfd62151b..8624cac09ed7 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fast, lightweight, gtk2 file manager"; - homepage = "http://rox.sourceforge.net/desktop"; + homepage = http://rox.sourceforge.net/desktop; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 475b48343a57..c15ab310f47b 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/mousepad" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; meta = { diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch new file mode 100644 index 000000000000..4e1dcc1efa71 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -0,0 +1,16 @@ +--- ./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 @@ + 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 + for lock_cmd in \ + "xscreensaver-command -lock" \ +- "gnome-screensaver-command --lock" ++ "gnome-screensaver-command --lock" \ ++ "light-locker-command -l" + do + $lock_cmd >/dev/null 2>&1 && exit + done diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a0568b0dd395..edc810d38972 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; }; + patches = [ + # Fix "lock screen" not working for light-locker + ./xfce4-light-locker.patch + ]; + buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 78ab61f73a49..74079e82ea19 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -32,9 +32,9 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_4; + elixir = elixir_1_5; - elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix { + elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { inherit rebar erlang; debugInfo = true; }; @@ -49,7 +49,8 @@ let debugInfo = true; }; - lfe = callPackage ../interpreters/lfe { }; + lfe = lfe_1_2; + lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages hex = callPackage ./hex {}; diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix index b77d5e6c589a..d8d55c011209 100644 --- a/pkgs/development/beam-modules/hex-packages.nix +++ b/pkgs/development/beam-modules/hex-packages.nix @@ -1182,7 +1182,7 @@ let systems to query, augment and transform data according to Elixir matching rules. ''; license = stdenv.lib.licenses.mit; - homepage = "http://github.com/awetzel/adap"; + homepage = "https://github.com/awetzel/adap"; }; } // packageOverrides) ) {}; @@ -6660,7 +6660,7 @@ let requests and responds to preflight requests (OPTIONS)''; license = stdenv.lib.licenses.asl20; - homepage = "http://github.com/mschae/cors_plug"; + homepage = "https://github.com/mschae/cors_plug"; }; } // packageOverrides) ) {}; @@ -9498,7 +9498,7 @@ let H-metric are abstracted away - you provide them as functions.''; license = stdenv.lib.licenses.bsd3; - homepage = "http://github.com/herenowcoder/eastar"; + homepage = "https://github.com/herenowcoder/eastar"; }; } // packageOverrides) ) {}; @@ -12266,7 +12266,7 @@ let response. This project is a rewrite for Elixir and Plug of basho webmachine.''; license = stdenv.lib.licenses.mit; - homepage = "http://github.com/awetzel/ewebmachine"; + homepage = "https://github.com/awetzel/ewebmachine"; }; } // packageOverrides) ) {}; @@ -22613,7 +22613,7 @@ let meta = { description = ''JWT decoding library for Elixir''; license = stdenv.lib.licenses.mit; - homepage = "http://github.com/mschae/jwtex"; + homepage = "https://github.com/mschae/jwtex"; }; } // packageOverrides) ) {}; @@ -30269,7 +30269,7 @@ let according to rfc7239 and fill `conn.remote_ip` with the root client ip.''; license = stdenv.lib.licenses.mit; - homepage = "http://github.com/awetzel/plug_forwarded_peer"; + homepage = "https://github.com/awetzel/plug_forwarded_peer"; }; } // packageOverrides) ) {}; @@ -30472,7 +30472,7 @@ let meta = { description = ''An elixir plug that serves HTTP range requests''; license = stdenv.lib.licenses.mit; - homepage = "http://github.com/TheSquad/plug_range"; + homepage = "https://github.com/TheSquad/plug_range"; }; } // packageOverrides) ) {}; @@ -36106,7 +36106,7 @@ let use a rails-like trailing format: http://api.dev/resources.format''; license = stdenv.lib.licenses.asl20; - homepage = "http://github.com/mschae/trailing_format_plug"; + homepage = "https://github.com/mschae/trailing_format_plug"; }; } // packageOverrides) ) {}; @@ -38938,7 +38938,7 @@ let meta = { description = ''stream zip archives while building them''; license = stdenv.lib.licenses.bsd3; - homepage = "http://github.com/dgvncsz0f/zipflow"; + homepage = "https://github.com/dgvncsz0f/zipflow"; }; } // packageOverrides) ) {}; diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 69559a26c8fa..4a1ec0543613 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -46,7 +46,7 @@ let meta = { description = "Package manager for the Erlang VM https://hex.pm"; license = stdenv.lib.licenses.mit; - homepage = "https://github.com/hexpm/hex"; + homepage = https://github.com/hexpm/hex; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index dd4ed5e1bbf8..26d868a8e7c4 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -56,4 +56,26 @@ rec { mkDerivation = pkgs.makeOverridable builder; }; + /* Uses generic-builder to evaluate provided drv containing Elixir version + specific data. + + drv: package containing version-specific args; + builder: generic builder for all Erlang versions; + args: arguments merged into version-specific args, used mostly to customize + dependencies; + + Arguments passed to the generic-builder are overridable. + + Please note that "mkDerivation" defined here is the one called from 1.2.nix + and similar files. + */ + callLFE = drv: args: + let + inherit (stdenv.lib) versionAtLeast; + builder = callPackage ../interpreters/lfe/generic-builder.nix args; + in + callPackage drv { + mkDerivation = pkgs.makeOverridable builder; + }; + } diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index 6fc1587a38e5..18abe1055b5b 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -22,7 +22,7 @@ let meta = { description = "Erlang PostgreSQL Driver"; license = stdenv.lib.licenses.mit; - homepage = "https://github.com/semiocast/pgsql"; + homepage = https://github.com/semiocast/pgsql; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index bf84ac286baa..61670d1f31c6 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -28,7 +28,7 @@ let meta = { description = "WebDriver implementation in Erlang"; license = stdenv.lib.licenses.mit; - homepage = "https://github.com/Quviq/webdrv"; + homepage = https://github.com/Quviq/webdrv; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index c296f690fa52..c48b36e5aba5 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "abcl"; - version = "1.4.0"; + version = "1.5.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1y4nixm1459ch6226ikdilcsf91c2rg1d82cqqmcn24kfjl1m62i"; + sha256 = "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj"; }; configurePhase = '' mkdir nix-tools @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://common-lisp.net/project/armedbear/"; + homepage = https://common-lisp.net/project/armedbear/; }; } diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 03cfee61ce48..ccb366ffe1cb 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = { description = "Flex SDK for Adobe Flash / ActionScript"; - homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; + homepage = "http://www.adobe.com/products/flex.html"; license = stdenv.lib.licenses.mpl11; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 09ccf9510bbd..604838e88316 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { # Please become a maintainer to fix this package broken = true; - homepage = "http://www.aldor.org/"; + homepage = http://www.aldor.org/; description = "Programming language with an expressive type system"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index fa34b3afe51b..93b251707e80 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31"; + homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31; description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats"; maintainers = with maintainers; [ aneeshusa ]; platforms = with platforms; unix; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 76caf12ffd30..7ece0ffda533 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; - homepage = http://ccl.clozure.com/; + homepage = https://ccl.clozure.com/; maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 24d583ed8862..792ecc739a50 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { CHICKEN is a compiler for the Scheme programming language. CHICKEN produces portable and efficient C, supports almost all of the R5RS Scheme language standard, and includes many - enhancements and extensions. CHICKEN runs on Linux, MacOS X, + enhancements and extensions. CHICKEN runs on Linux, macOS, Windows, and many Unix flavours. ''; }; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 8086a9f97495..f519776b6891 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + - (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); installTargets = "documentation install"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $lib/share/doc/compcert mv doc/html $lib/share/doc/compcert/ mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - mv backend cfrontend common cparser driver flocq x86 x86_32 lib \ + mv backend cfrontend common cparser driver flocq x86 x86_64 lib \ $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 115c686d7de1..62a504ef9668 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { meta = { description = "A compiled language with Ruby like syntax and type inference"; - homepage = "https://crystal-lang.org/"; + homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ mingchuan ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 17965e20d24a..0b219b804471 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -90,7 +90,7 @@ let meta = with stdenv.lib; { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; - homepage = "https://developer.nvidia.com/cuda-toolkit"; + homepage = https://developer.nvidia.com/cuda-toolkit; platforms = platforms.linux; license = licenses.unfree; }; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 3538f85a75f8..fae1c1d1b40d 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { Dale is a system (no GC) programming language that uses S-expressions for syntax and supports syntactic macros. ''; - homepage = "https://github.com/tomhrr/dale"; + homepage = https://github.com/tomhrr/dale; license = licenses.bsd3; maintainers = with maintainers; [ amiloradovsky ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 4dbe922ce811..3cf530e9e5e8 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -1,47 +1,122 @@ -{ stdenv, fetchurl, unzip, makeWrapper }: +{ stdenv, fetchFromGitHub +, makeWrapper, unzip, which +, curl, tzdata +}: -stdenv.mkDerivation { - name = "dmd-2.067.1"; +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"; - src = fetchurl { - url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; - sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; - }; + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; + }) + ]; - nativeBuildInputs = [ unzip makeWrapper ]; + sourceRoot = "."; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - # Allow to use "clang++", commented in Makefile - substituteInPlace src/dmd/posix.mak \ - --replace g++ clang++ \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + postUnpack = '' + mv dmd-v${version}-src dmd + mv druntime-v${version}-src druntime + mv phobos-v${version}-src phobos + ''; - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan + # Compile with PIC to prevent colliding modules with binutils 2.28. + # https://issues.dlang.org/show_bug.cgi?id=17375 + usePIC = "-fPIC"; + + 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.isLinux '' - substituteInPlace src/dmd/root/port.c \ + + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace dmd/src/root/port.c \ --replace "#include " "#include " - ''; + '' + + + 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 src/dmd + cd dmd make -f posix.mak INSTALL_DIR=$out - export DMD=$PWD/dmd + export DMD=$PWD/src/dmd cd ../druntime - make -f posix.mak INSTALL_DIR=$out DMD=$DMD + make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD cd ../phobos - make -f posix.mak INSTALL_DIR=$out DMD=$DMD - cd ../.. + make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD + cd .. + ''; + + doCheck = true; + + 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 src/dmd + cd dmd mkdir $out mkdir $out/bin - cp dmd $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 @@ -50,9 +125,11 @@ stdenv.mkDerivation { cd ../phobos mkdir $out/lib - ${let bits = if stdenv.is64bit then "64" else "32"; - osname = if stdenv.isDarwin then "osx" else "linux"; in - "cp generated/${osname}/release/${bits}/libphobos2.a $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 @@ -65,14 +142,17 @@ stdenv.mkDerivation { cd $out/bin tee dmd.conf << EOF [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"} + 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 = "D language compiler"; + description = "Official reference compiler for the D language"; homepage = http://dlang.org/; - license = licenses.free; # parts under different licenses + # 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 41162c4e50e7..278a77f62903 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,44 +1,123 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub , makeWrapper, unzip, which - +, curl, tzdata # Versions 2.070.2 and up require a working dmd compiler to build: , bootstrapDmd }: stdenv.mkDerivation rec { name = "dmd-${version}"; - version = "2.070.2"; + version = "2.075.1"; - src = fetchurl { - url = "http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.zip"; - sha256 = "1pbhxxf41v816j0aky3q2pcd8a6phy3363l7vr5r5pg8ps3gl701"; - }; + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; + }) + ]; + + 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"; + + 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/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_ + ''; nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - # Allow to use "clang++", commented in Makefile - substituteInPlace src/dmd/posix.mak \ - --replace g++ clang++ \ - --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ - ''; + buildInputs = [ curl tzdata ]; # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' - cd src/dmd + cd dmd make -f posix.mak INSTALL_DIR=$out - export DMD=$PWD/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" + } cd ../druntime - make -f posix.mak INSTALL_DIR=$out DMD=$DMD + make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD cd ../phobos - make -f posix.mak INSTALL_DIR=$out DMD=$DMD - cd ../.. + make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD + cd .. + ''; + + doCheck = true; + + 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" + } + 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 src/dmd + cd dmd mkdir $out mkdir $out/bin - cp dmd $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 @@ -47,9 +126,11 @@ stdenv.mkDerivation rec { cd ../phobos mkdir $out/lib - ${let bits = if stdenv.is64bit then "64" else "32"; - osname = if stdenv.isDarwin then "osx" else "linux"; in - "cp generated/${osname}/release/${bits}/libphobos2.a $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 @@ -62,14 +143,17 @@ stdenv.mkDerivation rec { cd $out/bin tee dmd.conf << EOF [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"} + 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 = "D language compiler"; + description = "Official reference compiler for the D language"; homepage = http://dlang.org/; - license = licenses.free; # parts under different licenses + # 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/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index f51e3af25ee8..1e6e0e8c1f6b 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -34,7 +34,7 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/projects/edk2/; + homepage = https://sourceforge.net/projects/edk2/; license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix index b0943f1ece35..1242f556838a 100644 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix @@ -32,7 +32,7 @@ mkDerivation { test-framework-quickcheck2 text union-find ]; jailbreak = true; - homepage = "http://elm-lang.org"; + homepage = http://elm-lang.org; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; # added manually since tests are not passing diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 6fb36d7cbfb9..a9340fc94fe4 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -32,7 +32,7 @@ mkDerivation { postInstall = '' ln -s $out/bin/elm-format-0.18 $out/bin/elm-format ''; - homepage = "http://elm-lang.org"; + homepage = http://elm-lang.org; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix index dc1760e2958b..98e57ac9b7c6 100644 --- a/pkgs/development/compilers/elm/packages/elm-make.nix +++ b/pkgs/development/compilers/elm/packages/elm-make.nix @@ -20,7 +20,7 @@ mkDerivation { time ]; jailbreak = true; - homepage = "http://elm-lang.org"; + homepage = http://elm-lang.org; description = "A build tool for Elm projects"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index f93432dc0a30..4a60b3dfb387 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -29,7 +29,7 @@ mkDerivation { zip-archive ]; jailbreak = true; - homepage = "http://github.com/elm-lang/elm-package"; + homepage = https://github.com/elm-lang/elm-package; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix index 08bf5779b74a..41611b3cdd03 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix @@ -22,7 +22,7 @@ mkDerivation { websockets-snap ]; jailbreak = true; - homepage = "http://elm-lang.org"; + homepage = http://elm-lang.org; description = "Interactive development tool for Elm programs"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index 64e29596099c..8c168dedc759 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -24,7 +24,7 @@ mkDerivation { test-framework test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; - homepage = "https://github.com/elm-lang/elm-repl"; + homepage = https://github.com/elm-lang/elm-repl; description = "a REPL for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index ae7a5ce87b25..f35ca26584f1 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, ... }: let - rev = "1.37.13"; + rev = "1.37.16"; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az"; + sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw"; + sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index b39198f30a48..ae80ad6fc808 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,7 +3,7 @@ }: let - rev = "1.37.13"; + rev = "1.37.16"; appdir = "share/emscripten"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5"; + sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy"; inherit rev; }; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 2971fd8a98b0..751d44a38a4c 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = "http://fsharp.org/"; + homepage = http://fsharp.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 35e6749659e0..488aaa228dae 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = "http://fsharp.org/"; + homepage = http://fsharp.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 51777f748e30..0887dd992526 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ML-like functional programming language aimed at program verification"; - homepage = "https://www.fstar-lang.org"; + homepage = https://www.fstar-lang.org; license = licenses.asl20; platforms = with platforms; darwin ++ linux; }; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix new file mode 100644 index 000000000000..945649b29781 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, ncurses5, python27 }: + +stdenv.mkDerivation rec { + name = "gcc-arm-embedded-${version}"; + version = "6-2017-q2-update"; + subdir = "6-2017q2"; + + platformString = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "mac" + else throw "unsupported platform"; + + urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2"; + + src = + if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; } + else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; } + else throw "unsupported platform"; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + dontPatchELF = true; + dontStrip = true; + + preFixup = '' + find $out -type f | while read f; do + patchelf $f > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + done + ''; + + meta = { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; + homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; + license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 69197b923c38..879e379da516 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -138,8 +138,9 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all"; - outputs = if (hostPlatform.is64bit && langAda) then [ "out" "doc" ] - else [ "out" "lib" "doc" ]; + outputs = [ "out" "man" "info" ] + ++ optional (!(hostPlatform.is64bit && langAda)) "lib"; + setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -344,8 +345,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && - hasAttr "propagatedBuildInputs" libcCross) + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] @@ -453,7 +453,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = "http://ghdl.free.fr/"; + homepage = http://ghdl.free.fr/; license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 38ff23f86a6d..7a41ba38e519 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, noSysDirs +{ stdenv, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -71,7 +71,14 @@ let version = "4.8.5"; # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch - ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; + ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch + ++ [(fetchpatch { + name = "libc_name_p.diff"; # needed to build with gcc6 + url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1"; + sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl"; + excludes = [ "gcc/cp/ChangeLog" ]; + })] + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -218,7 +225,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; - outputs = [ "out" "lib" "doc" ]; + outputs = [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -467,7 +474,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 04e67e44f773..e45ee0bcc6a7 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -72,8 +72,7 @@ let version = "4.9.4"; # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch - # The NXConstStr.patch can be removed at 4.9.4 - ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -473,7 +472,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e95ef92c3f65..57b68d1a11f1 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -491,7 +491,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b091fd1ae370..fa42bb5b8512 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -226,6 +226,19 @@ stdenv.mkDerivation ({ 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 '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + postPatch = if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' @@ -468,7 +481,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5d3126ea0e96..67b7dee446fb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -228,6 +228,19 @@ stdenv.mkDerivation ({ 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 '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + postPatch = if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' @@ -470,7 +483,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index f3d8d27d90c6..518ee5c7054b 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -470,7 +470,7 @@ stdenv.mkDerivation ({ # On GNU/Hurd glibc refers to Mach & Hurd # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) libcCross.propagatedBuildInputs); LIBRARY_PATH = makeLibraryPath ([] diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 5e5157215d35..60749a29b58b 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; license = stdenv.lib.licenses.bsd3; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 9a816797291b..c56762edd24e 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; + broken = true; # https://nix-cache.s3.amazonaws.com/log/6ys7lzckf2c0532kzhmss73mmz504can-ghc-6.10.4.drv }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 6ee447be6507..a46ef66a8cb7 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { stripDebugFlags=["-S" "--keep-file-symbols"]; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 099f1376c778..9d052ddb246f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { stripDebugFlags=["-S" "--keep-file-symbols"]; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 521afbd88b43..863f904e4e96 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://haskell.org/ghc"; + 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.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 5c6b62bee6f1..eb8f1dddd19b 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://haskell.org/ghc"; + 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.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index b3f672a8ef56..156ff56bd663 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { stripDebugFlags=["-S" "--keep-file-symbols"]; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 08b4f6f5471e..e5bc4724c9eb 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index bdc0a20d3b4c..5f951936046f 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index 986ec98c6b32..50b0108861f0 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { - homepage = "http://haskell.org/ghc"; + 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.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 057b9f70fc78..5a380c75c69f 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; meta = { - homepage = "http://haskell.org/ghc"; + 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/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index ae6edb739c9d..6e47ee92630a 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://haskell.org/ghc"; + 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/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index cc0b1d4eaddf..e50a8df7352d 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; - patches = [] + patches = [ ./ghc-gold-linker.patch ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; preConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://haskell.org/ghc"; + 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/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 92014200c611..bce51f92c0bc 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -9,8 +9,8 @@ let inherit (bootPkgs) ghc; - version = "8.2.1-rc3"; - preReleaseName = "ghc-8.2.0.20170704"; + version = "8.2.1"; + preReleaseName = "ghc-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 @@ -27,11 +27,13 @@ in stdenv.mkDerivation (rec { src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; - sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry"; + sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; }; postPatch = "patchShebangs ."; + patches = [ ./ghc-gold-linker.patch ]; + preConfigure = commonPreConfigure; buildInputs = commonBuildInputs; @@ -80,7 +82,7 @@ in stdenv.mkDerivation (rec { }; meta = { - homepage = "http://haskell.org/ghc"; + homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch deleted file mode 100644 index 0ee1b06c7346..000000000000 --- a/pkgs/development/compilers/ghc/D2710.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h ---- a/rts/LinkerInternals.h -+++ b/rts/LinkerInternals.h -@@ -303,4 +303,14 @@ - # define OBJFORMAT_MACHO - #endif - -+/* In order to simplify control flow a bit, some references to mmap-related -+ definitions are blocked off by a C-level if statement rather than a CPP-level -+ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we -+ just stub out the relevant symbols here -+*/ -+#if !RTS_LINKER_USE_MMAP -+#define munmap(x,y) /* nothing */ -+#define MAP_ANONYMOUS 0 -+#endif -+ - #endif /* LINKERINTERNALS_H */ - diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch deleted file mode 100644 index 8d229f273999..000000000000 --- a/pkgs/development/compilers/ghc/D2711.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c ---- a/rts/sm/Storage.c -+++ b/rts/sm/Storage.c -@@ -1314,7 +1314,7 @@ - ------------------------------------------------------------------------- */ - - #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) --void sys_icache_invalidate(void *start, size_t len); -+#include - #endif - - /* On ARM and other platforms, we need to flush the cache after -@@ -1327,7 +1327,7 @@ - (void)exec_addr; - #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) - /* On iOS we need to use the special 'sys_icache_invalidate' call. */ -- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len); -+ sys_icache_invalidate(exec_addr, len); - #elif defined(__GNUC__) - /* For all other platforms, fall back to a libgcc builtin. */ - unsigned char* begin = (unsigned char*)exec_addr; - diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch deleted file mode 100644 index d938d70bbcfe..000000000000 --- a/pkgs/development/compilers/ghc/D2712.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h ---- a/includes/rts/OSThreads.h -+++ b/includes/rts/OSThreads.h -@@ -15,7 +15,12 @@ - #ifndef RTS_OSTHREADS_H - #define RTS_OSTHREADS_H - --#if defined(THREADED_RTS) /* to near the end */ -+#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) -+#define BUILD_OSTHREAD_POSIX -+#endif -+ -+ -+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */ - - #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) - -@@ -205,13 +210,25 @@ - void releaseThreadNode (void); - #endif // !CMINUSMINUS - --#else -+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ -+ -+#ifndef THREADED_RTS -+ -+#ifdef ACQUIRE_LOCK -+// If we have pthreads, we pull in the threading primitives even when the RTS -+// isn't threaded, but we expect these macros to be noops on non-threaded RTS. -+ -+#undef ACQUIRE_LOCK -+#undef RELEASE_LOCK -+#undef ASSERT_LOCK_HELD -+ -+#endif - - #define ACQUIRE_LOCK(l) - #define RELEASE_LOCK(l) - #define ASSERT_LOCK_HELD(l) - --#endif /* defined(THREADED_RTS) */ -+#endif - - #ifndef CMINUSMINUS - // -diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c ---- a/rts/posix/OSThreads.c -+++ b/rts/posix/OSThreads.c -@@ -35,7 +35,7 @@ - #endif - #endif - --#if defined(THREADED_RTS) -+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) - #include "RtsUtils.h" - #include "Task.h" - -@@ -225,47 +225,6 @@ - return NULL; - } - --int --forkOS_createThread ( HsStablePtr entry ) --{ -- pthread_t tid; -- int result = pthread_create(&tid, NULL, -- forkOS_createThreadWrapper, (void*)entry); -- if(!result) -- pthread_detach(tid); -- return result; --} -- --void freeThreadingResources (void) { /* nothing */ } -- --uint32_t --getNumberOfProcessors (void) --{ -- static uint32_t nproc = 0; -- -- if (nproc == 0) { --#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) -- nproc = sysconf(_SC_NPROCESSORS_ONLN); --#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) -- nproc = sysconf(_SC_NPROCESSORS_CONF); --#elif defined(darwin_HOST_OS) -- size_t size = sizeof(uint32_t); -- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { -- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) -- nproc = 1; -- } --#elif defined(freebsd_HOST_OS) -- size_t size = sizeof(uint32_t); -- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) -- nproc = 1; --#else -- nproc = 1; --#endif -- } -- -- return nproc; --} -- - #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY) - // Schedules the thread to run on CPU n of m. m may be less than the - // number of physical CPUs, in which case, the thread will be allowed -@@ -353,6 +312,51 @@ - pthread_kill(id, SIGPIPE); - } - -+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ -+ -+#if defined(THREADED_RTS) -+ -+int -+forkOS_createThread ( HsStablePtr entry ) -+{ -+ pthread_t tid; -+ int result = pthread_create(&tid, NULL, -+ forkOS_createThreadWrapper, (void*)entry); -+ if(!result) -+ pthread_detach(tid); -+ return result; -+} -+ -+void freeThreadingResources (void) { /* nothing */ } -+ -+uint32_t -+getNumberOfProcessors (void) -+{ -+ static uint32_t nproc = 0; -+ -+ if (nproc == 0) { -+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) -+ nproc = sysconf(_SC_NPROCESSORS_ONLN); -+#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) -+ nproc = sysconf(_SC_NPROCESSORS_CONF); -+#elif defined(darwin_HOST_OS) -+ size_t size = sizeof(uint32_t); -+ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { -+ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) -+ nproc = 1; -+ } -+#elif defined(freebsd_HOST_OS) -+ size_t size = sizeof(uint32_t); -+ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) -+ nproc = 1; -+#else -+ nproc = 1; -+#endif -+ } -+ -+ return nproc; -+} -+ - #else /* !defined(THREADED_RTS) */ - - int - diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch deleted file mode 100644 index 80cf35a52974..000000000000 --- a/pkgs/development/compilers/ghc/D2713.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -437,7 +437,11 @@ - else - CrossCompilePrefix="" - fi --TargetPlatformFull="${TargetPlatform}" -+# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used -+# in calls to subproject configure scripts and thus must be set to the autoconf -+# triple, not the normalized GHC triple that TargetPlatform is set to. -+# It may be better to just do away with the GHC triples all together. -+TargetPlatformFull="${target}" - AC_SUBST(CrossCompiling) - AC_SUBST(CrossCompilePrefix) - AC_SUBST(TargetPlatformFull) - diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch new file mode 100644 index 000000000000..edce7ef3a178 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-gold-linker.patch @@ -0,0 +1,54 @@ +From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Fri, 21 Jul 2017 20:09:11 +0200 +Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm + functions. + +Linking with gold needs this because in contrast to ld, gold +doesn't implicitly link libm. + +Found by Michael Bishop . +--- + libraries/base/base.cabal | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal +index f00fb8768e5..fd91f268ffe 100644 +--- a/libraries/base/base.cabal ++++ b/libraries/base/base.cabal +@@ -342,6 +342,10 @@ Library + WCsubst.h + consUtils.h + ++ -- Base uses libm functions. ld.bfd links libm implicitly when necessary. ++ -- Other linkers, like gold, don't, so we have to declare it explicitly. ++ extra-libraries: m ++ + -- OS Specific + if os(windows) + -- Windows requires some extra libraries for linking because the RTS + +From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001 +From: michael bishop +Date: Sat, 22 Jul 2017 13:12:39 -0300 +Subject: [PATCH 2/2] also add -lm to ghc-prim + +--- + libraries/ghc-prim/ghc-prim.cabal | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal +index 00a029efedf..6db85dd69fc 100644 +--- a/libraries/ghc-prim/ghc-prim.cabal ++++ b/libraries/ghc-prim/ghc-prim.cabal +@@ -42,6 +42,10 @@ Library + UnliftedFFITypes + + build-depends: rts == 1.0.* ++ ++ -- Base uses libm functions. ld.bfd links libm implicitly when necessary. ++ -- Other linkers, like gold, don't, so we have to declare it explicitly. ++ extra-libraries: m + + exposed-modules: + GHC.CString diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index f199048353c0..362b4895b7e3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,6 +5,7 @@ # 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 +, version ? "8.3.20170808" }: let @@ -12,8 +13,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20170106"; - rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; + rev = "14457cf6a50f708eecece8f286f08687791d51f7"; commonPreConfigure = '' echo ${version} >VERSION @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0"; + sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; }; postPatch = "patchShebangs ."; @@ -87,7 +87,7 @@ in stdenv.mkDerivation (rec { }; meta = { - homepage = "http://haskell.org/ghc"; + 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/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 4c9ae16a3134..a7381fa1a146 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -186,7 +186,7 @@ in mkDerivation (rec { }; }; - homepage = "https://github.com/ghcjs/ghcjs"; + homepage = https://github.com/ghcjs/ghcjs; description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 61bbb95b0a58..9f4fa3a8b7ae 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -2,7 +2,7 @@ diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs index db8b12e..7b815c5 100644 --- a/src-bin/Boot.hs +++ b/src-bin/Boot.hs -@@ -526,9 +526,7 @@ initPackageDB :: B () +@@ -540,9 +540,7 @@ initPackageDB :: B () initPackageDB = do msg info "creating package databases" initDB "--global" <^> beLocations . blGlobalDB @@ -12,7 +12,7 @@ index db8b12e..7b815c5 100644 initDB dbName db = do rm_rf db >> mkdir_p db ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () -@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do +@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do msgD info $ "preparing development boot tree" checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do testGit "ghcjs-boot" >>= \case @@ -46,7 +46,25 @@ index db8b12e..7b815c5 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim -@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do +@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do + globalFlags <- cabalGlobalFlags + flags <- cabalInstallFlags (length pkgs == 1) + let args = globalFlags ++ ("install" : pkgs) ++ +- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages ++ [ "--allow-boot-library-installs" + ] ++ map ("--configure-option="<>) configureOpts ++ flags + checkInstallPlan pkgs args + cabal_ args +@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do + -- uses somewhat fragile parsing of --dry-run output, find a better way + checkInstallPlan :: [Package] -> [Text] -> B () + checkInstallPlan pkgs opts = do +- plan <- cabal (opts ++ ["-v2", "--dry-run"]) ++ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"]) + when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan) + where + hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls +@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do , "--avoid-reinstalls" , "--builddir", "dist" , "--with-compiler", ghcjs ^. pgmLocText diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix index d4247f51b3e3..aa19cfea9718 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -15,7 +15,7 @@ base HUnit test-framework test-framework-hunit ]; jailbreak = true; - homepage = "https://github.com/simonmar/async"; + homepage = https://github.com/simonmar/async; description = "Run IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47,7 +47,7 @@ time time-locale-compat unordered-containers uuid-types vector ]; jailbreak = true; - homepage = "https://github.com/bos/aeson"; + homepage = https://github.com/bos/aeson; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76,7 +76,7 @@ transformers unordered-containers vector ]; jailbreak = true; - homepage = "https://github.com/bos/attoparsec"; + homepage = https://github.com/bos/attoparsec; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95,7 +95,7 @@ ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; jailbreak = true; - homepage = "https://github.com/basvandijk/case-insensitive"; + homepage = https://github.com/basvandijk/case-insensitive; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109,7 +109,7 @@ libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; jailbreak = true; - homepage = "https://github.com/spl/dlist"; + homepage = https://github.com/spl/dlist; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143,7 +143,7 @@ test-framework-hunit test-framework-quickcheck2 text unix ]; jailbreak = true; - homepage = "http://github.com/tibbe/hashable"; + homepage = http://github.com/tibbe/hashable; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -156,7 +156,7 @@ doCheck = false; libraryHaskellDepends = [ base transformers ]; jailbreak = true; - homepage = "http://github.com/ekmett/mtl"; + homepage = http://github.com/ekmett/mtl; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -204,7 +204,7 @@ ]; benchmarkHaskellDepends = [ base criterion ]; jailbreak = true; - homepage = "https://github.com/basvandijk/scientific"; + homepage = https://github.com/basvandijk/scientific; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -230,7 +230,7 @@ libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers HUnit mtl ]; jailbreak = true; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB; description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -247,7 +247,7 @@ base deepseq template-haskell transformers transformers-compat ]; jailbreak = true; - homepage = "http://github.com/ekmett/tagged"; + homepage = http://github.com/ekmett/tagged; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -271,7 +271,7 @@ test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; - homepage = "https://github.com/bos/text"; + homepage = https://github.com/bos/text; description = "An efficient packed Unicode text type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -295,7 +295,7 @@ hashable hashmap mtl random ]; jailbreak = true; - homepage = "https://github.com/tibbe/unordered-containers"; + homepage = https://github.com/tibbe/unordered-containers; description = "Efficient hashing-based container types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -318,7 +318,7 @@ base bytestring containers criterion deepseq random ]; jailbreak = true; - homepage = "https://github.com/aslatter/uuid"; + homepage = https://github.com/aslatter/uuid; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -338,7 +338,7 @@ test-framework-quickcheck2 transformers ]; jailbreak = true; - homepage = "https://github.com/haskell/vector"; + homepage = https://github.com/haskell/vector; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -366,7 +366,7 @@ test-framework-hunit test-framework-quickcheck2 text ]; jailbreak = true; - homepage = "http://github.com/ghcjs/ghcjs-base"; + homepage = http://github.com/ghcjs/ghcjs-base; description = "Base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; @@ -392,7 +392,7 @@ test-framework-hunit test-framework-quickcheck2 unix ]; jailbreak = true; - homepage = "http://www.haskell.org/cabal/"; + homepage = http://www.haskell.org/cabal/; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; }) {}; diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix index 8c68b6f15a67..4c4d9f4ff389 100644 --- a/pkgs/development/compilers/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/stage2.nix @@ -15,7 +15,7 @@ base HUnit test-framework test-framework-hunit ]; jailbreak = true; - homepage = "https://github.com/simonmar/async"; + homepage = https://github.com/simonmar/async; description = "Run IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42,7 +42,7 @@ test-framework-quickcheck2 text time unordered-containers vector ]; jailbreak = true; - homepage = "https://github.com/bos/aeson"; + homepage = https://github.com/bos/aeson; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67,7 +67,7 @@ test-framework-quickcheck2 text transformers vector ]; jailbreak = true; - homepage = "https://github.com/bos/attoparsec"; + homepage = https://github.com/bos/attoparsec; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -85,7 +85,7 @@ base bytestring HUnit test-framework test-framework-hunit text ]; jailbreak = true; - homepage = "https://github.com/basvandijk/case-insensitive"; + homepage = https://github.com/basvandijk/case-insensitive; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99,7 +99,7 @@ libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; jailbreak = true; - homepage = "https://github.com/spl/dlist"; + homepage = https://github.com/spl/dlist; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133,7 +133,7 @@ test-framework-hunit test-framework-quickcheck2 text unix ]; jailbreak = true; - homepage = "http://github.com/tibbe/hashable"; + homepage = http://github.com/tibbe/hashable; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146,7 +146,7 @@ doCheck = false; libraryHaskellDepends = [ base transformers ]; jailbreak = true; - homepage = "http://github.com/ekmett/mtl"; + homepage = http://github.com/ekmett/mtl; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -193,7 +193,7 @@ tasty-hunit tasty-quickcheck tasty-smallcheck text ]; jailbreak = true; - homepage = "https://github.com/basvandijk/scientific"; + homepage = https://github.com/basvandijk/scientific; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -219,7 +219,7 @@ libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers HUnit mtl ]; jailbreak = true; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB; description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -243,7 +243,7 @@ test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; - homepage = "https://github.com/bos/text"; + homepage = https://github.com/bos/text; description = "An efficient packed Unicode text type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -263,7 +263,7 @@ test-framework test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; - homepage = "https://github.com/tibbe/unordered-containers"; + homepage = https://github.com/tibbe/unordered-containers; description = "Efficient hashing-based container types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -283,7 +283,7 @@ test-framework-quickcheck2 transformers ]; jailbreak = true; - homepage = "https://github.com/haskell/vector"; + homepage = https://github.com/haskell/vector; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -311,7 +311,7 @@ test-framework-hunit test-framework-quickcheck2 text ]; jailbreak = true; - homepage = "http://github.com/ghcjs/ghcjs-base"; + homepage = http://github.com/ghcjs/ghcjs-base; description = "Base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; @@ -337,7 +337,7 @@ test-framework-hunit test-framework-quickcheck2 unix ]; jailbreak = true; - homepage = "http://www.haskell.org/cabal/"; + homepage = http://www.haskell.org/cabal/; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; }) {}; diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index ff772864e625..7d3b6860c6ed 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/"; + homepage = http://sourceforge.net/p/ghdl-updates/wiki/Home/; description = "Free VHDL simulator"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index e5ec3659f0b5..f82fc17634da 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source COBOL compiler"; - homepage = http://sourceforge.net/projects/open-cobol/; + homepage = https://sourceforge.net/projects/open-cobol/; license = licenses.gpl3; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 61408c0ebb34..0eebc92ee594 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index d7a824239b84..b1230da5a142 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8e0b1c7360f5..8a675b1b7761 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 1465206484d4..0e3eb88f537c 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://www.gnu.org/software/gprolog/"; + homepage = http://www.gnu.org/software/gprolog/; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; license = stdenv.lib.licenses.lgpl3Plus; diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index 5b241b31ee3e..24fffcf603cb 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -44,10 +44,11 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://github.com/GaloisInc/HaLVM"; + homepage = https://github.com/GaloisInc/HaLVM; description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen"; platforms = ["x86_64-linux"]; # other platforms don't have Xen maintainers = with stdenv.lib.maintainers; [ dmjio ]; inherit (bootPkgs.ghc.meta) license; + broken = true; # https://nix-cache.s3.amazonaws.com/log/6i98mhbq9nzzhwr4svlivm4gz91l2w0f-HaLVM-2.4.0.drv }; } diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index f8413075ac81..6bc7f66ca299 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { m4 python bison - flex_2_6_1 + flex llvm llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix index 77e02f3a4103..cfeff329fb56 100644 --- a/pkgs/development/compilers/jhc/default.nix +++ b/pkgs/development/compilers/jhc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Whole-program, globally optimizing Haskell compiler"; - homepage = "http://repetae.net/computer/jhc/"; + 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 ]; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index adca825b2016..cc19f7afe347 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.8.9"; in +let version = "0.9.4"; in stdenv.mkDerivation { name = "jsonnet-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "0phk8dzby5v60r7fwd1qf4as2jdpmdmksjw3g4p3mkkr7sc81119"; + sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; }; buildInputs = [ emscripten ]; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 6e3790917039..1ce60d40716d 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl +{ stdenv, fetchgit, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , runCommand @@ -54,12 +54,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.5.1"; + version = "0.5.2"; name = "${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1a9m7hzzrwk71gvwwrd1p45s64yid61i41n95gm5pzbry6p9fpl0"; + sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h"; }; prePatch = '' mkdir deps/srccache @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ''; postInstall = '' @@ -178,7 +179,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "http://julialang.org/"; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index ebdd4c760d10..63252084b5de 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "http://julialang.org/"; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 9cfa8895f74a..cfddb862f59a 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "http://julialang.org/"; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index e23bee15e1bf..65c2125dfbca 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.1.2-5"; + version = "1.1.4-2"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0whfnn7wf8nil9lb8hl9bccjrzwf9zpbf8pz607zg9x3q8g01p9d"; + sha256 = "09sikwk5xxn4b30icbq28mjs4lm9xbj0bv5yjx75r165iz65g2cv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ee0a50c93978..a3f652d783be 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { patches = [ ./D17533-1.patch ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; - # hacky fix: New LLVM releases require a newer OS X SDK than + # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 8fee3f4a87ce..9e5bccff3556 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -16,7 +16,7 @@ let # Add man output without introducing extra dependencies. overrideManOutput = drv: let drv-manpages = drv.override { enableManpages = true; }; in - drv // { man = drv-manpages.man; outputs = drv.outputs ++ ["man"]; }; + drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; llvm = callPackage ./llvm.nix { inherit compiler-rt_src stdenv; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index da40a42d9856..4978570334ea 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -116,11 +116,11 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM.${shlib}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config @@ -128,7 +128,7 @@ in stdenv.mkDerivation rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.isLinux && (!stdenv.isi686); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index 34cb63e783ec..cdf201cec7ad 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; meta = with stdenv.lib; { - homepage = "http://mcpp.sourceforge.net/"; + homepage = http://mcpp.sourceforge.net/; description = "A portable c preprocessor"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index d802aa4fe2e7..ebe562fcde32 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://www.mozart-oz.org/"; + homepage = http://www.mozart-oz.org/; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' The Mozart Programming System combines ongoing research in diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 0cebd40afdba..101f8ab64ba5 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "http://nim-lang.org/download/${name}.tar.xz"; - sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy"; + sha256 = "16vsmk4rqnkg9lc9h9jk62ps0x778cdqg6qrs3k6fv2g73cqvq9n"; }; doCheck = true; diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix new file mode 100644 index 000000000000..a63b06a9f628 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.05.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "05"; + patch_version = "0"; + sha256 = "1y9fw1ci9pwnbbrr9nwr8cq8vypcxwdf4akvxard3mxl2jx2g984"; + + # If the executable is stipped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/pkgs/development/compilers/ocaml/configure-3.08.0 index c62da78ab9fd..9c8705855120 100755 --- a/pkgs/development/compilers/ocaml/configure-3.08.0 +++ b/pkgs/development/compilers/ocaml/configure-3.08.0 @@ -45,7 +45,7 @@ gcc_warnings="-Wall" unset LANG unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME -# Turn off some MacOS X debugging stuff, same reason +# Turn off some macOS debugging stuff, same reason unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED # Parse command-line arguments diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 51effd2c7841..6234b63208cd 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 10a9eb2b3666..1e8f88beea66 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -23,7 +23,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 6dcbb0a330f1..72f0ba293ba9 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -190,7 +190,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 7ddf2c7ef5d3..3355304b3bb2 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "131"; - build = "11"; + update = "152"; + build = "04"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6"; + sha256 = "1hnpbx0v89jmbg58ym4zm255da11zf5jq8y5s58zj4x2z6b1fpxi"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8"; + sha256 = "060q01msfyspn14c9mkf9x0l8sprki9n8zb3cwlgglhnr2d4gfbr"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8"; + sha256 = "0705667y6llsmszvdcbhbxzbn1csv1f2rlyghwggx5xnaq46dhx6"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7"; + sha256 = "13f4h43lw9q1292fymn2d7whwvccpkcqraasdhvzf904101xcpsl"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820"; + sha256 = "16wqinqv0aqyf6jg3nsn6rj5s7ggq82wvx86zm584g56011vkgf6"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi"; + sha256 = "0japl4nyb8y3w1mpfpkxn5vkf8fap1rg340vjnb6qm6fpqvl964f"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8"; + sha256 = "024zphx9r92ws9xjihvhyrbbbamfl7js0s24ff577v5z5gdb1lly"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak"; + sha256 = "1crnbjjv1s6ndqpllcrggcpsxvqcnpr58zp51y0hjz3m3gpsxwcq"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; @@ -97,6 +97,11 @@ let chmod +x configure substituteInPlace configure --replace /bin/bash "$shell" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" + substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" + '' + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks" ''; configureFlags = [ @@ -202,7 +207,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8fe775de146f..2a00cf5f2d29 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -3,6 +3,7 @@ , downloadUrl , sha256_i686 , sha256_x86_64 +, sha256_armv7l , jceName , jceDownloadUrl , sha256JCE @@ -26,7 +27,8 @@ , mesa_noglu , freetype , fontconfig -, gnome2 +, gtk2 +, pango , cairo , alsaLib , atk @@ -34,10 +36,13 @@ , setJavaClassPath }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +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. @@ -47,8 +52,10 @@ let "i386" else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv7l-linux" then + "arm" else - abort "jdk requires i686-linux or x86_64 linux"; + abortArch; jce = if installjce then @@ -59,6 +66,14 @@ let } else ""; + + rSubPaths = [ + "lib/${architecture}/jli" + "lib/${architecture}/server" + "lib/${architecture}/xawt" + "lib/${architecture}" + ]; + in let result = stdenv.mkDerivation rec { @@ -78,8 +93,14 @@ let result = stdenv.mkDerivation rec { 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 - abort "jdk requires i686-linux or x86_64 linux"; + abortArch; nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; @@ -134,18 +155,6 @@ let result = stdenv.mkDerivation rec { cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security fi - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - if test -z "$pluginSupport"; then rm -f $out/bin/javaws if test -n "$installjdk"; then @@ -157,17 +166,28 @@ let result = stdenv.mkDerivation rec { ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk"; then + if test -n "$installjdk" -a -x $out/bin/jmc; then wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "${rpath}" + --suffix-each LD_LIBRARY_PATH ':' "$rpath" fi ''; @@ -177,7 +197,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; @@ -192,7 +212,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; # some inherit jre.meta.platforms + platforms = [ "i686-linux" "x86_64-linux" "armv7l-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 8e93f76ff185..0d12b3ac89b0 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "131"; + patchVersion = "144"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; - sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; + sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; 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 8e93f76ff185..0d12b3ac89b0 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "131"; + patchVersion = "144"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; - sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; + sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; 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 fa3c95c9e090..5e0cbb9d395d 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; - homepage = "http://code.entropywave.com/orc/"; + homepage = http://code.entropywave.com/orc/; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = licenses.bsd3; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix new file mode 100644 index 000000000000..b01914afc295 --- /dev/null +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, coreutils }: + +stdenv.mkDerivation rec { + name = "owl-lisp-${version}"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "aoh"; + repo = "owl-lisp"; + rev = "v${version}"; + sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz"; + }; + + prePatch = '' + substituteInPlace Makefile --replace /usr $out + + for f in tests/run tests/exec.sh ; do + substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo + done + ''; + + # tests are already run as part of the compilation process + doCheck = false; + + meta = with stdenv.lib; { + descripton = "A functional lisp"; + homepage = https://github.com/aoh/owl-lisp; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 084a0941d24e..d7590146e2ad 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { base containers directory either filepath mtl pretty syb time ]; testHaskellDepends = [ base Cabal filepath mtl ]; - homepage = "http://curry-language.org"; + homepage = http://curry-language.org; description = "Functions for manipulating Curry programs"; license = "unknown"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { process syb transformers ]; testHaskellDepends = [ base Cabal curryBase filepath ]; - homepage = "http://curry-language.org"; + homepage = http://curry-language.org; description = "Compile the functional logic language Curry to several intermediate formats"; license = "unknown"; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; + homepage = http://www.informatik.uni-kiel.de/~pakcs/; description = "An implementation of the multi-paradigm declarative language Curry"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix new file mode 100644 index 000000000000..8b5d14e7f5fb --- /dev/null +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, autoreconfHook}: + +let + version = "5.6"; +in + +stdenv.mkDerivation { + name = "polyml-${version}"; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace stdc++ c++ + ''; + + buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + src = fetchurl { + url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; + sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0"; + }; + + meta = { + description = "Standard ML compiler and interpreter"; + longDescription = '' + Poly/ML is a full implementation of Standard ML. + ''; + homepage = http://www.polyml.org/; + license = stdenv.lib.licenses.lgpl21; + platforms = with stdenv.lib.platforms; linux; + maintainers = [ #Add your name here! + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 6e393426b7a8..f605f31c06dc 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.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif"; + sha256 = "0favj1895fp5j5i23cmjn9wvrrlchr2dmc18grlvbjr2cg2c76mg"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index c91d9d603d54..21488361f4a9 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,13 +1,14 @@ {stdenv, fetchFromGitHub, ponyc }: -stdenv.mkDerivation { - name = "pony-stable-unstable-2017-04-20"; +stdenv.mkDerivation rec { + name = "pony-stable-${version}"; + version = "0.0.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; - rev = "b2ea566b02ec40480f888652b04eaa5f191a241e"; - sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19"; + rev = version; + sha256 = "0q05135mnzzdwam7cnmxq34clqhmc83yp2gi63sx20c74rcw3p6v"; }; buildInputs = [ ponyc ]; @@ -18,9 +19,9 @@ stdenv.mkDerivation { meta = { description = "A simple dependency manager for the Pony language."; - homepage = http://www.ponylang.org; + homepage = https://www.ponylang.org; license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.dipinhora ]; + maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 70ef8b63277f..306eaa93958f 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.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l"; + sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb"; }; isLibrary = false; diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix deleted file mode 100644 index 38473897698d..000000000000 --- a/pkgs/development/compilers/rdmd/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, lib, fetchurl, dmd}: - -stdenv.mkDerivation { - name = "rdmd-2.067.0"; - - buildInputs = [ dmd ]; - - src = fetchurl { - url = "https://github.com/D-Programming-Language/tools/archive/v2.067.0.tar.gz"; - sha256 = "2702ecda0427c675084d9b688449bc8c8392fd73e30257d79e2488640d5a9982"; - }; - - buildPhase = '' - dmd rdmd.d - ''; - - installPhase = '' - mkdir -p $out/bin - cp rdmd $out/bin/ - ''; - - meta = { - description = "Wrapper for D language compiler"; - homepage = http://dlang.org/rdmd.html; - license = lib.licenses.boost; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 7233cceca059..f883500eeb9f 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=\${out}"; meta = with stdenv.lib; { - homepage = "https://www.anjbe.name/rgbds/"; + homepage = https://www.anjbe.name/rgbds/; description = "An assembler/linker package that produces Game Boy programs"; license = licenses.free; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2d4d6ad4db1f..ac4102c9a63c 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://crates.io; + homepage = https://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ wizeman retrry ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 28863e450a7a..f5bcc73fd6d1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -114,13 +114,17 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake - which libffi gdb ]; + nativeBuildInputs = + [ file python2 procps rustPlatform.rust.rustc git cmake + which libffi + ] + # Only needed for the debuginfo tests + ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains ++ optional (!forceBundledLLVM) llvmShared; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; setOutputFlags = false; # Disable codegen units for the tests. diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 1fe2bb90ad92..707f7966dd9b 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; + homepage = http://www.sbcl.org; license = licenses.publicDomain; # and FreeBSD maintainers = [maintainers.raskin maintainers.tohl]; platforms = attrNames options; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3bd1982baa59..82859a0e4298 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.19"; + version = "1.3.20"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm"; + sha256 = "0qhzrl2msdyzqp3165qlh9s6jrif5rddsmj9q50z0bxnaf0330jj"; }; patchPhase = '' diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index e48fc63096e5..d4d4a0f31bc5 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.2"; + name = "scala-2.12.3"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r"; + sha256 = "133w4r2214ci7r4sg2yyk9lhn62ldm4ad0d89drwrvgvffvnly9b"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 6ace7d96be8c..714f06d0b53f 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: let - version = "0.4.12"; - rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c"; - sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7"; + version = "0.4.13"; + rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14"; + sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -27,6 +27,9 @@ stdenv.mkDerivation { --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" + substituteInPlace cmake/EthDependencies.cmake \ + --replace 'set(Boost_USE_STATIC_LIBS ON)' \ + 'set(Boost_USE_STATIC_LIBS OFF)' ''; buildInputs = [ boost cmake ]; @@ -36,6 +39,7 @@ stdenv.mkDerivation { longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = [ stdenv.lib.maintainers.dbrock ]; inherit version; }; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 79f7e5256b21..0f84b8ba4cd8 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "7.2.3"; + version = "7.4.2"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; - sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3"; + sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 839ecdbeb652..96b22b630f4f 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Swift Programming Language"; - homepage = "https://github.com/apple/swift"; + homepage = https://github.com/apple/swift; maintainers = with maintainers; [ jb55 dtzWill ]; license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch index 9f1976a2d88d..fa2ccdf9d5c6 100644 --- a/pkgs/development/compilers/swift/patches/build-script-pax.patch +++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch @@ -1,12 +1,13 @@ --- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600 +++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600 -@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() { +@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() { fi } +## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh +isELF() { + local fn="$1" ++ local fd + local magic + exec {fd}< "$fn" + read -n 4 -u $fd magic diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index c7e3c4b3c672..7e083ffe67be 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170605"; + date = "20170710"; version = "0.9.27pre-${date}"; - rev = "3e4b7693bfd5b76570b35558c83a935326513eff"; - sha256 = "0m5k1df73kakvg9xz06y3nlac4mwfccni6hdijaf4w8fyy3zz4bg"; + rev = "2acb04f7f2077a4cff103421d79ceee48441918a"; + sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index d20057916805..79b22214eccd 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { inherit clang; meta = with stdenv.lib; { - homepage = "http://www.cs.uu.nl/wiki/UHC"; + homepage = http://www.cs.uu.nl/wiki/UHC; description = "Utrecht Haskell Compiler"; maintainers = [ maintainers.phile314 ]; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index c1e1e2ece7a8..7145a8f2fa04 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "urweb-${version}"; - version = "20170105"; + version = "20170720"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "2ad3aea2c4851c9b18f752d38c7127af8293fbbbbdb3dd06b73a4603fe399b67"; + sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb"; }; buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index b0153a754032..42b81a21a671 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -18,7 +18,7 @@ let meta = with stdenv.lib; { description = "Compiler for GObject type system"; - homepage = "http://live.gnome.org/Vala"; + homepage = http://live.gnome.org/Vala; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ antono lethalman peterhoeg ]; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 2ea2faa3e09e..78df2583140b 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = "http://www.villehelin.com/wla.html"; + homepage = http://www.villehelin.com/wla.html; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; license = licenses.gpl2; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 021efbba34c1..8e37dc76441b 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-tabling=yes"; meta = { - homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; + homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; description = "A ISO-compatible high-performance Prolog compiler"; license = stdenv.lib.licenses.artistic2; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 7621aa82bc75..f7638757ff7a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,17 +1,28 @@ -{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }: - -with pkgs; +{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg +, swingSupport ? true }: let - version = "8.19.0.1"; - openjdk = "8.0.112"; + version = "8.21.0.1"; + openjdk = "8.0.131"; - sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x"; - sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd"; + sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; + sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; extension = if stdenv.isDarwin then "zip" else "tar.gz"; + + libraries = [ + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango + gnome2.gtk cairo gdk_pixbuf atk + ] ++ (lib.optionals swingSupport (with xorg; [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp + xorg.libXt xorg.libXrender stdenv.cc.cc + ])); + in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; @@ -22,7 +33,7 @@ in stdenv.mkDerivation rec { sha256 = hash; }; - buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ]; + buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip; installPhase = '' mkdir -p $out @@ -43,7 +54,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook @@ -51,9 +62,6 @@ in stdenv.mkDerivation rec { EOF ''; - libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ] - ++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]); - rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { @@ -64,8 +72,11 @@ in stdenv.mkDerivation rec { homepage = https://www.azul.com/products/zulu/; license = licenses.gpl2; description = "Certified builds of OpenJDK"; - longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms"; - maintainers = with maintainers; [ nequissimus ]; + longDescription = '' + Certified builds of OpenJDK that can be deployed across multiple + operating systems, containers, hypervisors and Cloud platforms. + ''; + maintainers = with maintainers; [ nequissimus fpletz ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix new file mode 100644 index 000000000000..c7aaf2a2e329 --- /dev/null +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-CoLoR-1.3.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/36399/color.1.3.0.tar.gz; + sha256 = "0n7431mc4a5bn9fsyk5167j2vnbxz4vgggjch4pm0x58lda8mxv1"; + }; + + buildInputs = [ coq ]; + enableParallelBuilding = true; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = http://color.inria.fr/; + description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index d27ba0052994..a27a247c9d0b 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/uds-psl/autosubst.git; rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; - sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0"; + sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341"; }; propagatedBuildInputs = [ mathcomp ]; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index e07c7c80ac03..c3169970ad24 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-interval-3.1.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz; - sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf"; + url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index e12327a347f4..0e7549623e7a 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchFromGitHub, coq }: +{ stdenv, fetchurl, coq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-math-classes-2016-06-08"; + name = "coq${coq.coq-version}-math-classes-1.0.6"; - src = fetchFromGitHub { - owner = "math-classes"; - repo = "math-classes"; - rev = "751e63b260bd2f78b280f2566c08a18034bd40b3"; - sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + src = fetchurl { + url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz; + sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02"; }; + # src = fetchFromGitHub { + # owner = "math-classes"; + # repo = "math-classes"; + # rev = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c"; + # sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + # }; + buildInputs = [ coq ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; @@ -17,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://math-classes.github.io; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; }; } diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 313580fe600a..52dbd89232b7 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { makeFlags = ["GUILE_AUTO_COMPILE=0"]; meta = { description = "Bindings to SDL2 for GNU Guile"; - homepage = "https://git.dthompson.us/guile-sdl2.git"; + homepage = https://git.dthompson.us/guile-sdl2.git; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.seppeljordan ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d9b185b4751d..be35c447e720 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -9,25 +9,34 @@ # # See comment at the top of configuration-nix.nix for more information about this # distinction. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { + # 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 + # successfully with recent versions of the compiler). + bin-package-db = null; + # Some Hackage packages reference this attribute, which exists only in the # GHCJS package set. We provide a dummy version here to fix potential # evaluation errors. ghcjs-base = null; + ghcjs-prim = null; - # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); + # 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_0_2; }); + hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; # enable using a local hoogle with extra packagages in the database - # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])" + # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; @@ -70,7 +79,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx"; + sha256 = "15d29hmbl146axjgbm4qhxpz6ypcq1bjf2aj29yhwh5jmznh58i2"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -78,6 +87,11 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; + # Fix test trying to access /home directory + shell-conduit = (overrideCabal super.shell-conduit (drv: { + postPatch = "sed -i s/home/tmp/ test/Spec.hs"; + })); + # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; @@ -163,25 +177,8 @@ self: super: { # https://github.com/jaspervdj/hakyll/issues/491 else dontCheck super.hakyll; - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required - # on darwin: https://github.com/NixOS/cabal2nix/issues/146. - hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - - # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues. - # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; - double-conversion = if !pkgs.stdenv.isDarwin - then addExtraLibrary - # https://github.com/bos/double-conversion/pull/17 - (appendPatch super.double-conversion (pkgs.fetchpatch { - url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch"; - sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9"; - })) - pkgs.stdenv.cc.cc.lib + then super.double-conversion else addExtraLibrary (overrideCabal super.double-conversion (drv: { postPatch = '' @@ -274,7 +271,6 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw camfort = dontCheck super.camfort; - cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw cjk = dontCheck super.cjk; CLI = dontCheck super.CLI; # Upstream has no issue tracker. command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw @@ -376,7 +372,6 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; - symengine = dontCheck super.symengine; tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; @@ -427,6 +422,9 @@ self: super: { # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; + # https://github.com/purescript/purescript/pull/3041 + purescript = doJailbreak super.purescript; + # 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 @@ -589,15 +587,23 @@ self: super: { doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) + local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir - mkdir -p $out/share/emacs/site-lisp - ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/ + mkdir -p $data/share/emacs/site-lisp + ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/ ''; }); # Fine-tune the build. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { + src = pkgs.fetchFromGitHub { + owner = "chrisdone"; + repo = "structured-haskell-mode"; + rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; + sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; + }; + version = "20170523-git"; + editedCabalFile = null; # Statically linked Haskell libraries make the tool start-up much faster, # which is important for use in Emacs. enableSharedExecutables = false; @@ -605,22 +611,22 @@ self: super: { # cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + 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. + # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { @@ -666,11 +672,6 @@ self: super: { # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; - # Haste stuff - haste-Cabal = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {}); - haste-cabal-install = markBroken (self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; }); - haste-compiler = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; }); - # tinc is a new build driver a la Stack that's not yet available from Hackage. tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; }; @@ -682,14 +683,6 @@ self: super: { then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # The stack people don't bother making their own code compile in an LTS-based - # environment: https://github.com/commercialhaskell/stack/issues/3001. - stack = super.stack.overrideScope (self: super: { - store-core = self.store-core_0_3; - store = self.store_0_3_1; - hpack = self.hpack_0_17_1; - }); - # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only. intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {}; @@ -704,18 +697,17 @@ self: super: { # test suite cannot find its own "idris" binary 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; # broken test suite servant-server = dontCheck super.servant-server; - # Fix build for latest versions of servant and servant-client. - servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: { - servant-server = self.servant-server_0_11; - servant = self.servant_0_11; - }); - # build servant docs from the repository servant = let @@ -726,7 +718,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0"; + sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; @@ -736,13 +728,12 @@ self: super: { }; in overrideCabal super.servant (old: { postInstall = old.postInstall or "" + '' - ln -s ${docs} $out/share/doc/servant + ln -s ${docs} $doc/share/doc/servant ''; }); - - # https://github.com/plow-technologies/servant-auth/issues/20 - servant-auth = dontCheck super.servant-auth; + # Glob == 0.7.x + servant-auth = doJailbreak super.servant-auth; # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; @@ -865,6 +856,7 @@ self: super: { # build liquidhaskell with the proper (old) aeson version liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; + aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; }; # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. @@ -873,4 +865,25 @@ self: super: { postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; }); + # Has a dependency on outdated versions of directory. + cautious-file = doJailbreak (dontCheck super.cautious-file); + + # 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; + + # missing dependencies: doctest ==0.12.* + html-entities = doJailbreak super.html-entities; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 6be7ae16572a..387754d674e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index c2a7e0014056..f2e09ee69d64 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -64,21 +64,16 @@ self: super: { 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; - # Needs void on pre 7.10.x compilers. + # 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; - - # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - - # Needs nats on pre 7.6.x compilers. 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; 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 7f561133b64e..18040e9fb3c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -36,9 +36,6 @@ self: super: { unix = null; xhtml = null; - # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); - # Build jailbreak-cabal with the latest version of Cabal. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; @@ -167,6 +164,12 @@ self: super: { vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; + # vector with ghc < 8.0 needs semigroups + vector = addBuildDepend super.vector self.semigroups; + + # too strict dependency on directory + tasty-ant-xml = doJailbreak super.tasty-ant-xml; + # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; @@ -180,7 +183,7 @@ self: super: { # GHC versions prior to 8.x require additional build inputs. dependent-map = addBuildDepend super.dependent-map self.semigroups; - distributive = addBuildDepend super.distributive 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]); @@ -193,7 +196,7 @@ self: super: { lens = addBuildDepend super.lens self.generic-deriving; optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; - semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); + 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 ]; }); # cereal must have `fail` in pre-ghc-8.0.x versions @@ -203,4 +206,8 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; + # 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.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 911fb8640f42..b72f9e4c69fd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -77,6 +77,7 @@ self: super: { 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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 8a6d22bcc7ec..b81fd3e81766 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -101,6 +101,8 @@ self: super: { 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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 43ec45bf8217..61d7e53be222 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -82,8 +82,9 @@ self: super: { postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }); - # blaze-builder requires an additional build input on older compilers. + # 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 @@ -96,10 +97,11 @@ self: super: { # 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 super.distributive self.semigroups; + 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; @@ -112,4 +114,8 @@ self: super: { # 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 index a97cbfde4fc9..3914e3d9b932 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -144,12 +144,13 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Needs additional inputs on old compilers. - semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); + 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 super.distributive self.semigroups; + 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; @@ -157,4 +158,8 @@ self: super: { # 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; + } 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 83efa6b0b5a3..ade4d5e915dc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -35,9 +35,6 @@ self: super: { unix = null; xhtml = null; - # cabal-install can use the native Cabal library. - cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; @@ -47,8 +44,6 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); - ## GHC 8.0.2 - # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 vector-algorithms = dontCheck super.vector-algorithms; @@ -60,4 +55,8 @@ self: super: { # Newer versions require ghc>=8.2 apply-refact = super.apply-refact_0_3_0_1; + + # This builds needs the latest Cabal version. + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + } 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 e4d0e00a3266..fc0c34f03971 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -39,8 +39,8 @@ self: super: { # cabal-install can use the native Cabal library. cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # jailbreak-cabal doesn't seem to work right with the native Cabal version. + jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { @@ -48,8 +48,6 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); - ## GHC > 8.0.2 - # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 vector-algorithms = dontCheck super.vector-algorithms; @@ -59,12 +57,15 @@ self: super: { # https://github.com/nominolo/ghc-syb/issues/20 ghc-syb-utils = dontCheck super.ghc-syb-utils; - # Older, LTS-8-based versions don't compile. - vector = super.vector_0_12_0_1; - primitive = self.primitive_0_6_2_0; - syb = self.syb_0_7; - # Work around overly restrictive constraints on the version of 'base'. - doctest = doJailbreak super.doctest; + ChasingBottoms = doJailbreak super.ChasingBottoms; + hashable = doJailbreak super.hashable; + protolude = doJailbreak super.protolude; + quickcheck-instances = doJailbreak super.quickcheck-instances; + + # 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; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 6a9d15d402ef..4b7fc3d83603 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index fd7f15008d26..0f17f5ce707b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -2,14 +2,14 @@ # # Please insert new packages *alphabetically* # in the OTHER PACKAGES section. -{ pkgs }: +{ pkgs, haskellLib }: let removeLibraryHaskellDepends = pnames: depends: builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; in -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: @@ -150,6 +150,17 @@ self: super: http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + # These are the correct dependencies specified when calling `cabal2nix --compiler ghcjs` + # By default, the `miso` derivation present in hackage-packages.nix + # does not contain dependencies suitable for ghcjs + miso = overrideCabal super.miso (drv: { + libraryHaskellDepends = with self; [ + BoundedChan bytestring containers ghcjs-base aeson base + http-api-data http-types network-uri scientific servant text + transformers unordered-containers vector + ]; + }); + pqueue = overrideCabal super.pqueue (drv: { postPatch = '' sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c3a33e73f775..40e50bd5ce97 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,35 +37,41 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.21 + # LTS Haskell 9.1 - abstract-deque ==0.3 + - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 - - accelerate ==0.15.1.0 + - accelerate ==1.0.0.0 - accuerr ==0.2.0.2 - ace ==0.6 - - acid-state ==0.14.2 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - ad ==4.3.3 + - ad ==4.3.4 - adjunctions ==4.3 - adler32 ==0.1.1.0 - - aeson ==1.0.2.1 + - aeson ==1.1.2.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 - - aeson-diff ==1.1.0.2 + - aeson-diff ==1.1.0.3 - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - aeson-injector ==1.0.8.0 + - aeson-lens ==0.5.0.0 - aeson-pretty ==0.8.5 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - Agda ==2.5.2 - airship ==0.6.0 - - alarmclock ==0.4.0.2 + - alarmclock ==0.4.0.3 + - alerta ==0.1.0.4 - alex ==3.2.1 - - algebraic-graphs ==0.0.4 + - 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 - ALUT ==2.4.0.2 - amazonka ==1.4.5 @@ -139,7 +145,7 @@ default-package-overrides: - amazonka-route53 ==1.4.5 - amazonka-route53-domains ==1.4.5 - amazonka-s3 ==1.4.5 - - amazonka-s3-streaming ==0.1.0.4 + - amazonka-s3-streaming ==0.2.0.3 - amazonka-sdb ==1.4.5 - amazonka-servicecatalog ==1.4.5 - amazonka-ses ==1.4.5 @@ -158,57 +164,65 @@ default-package-overrides: - amazonka-waf ==1.4.5 - amazonka-workspaces ==1.4.5 - amazonka-xray ==1.4.5 - - amqp ==0.14.1 + - amqp ==0.15.1 - annotated-wl-pprint ==0.7.0 - anonymous-sums ==0.6.0.0 - ansi-terminal ==0.6.3.1 - ansi-wl-pprint ==0.6.7.3 - - ansigraph ==0.3.0.2 + - ansigraph ==0.3.0.3 + - api-field-json-th ==0.1.0.2 - app-settings ==0.2.0.11 - appar ==0.1.4 - apportionment ==0.0.0.2 + - approximate ==0.3.1 - arbtt ==0.9.0.13 - - arithmoi ==0.4.3.0 + - arithmoi ==0.5.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrow-list ==0.7 + - arrowp-qq ==0.1.1 - ascii-progress ==0.3.3.0 - asciidiagram ==1.3.3 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 + - astro ==0.4.2.0 - async ==2.1.1.1 - async-dejafu ==0.1.3.0 - - async-extra ==0.1.0.0 - - async-refresh ==0.2.0 - - async-refresh-tokens ==0.1.0 + - async-extra ==0.2.0.0 + - async-refresh ==0.2.0.2 + - async-refresh-tokens ==0.3.0.0 + - async-timer ==0.1.4.0 - atom-basic ==0.2.5 - - atom-conduit ==0.4.0.1 - - atomic-primops ==0.8.0.4 + - atom-conduit ==0.4.0.3 + - atomic-primops ==0.8.1 - atomic-write ==0.2.0.5 - attoparsec ==0.13.1.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.0.0 + - attoparsec-time ==0.1.3.2 - audacity ==0.0.1.2 - authenticate ==1.3.3.2 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - auto-update ==0.1.4 - - autoexporter ==1.0.0 + - autoexporter ==1.1.2 - avers ==0.0.17.1 - avers-api ==0.0.18.0 - avers-api-docs ==0.0.18.0 - - avers-server ==0.0.18.0 + - avers-server ==0.0.19.0 - avwx ==0.3.0.2 - - b9 ==0.5.31 + - aws ==0.16 + - axiom ==0.4.6 + - b9 ==0.5.32 - backprop ==0.0.3.0 - bake ==0.5 - - bank-holidays-england ==0.1.0.5 + - bank-holidays-england ==0.1.0.6 - base-compat ==0.9.3 - base-noprelude ==4.9.1.0 - - base-orphans ==0.5.4 - - base-prelude ==1.0.1.1 + - base-orphans ==0.6 + - base-prelude ==1.2.0.1 - base-unicode-symbols ==0.2.2.4 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -217,8 +231,8 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 - - bench ==1.0.5 - - benchpress ==0.2.2.9 + - bench ==1.0.6 + - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 @@ -227,11 +241,11 @@ default-package-overrides: - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - - binary-conduit ==1.2.4.1 + - binary-conduit ==1.2.5 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - binary-orphans ==0.1.6.0 - - binary-parser ==0.5.2 + - binary-parser ==0.5.5 - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-tagged ==0.1.4.2 @@ -241,6 +255,7 @@ default-package-overrides: - bindings-libzip ==1.0.1 - bioace ==0.0.1 - bioalign ==0.0.5 + - BiobaseNewick ==0.0.0.2 - biocore ==0.3.1 - biofasta ==0.0.3 - biofastq ==0.1 @@ -260,29 +275,32 @@ default-package-overrides: - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 - - blaze-html ==0.8.1.3 - - blaze-markup ==0.7.1.1 + - blaze-html ==0.9.0.1 + - 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.12.1.0 + - bloodhound ==0.14.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.1 + - bookkeeping ==0.2.1.4 - bool-extras ==0.4.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - - boomerang ==1.4.5.2 + - boomerang ==1.4.5.3 - 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.17.2 + - brick ==0.18 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 @@ -301,24 +319,23 @@ default-package-overrides: - 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.4 - - c2hs ==0.28.1 + - c2hs ==0.28.2 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 - cabal-doctest ==1.0.2 - cabal-file-th ==0.2.4 - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.11.1 + - cabal-rpm ==0.11.2 - cache ==0.1.0.0 - - cacophony ==0.9.2 + - cacophony ==0.10.0 - cairo ==0.13.3.1 - calendar-recycling ==0.0 - call-stack ==0.1.0 - - camfort ==0.901 - - carray ==0.1.6.7 + - carray ==0.1.6.8 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.10 - cased ==0.1.0.0 @@ -326,7 +343,6 @@ default-package-overrides: - casing ==0.1.2.1 - cassava ==0.4.5.1 - cassava-conduit ==0.3.5.1 - - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - cayley-client ==0.4.1 - cereal ==0.5.4.0 @@ -340,8 +356,8 @@ default-package-overrides: - Chart ==1.8.2 - Chart-cairo ==1.8.2 - Chart-diagrams ==1.8.2 - - chart-unit ==0.1.0.0 - - ChasingBottoms ==1.3.1.2 + - chart-unit ==0.4.1 + - chaselev-deque ==0.5.0.5 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -368,20 +384,18 @@ default-package-overrides: - classy-prelude-conduit ==1.2.0 - classy-prelude-yesod ==1.2.0 - clay ==0.12.2 - - clckwrks ==0.24.0.3 - - clckwrks-cli ==0.2.17.1 - - clckwrks-plugin-media ==0.6.16.3 - - clckwrks-plugin-page ==0.4.3.9 - - clckwrks-theme-bootstrap ==0.4.2.1 - cli ==0.1.2 - clientsession ==0.9.1.2 - - Clipboard ==2.3.1.0 + - 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 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.1 - clustering ==0.3.1 - - cmark ==0.5.5.1 + - cmark ==0.5.6 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.17 @@ -392,22 +406,23 @@ default-package-overrides: - colour ==2.3.3 - comfort-graph ==0.0.2 - commutative ==0.0.1.4 - - comonad ==5.0.1 + - comonad ==5.0.2 - comonad-transformers ==4.0 - comonads-fd ==4.0 - - compactmap ==0.1.4.2 + - compactmap ==0.1.4.2.1 + - compensated ==0.7.2 - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.0 - - concurrency ==1.0.0.0 - - concurrent-output ==1.7.9 + - concurrency ==1.1.2.1 + - concurrent-output ==1.9.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - conduit ==1.2.11 - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.16 - - conduit-iconv ==0.1.1.1 + - conduit-iconv ==0.1.1.2 - conduit-parse ==0.1.2.1 - ConfigFile ==1.1.4 - configuration-tools ==0.2.15 @@ -425,11 +440,6 @@ default-package-overrides: - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 - - conversion ==1.2.1 - - conversion-bytestring ==1.0.1 - - conversion-case-insensitive ==1.0.0.0 - - conversion-text ==1.0.1 - - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 - countable ==1.0 @@ -440,16 +450,14 @@ default-package-overrides: - cpuinfo ==0.1.0.1 - cql ==3.1.1 - cql-io ==0.16.0 - - crackNum ==1.9 - criterion ==1.1.4.0 - cron ==0.5.0 + - crypt-sha512 ==0 - crypto-api ==0.13.2 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - crypto-enigma ==0.0.2.8 - - 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 @@ -460,35 +468,38 @@ default-package-overrides: - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.100.1 - - cryptol ==2.4.0 - - cryptonite ==0.21 + - cryptohash-sha512 ==0.11.100.1 + - cryptonite ==0.23 - cryptonite-conduit ==0.2.0 - - cryptonite-openssl ==0.5 + - cryptonite-openssl ==0.6 - csp ==1.3.1 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 - csv-conduit ==0.6.7 - ctrie ==0.1.1.0 - - cubicbezier ==0.5.0.0 + - cubicbezier ==0.6.0.4 - cubicspline ==0.1.2 - - cue-sheet ==0.1.0 + - cue-sheet ==0.1.1 - curl ==1.3.8 - cutter ==0.0 - darcs ==2.12.5 - data-accessor ==0.2.2.7 - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.13 + - data-accessor-template ==0.2.1.14 - data-accessor-transformers ==0.2.1.7 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-check ==0.1.1 - data-checked ==0.3 + - data-clist ==0.1.2.0 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - 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-dword ==0.3.1.1 - data-endian ==0.1.1 - data-fix ==0.0.4 @@ -504,67 +515,69 @@ default-package-overrides: - data-reify ==0.6.1 - data-serializer ==0.3 - data-textual ==0.3.0.2 - - datasets ==0.2.1 - dataurl ==0.1.0.0 - DAV ==1.3.1 - dawg-ord ==0.5.1.0 + - dbus ==0.10.13 - debian-build ==0.10.1.0 - Decimal ==0.4.2 - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - - dejafu ==0.4.0.0 + - dejafu ==0.7.1.1 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - - derive ==2.6.2 + - derive ==2.6.3 - deriving-compat ==0.3.6 - descriptive ==0.9.4 - diagrams ==1.4 - diagrams-builder ==0.8.0.1 - diagrams-cairo ==1.4 - diagrams-canvas ==1.4 - - diagrams-contrib ==1.4.0.1 + - diagrams-contrib ==1.4.1 - diagrams-core ==1.4 - diagrams-gtk ==1.4 - diagrams-html5 ==1.4 - diagrams-lib ==1.4.1.2 - diagrams-postscript ==1.4 - diagrams-rasterific ==1.4 - - diagrams-solve ==0.1.0.1 + - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.1 - - dice ==0.1 - - dictionaries ==0.1.0.1 + - dictionaries ==0.2.0.3 - Diff ==0.3.4 - diff3 ==0.3.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.19 + - direct-sqlite ==2.3.20 - directory-tree ==0.12.1 + - discord-gateway ==0.2.2 + - discord-hs ==0.4.2 + - discord-rest ==0.2.2 + - discord-types ==0.2.2 - discount ==0.1.1 - 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.6.6 - - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - distribution ==1.1.1.0 - - distributive ==0.5.2 + - distributive ==0.5.3 - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - - dlist ==0.8.0.2 + - 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.10 + - dns ==2.0.12 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - doctemplates ==0.1.0.2 - - doctest ==0.11.3 + - doctest ==0.11.4 - doctest-discover ==0.1.0.7 - dotenv ==0.3.4.0 - dotnet-timespan ==0.0.1.0 @@ -573,14 +586,14 @@ default-package-overrides: - dpor ==0.2.0.0 - drawille ==0.1.2.0 - DRBG ==0.5.5 - - drifter ==0.2.2 + - drifter ==0.2.3 - drifter-postgresql ==0.1.0 - dsp ==0.2.3.1 - - dual-tree ==0.2.0.9 + - dual-tree ==0.2.1 - dvorak ==0.1.0.0 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - - Earley ==0.11.0.1 + - Earley ==0.12.0.1 - easy-file ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 @@ -592,26 +605,26 @@ 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.2 + - effin ==0.3.0.3 - either ==4.4.1.1 - either-unwrap ==1.1 - - ekg ==0.4.0.13 - - ekg-core ==0.1.1.1 - - ekg-json ==0.1.0.5 - - ekg-statsd ==0.2.1.0 - - ekg-wai ==0.1.0.1 + - ekg ==0.4.0.14 + - ekg-core ==0.1.1.2 + - ekg-json ==0.1.0.6 + - ekg-statsd ==0.2.1.1 + - ekg-wai ==0.1.0.2 - elerea ==2.9.0 - elm-bridge ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - - email-validate ==2.2.1.1 + - email-validate ==2.3.1 - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 - - engine-io ==1.2.16 + - 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 @@ -624,16 +637,23 @@ default-package-overrides: - equal-files ==0.0.5.3 - equivalence ==0.3.2 - erf ==2.0.0.0 - - errors ==2.1.3 - - ersatz ==0.3.1 + - errors ==2.2.1 + - ersatz ==0.4.1 - esqueleto ==2.5.3 - - etc ==0.0.0.2 + - etc ==0.2.0.0 - etcd ==1.0.5 - - ether ==0.4.2.0 + - ether ==0.5.1.0 - euphoria ==0.8.0.0 - event ==0.1.4 - event-list ==0.1.1.3 - - eventstore ==0.14.0.2 + - 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 + - eventstore ==0.15.0.2 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exception-mtl ==0.4.0.1 @@ -642,12 +662,12 @@ default-package-overrides: - exceptions ==0.8.3 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - - exhaustive ==1.1.4 + - exhaustive ==1.1.5 - exp-pairs ==0.1.5.2 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - - extensible ==0.3.7 - - extensible-effects ==1.11.0.4 + - extensible ==0.4.3 + - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 - extract-dependencies ==0.2.0.1 @@ -658,67 +678,70 @@ default-package-overrides: - fast-logger ==2.4.10 - fast-math ==1.0.2 - fasta ==0.10.4.2 - - fay ==0.23.1.16 - - fay-base ==0.20.0.1 - - fay-builder ==0.2.0.5 - - fay-dom ==0.5.0.1 - - fay-jquery ==0.6.1.0 - - fay-text ==0.3.2.2 - - fay-uri ==0.2.0.0 + - fb ==1.1.1 - fclabels ==2.0.3.2 + - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.5.3.1 + - fgl ==5.5.4.0 - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 - file-modules ==0.1.2.4 - filecache ==0.2.9 - - filelock ==0.1.0.1 + - filelock ==0.1.1.2 - filemanip ==0.3.6.3 + - fileplow ==0.1.0.0 + - filter-logger ==0.6.0.0 + - find-clumpiness ==0.2.2.0 - fingertree ==0.1.1.0 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.2.0 - fixed ==0.2.1.1 - fixed-length ==0.2 - fixed-vector ==0.9.0.0 - - fixed-vector-hetero ==0.3.1.1 + - fixed-vector-hetero ==0.3.1.2 - 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.7 + - flow ==1.0.8 - fmlist ==0.9 + - fmt ==0.3.0.0 - fn ==0.3.0.1 - - focus ==0.1.5 - - fold-debounce ==0.2.0.5 + - 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 - - folds ==0.7.3 - - FontyFruity ==0.5.3.2 + - folds ==0.7.4 + - FontyFruity ==0.5.3.3 - force-layout ==0.4.0.6 - foreign-store ==0.2 + - ForestStructures ==0.0.0.2 + - forma ==0.2.0 - format-numbers ==0.1.0.0 - formatting ==6.2.4 - - fortran-src ==0.1.0.4 - - foundation ==0.0.12 + - foundation ==0.0.13 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 - freer ==0.2.4.1 - freer-effects ==0.3.0.1 - - friendly-time ==0.4 + - freetype2 ==0.1.2 + - friendly-time ==0.4.1 - frisby ==0.2 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - - fsnotify ==0.2.1 + - fsnotify ==0.2.1.1 - fsnotify-conduit ==0.1.0.0 - funcmp ==1.8 + - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - gd ==3000.7.3 @@ -726,186 +749,186 @@ default-package-overrides: - general-games ==1.0.5 - generic-aeson ==0.2.0.9 - generic-deriving ==1.11.2 - - generic-random ==0.4.1.0 + - generic-random ==0.5.0.0 - generic-xmlpickler ==0.1.0.5 - - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 - - generics-sop ==0.2.5.0 + - generics-sop ==0.3.1.0 - generics-sop-lens ==0.1.2.1 - geniplate-mirror ==0.7.5 - getopt-generics ==0.13.0.1 - - ghc-events ==0.4.4.0 - - ghc-exactprint ==0.5.3.1 + - ghc-events ==0.6.0 + - ghc-exactprint ==0.5.5.0 - ghc-heap-view ==0.5.9 - - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.3.0.2 + - ghc-prof ==1.4.0.2 - ghc-syb-utils ==0.2.3.2 - - ghc-tcplugins-extra ==0.2 + - ghc-tcplugins-extra ==0.2.1 - ghc-typelits-extra ==0.2.3 - - ghc-typelits-knownnat ==0.2.4 + - ghc-typelits-knownnat ==0.3 - ghc-typelits-natnormalise ==0.5.3 - ghcid ==0.6.6 - ghcjs-base-stub ==0.1.0.2 - ghcjs-codemirror ==0.0.0.1 - - ghcjs-hplay ==0.3.4.2 - ghcjs-perch ==0.3.3.2 - - gi-atk ==2.0.12 - - gi-cairo ==1.0.12 - - gi-gdk ==3.0.12 - - gi-gdkpixbuf ==2.0.12 - - gi-gio ==2.0.12 - - gi-glib ==2.0.12 - - gi-gobject ==2.0.12 - - gi-gtk ==3.0.15 - - gi-javascriptcore ==3.0.12 - - gi-pango ==1.0.13 - - gi-soup ==2.4.12 - - gi-webkit ==3.0.12 - - ginger ==0.3.9.1 + - 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-gobject ==2.0.14 + - gi-gtk ==3.0.17 + - gi-javascriptcore ==3.0.14 + - gi-pango ==1.0.15 + - gi-soup ==2.4.14 + - gi-webkit ==3.0.14 + - ginger ==0.5.3.0 - gio ==0.13.3.1 - - gipeda ==0.3.3.2 - giphy-api ==0.5.2.0 - git ==0.2.0 - - github ==0.15.0 - - github-release ==1.0.3 + - github ==0.16.0 + - github-release ==1.0.5 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 - gitlib ==3.1.1 - gitlib-libgit2 ==3.1.1 - gitlib-test ==3.1.0.3 - - gitrev ==1.2.0 + - gitrev ==1.3.1 - gitson ==0.5.2 - gl ==0.8.0 - glabrous ==0.3.2 - - glaze ==0.2.0.2 - - glazier ==0.7.0.0 - - glazier-pipes ==0.1.4.0 + - 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.4.1 - - Glob ==0.7.14 + - Glob ==0.8.0 - glob-posix ==0.1.0.1 - - gloss ==1.10.2.5 - - gloss-rendering ==1.10.3.5 + - gloss ==1.11.1.1 + - gloss-rendering ==1.11.1.1 - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - - gnuplot ==0.5.4.1 - - gogol ==0.1.1 - - gogol-adexchange-buyer ==0.1.1 - - gogol-adexchange-seller ==0.1.1 - - gogol-admin-datatransfer ==0.1.1 - - gogol-admin-directory ==0.1.1 - - gogol-admin-emailmigration ==0.1.1 - - gogol-admin-reports ==0.1.1 - - gogol-adsense ==0.1.1 - - gogol-adsense-host ==0.1.1 - - gogol-affiliates ==0.1.1 - - gogol-analytics ==0.1.1 - - gogol-android-enterprise ==0.1.1 - - gogol-android-publisher ==0.1.1 - - gogol-appengine ==0.1.1 - - gogol-apps-activity ==0.1.1 - - gogol-apps-calendar ==0.1.1 - - gogol-apps-licensing ==0.1.1 - - gogol-apps-reseller ==0.1.1 - - gogol-apps-tasks ==0.1.1 - - gogol-appstate ==0.1.1 - - gogol-autoscaler ==0.1.1 - - gogol-bigquery ==0.1.1 - - gogol-billing ==0.1.1 - - gogol-blogger ==0.1.1 - - gogol-books ==0.1.1 - - gogol-civicinfo ==0.1.1 - - gogol-classroom ==0.1.1 - - gogol-cloudmonitoring ==0.1.1 - - gogol-cloudtrace ==0.1.1 - - gogol-compute ==0.1.1 - - gogol-container ==0.1.1 - - gogol-core ==0.1.1 - - gogol-customsearch ==0.1.1 - - gogol-dataflow ==0.1.1 - - gogol-dataproc ==0.1.1 - - gogol-datastore ==0.1.1 - - gogol-debugger ==0.1.1 - - gogol-deploymentmanager ==0.1.1 - - gogol-dfareporting ==0.1.1 - - gogol-discovery ==0.1.1 - - gogol-dns ==0.1.1 - - gogol-doubleclick-bids ==0.1.1 - - gogol-doubleclick-search ==0.1.1 - - gogol-drive ==0.1.1 - - gogol-firebase-rules ==0.1.1 - - gogol-fitness ==0.1.1 - - gogol-fonts ==0.1.1 - - gogol-freebasesearch ==0.1.1 - - gogol-fusiontables ==0.1.1 - - gogol-games ==0.1.1 - - gogol-games-configuration ==0.1.1 - - gogol-games-management ==0.1.1 - - gogol-genomics ==0.1.1 - - gogol-gmail ==0.1.1 - - gogol-groups-migration ==0.1.1 - - gogol-groups-settings ==0.1.1 - - gogol-identity-toolkit ==0.1.1 - - gogol-kgsearch ==0.1.1 - - gogol-latencytest ==0.1.1 - - gogol-logging ==0.1.1 - - gogol-maps-coordinate ==0.1.1 - - gogol-maps-engine ==0.1.1 - - gogol-mirror ==0.1.1 - - gogol-monitoring ==0.1.1 - - gogol-oauth2 ==0.1.1 - - gogol-pagespeed ==0.1.1 - - gogol-partners ==0.1.1 - - gogol-people ==0.1.1 - - gogol-play-moviespartner ==0.1.1 - - gogol-plus ==0.1.1 - - gogol-plus-domains ==0.1.1 - - gogol-prediction ==0.1.1 - - gogol-proximitybeacon ==0.1.1 - - gogol-pubsub ==0.1.1 - - gogol-qpxexpress ==0.1.1 - - gogol-replicapool ==0.1.1 - - gogol-replicapool-updater ==0.1.1 - - gogol-resourcemanager ==0.1.1 - - gogol-resourceviews ==0.1.1 - - gogol-script ==0.1.1 - - gogol-sheets ==0.1.1 - - gogol-shopping-content ==0.1.1 - - gogol-siteverification ==0.1.1 - - gogol-spectrum ==0.1.1 - - gogol-sqladmin ==0.1.1 - - gogol-storage ==0.1.1 - - gogol-storage-transfer ==0.1.1 - - gogol-tagmanager ==0.1.1 - - gogol-taskqueue ==0.1.1 - - gogol-translate ==0.1.1 - - gogol-urlshortener ==0.1.1 - - gogol-useraccounts ==0.1.1 - - gogol-vision ==0.1.1 - - gogol-webmaster-tools ==0.1.1 - - gogol-youtube ==0.1.1 - - gogol-youtube-analytics ==0.1.1 - - gogol-youtube-reporting ==0.1.1 + - gluturtle ==0.0.58.1 + - gnuplot ==0.5.4.2 + - gogol ==0.3.0 + - gogol-adexchange-buyer ==0.3.0 + - gogol-adexchange-seller ==0.3.0 + - gogol-admin-datatransfer ==0.3.0 + - gogol-admin-directory ==0.3.0 + - gogol-admin-emailmigration ==0.3.0 + - gogol-admin-reports ==0.3.0 + - gogol-adsense ==0.3.0 + - gogol-adsense-host ==0.3.0 + - gogol-affiliates ==0.3.0 + - gogol-analytics ==0.3.0 + - gogol-android-enterprise ==0.3.0 + - gogol-android-publisher ==0.3.0 + - gogol-appengine ==0.3.0 + - gogol-apps-activity ==0.3.0 + - gogol-apps-calendar ==0.3.0 + - gogol-apps-licensing ==0.3.0 + - gogol-apps-reseller ==0.3.0 + - gogol-apps-tasks ==0.3.0 + - gogol-appstate ==0.3.0 + - gogol-autoscaler ==0.3.0 + - gogol-bigquery ==0.3.0 + - gogol-billing ==0.3.0 + - gogol-blogger ==0.3.0 + - gogol-books ==0.3.0 + - gogol-civicinfo ==0.3.0 + - gogol-classroom ==0.3.0 + - gogol-cloudmonitoring ==0.3.0 + - gogol-cloudtrace ==0.3.0 + - gogol-compute ==0.3.0 + - gogol-container ==0.3.0 + - gogol-core ==0.3.0 + - gogol-customsearch ==0.3.0 + - gogol-dataflow ==0.3.0 + - gogol-dataproc ==0.3.0 + - gogol-datastore ==0.3.0 + - gogol-debugger ==0.3.0 + - gogol-deploymentmanager ==0.3.0 + - gogol-dfareporting ==0.3.0 + - gogol-discovery ==0.3.0 + - gogol-dns ==0.3.0 + - gogol-doubleclick-bids ==0.3.0 + - gogol-doubleclick-search ==0.3.0 + - gogol-drive ==0.3.0 + - gogol-firebase-rules ==0.3.0 + - gogol-fitness ==0.3.0 + - gogol-fonts ==0.3.0 + - gogol-freebasesearch ==0.3.0 + - gogol-fusiontables ==0.3.0 + - gogol-games ==0.3.0 + - gogol-games-configuration ==0.3.0 + - gogol-games-management ==0.3.0 + - gogol-genomics ==0.3.0 + - gogol-gmail ==0.3.0 + - gogol-groups-migration ==0.3.0 + - gogol-groups-settings ==0.3.0 + - gogol-identity-toolkit ==0.3.0 + - gogol-kgsearch ==0.3.0 + - gogol-latencytest ==0.3.0 + - gogol-logging ==0.3.0 + - gogol-maps-coordinate ==0.3.0 + - gogol-maps-engine ==0.3.0 + - gogol-mirror ==0.3.0 + - gogol-monitoring ==0.3.0 + - gogol-oauth2 ==0.3.0 + - gogol-pagespeed ==0.3.0 + - gogol-partners ==0.3.0 + - gogol-people ==0.3.0 + - gogol-play-moviespartner ==0.3.0 + - gogol-plus ==0.3.0 + - gogol-plus-domains ==0.3.0 + - gogol-prediction ==0.3.0 + - gogol-proximitybeacon ==0.3.0 + - gogol-pubsub ==0.3.0 + - gogol-qpxexpress ==0.3.0 + - gogol-replicapool ==0.3.0 + - gogol-replicapool-updater ==0.3.0 + - gogol-resourcemanager ==0.3.0 + - gogol-resourceviews ==0.3.0 + - gogol-script ==0.3.0 + - gogol-sheets ==0.3.0 + - gogol-shopping-content ==0.3.0 + - gogol-siteverification ==0.3.0 + - gogol-spectrum ==0.3.0 + - gogol-sqladmin ==0.3.0 + - gogol-storage ==0.3.0 + - gogol-storage-transfer ==0.3.0 + - gogol-tagmanager ==0.3.0 + - gogol-taskqueue ==0.3.0 + - gogol-translate ==0.3.0 + - gogol-urlshortener ==0.3.0 + - gogol-useraccounts ==0.3.0 + - gogol-vision ==0.3.0 + - gogol-webmaster-tools ==0.3.0 + - gogol-youtube ==0.3.0 + - gogol-youtube-analytics ==0.3.0 + - gogol-youtube-reporting ==0.3.0 - google-cloud ==0.0.4 - - google-oauth2-jwt ==0.1.3 - - google-translate ==0.3 + - google-oauth2-jwt ==0.2.2 + - GPipe ==2.2.1 + - GPipe-GLFW ==1.4.1.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 - graphs ==0.7 - - GraphSCC ==1.0.4 - graphviz ==2999.18.1.2 - gravatar ==0.8.0 - graylog ==0.1.0.1 - groom ==0.1.2.1 - groundhog ==0.8 - - groundhog-inspector ==0.8 + - groundhog-inspector ==0.8.0.2 - groundhog-mysql ==0.8 - groundhog-postgresql ==0.8.0.1 - groundhog-sqlite ==0.8 - - groundhog-th ==0.8 + - groundhog-th ==0.8.0.1 + - group-by-date ==0.1.0.1 - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 @@ -914,27 +937,29 @@ default-package-overrides: - gtk3 ==0.14.6 - gtksourceview3 ==0.13.3.1 - H ==0.9.0.1 + - h2c ==1.0.0 - hackage-db ==1.22 - hackage-security ==0.5.2.2 - - hackernews ==1.1.2.0 + - hackernews ==1.2.0.0 + - haddock ==2.17.4 + - haddock-api ==2.17.4 - haddock-library ==1.4.3 - - hailgun ==0.4.1.4 + - haddock-test ==0.0.1 + - hailgun ==0.4.1.5 - hailgun-simple ==0.1.0.0 - - hakyll ==4.9.7.0 + - hakyll ==4.9.8.0 + - hakyll-favicon ==0.1.0 - half ==0.2.2.3 - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.2.1.2 - - happstack-authenticate ==2.3.4.7 - - happstack-clientsession ==7.3.1 - - happstack-hsp ==7.3.7.2 - - happstack-jmacro ==7.0.11 + - hapistrano ==0.3.2.4 + - happstack-hsp ==7.3.7.3 + - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - - happstack-server-tls ==7.1.6.2 + - happstack-server-tls ==7.1.6.4 - happy ==1.19.5 - - HaRe ==0.8.4.0 - harp ==0.4.2 - hasbolt ==0.1.2.1 - hashable ==1.2.6.1 @@ -942,53 +967,60 @@ default-package-overrides: - hashmap ==1.3.2 - hashtables ==1.2.1.1 - haskeline ==0.7.4.0 - - haskell-gi ==0.20.2 - - haskell-gi-base ==0.20.3 - - haskell-import-graph ==1.0.1 + - haskell-gi ==0.20.3 + - haskell-gi-base ==0.20.4 + - haskell-gi-overloading ==1.0 + - haskell-import-graph ==1.0.2 - haskell-lexer ==1.0.1 - - haskell-names ==0.8.0 + - haskell-lsp ==0.1.0.0 - haskell-neo4j-client ==0.3.2.4 - 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-simple ==1.19.0.0 - - haskell-src-meta ==0.7.0.1 - - haskell-tools-ast ==0.5.0.0 - - haskell-tools-backend-ghc ==0.5.0.0 - - haskell-tools-cli ==0.5.0.0 - - haskell-tools-daemon ==0.5.0.0 - - haskell-tools-debug ==0.5.0.0 - - haskell-tools-demo ==0.5.0.0 - - haskell-tools-prettyprint ==0.5.0.0 - - haskell-tools-refactor ==0.5.0.0 - - haskell-tools-rewrite ==0.5.0.0 + - 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 - HaskellNet ==0.5.1 - - HaskellNet-SSL ==0.3.3.0 + - HaskellNet-SSL ==0.3.4.0 - haskintex ==0.7.0.1 - - hasql ==0.19.16 + - hasmin ==0.3.2.4 + - hasql ==0.19.18.1 - hasql-migration ==0.1.3 + - hasql-pool ==0.4.1 - hasql-transaction ==0.5 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 - - HaTeX ==3.17.2.0 + - HaTeX ==3.17.3.1 - hatex-guide ==1.3.1.6 - - haxl ==0.5.0.0 + - haxl ==0.5.1.0 - haxl-amazonka ==0.1.1 - HaXml ==1.25.4 - haxr ==3000.11.2 - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 - - hdaemonize ==0.5.3 + - hdaemonize ==0.5.4 - HDBC ==2.4.0.1 - HDBC-mysql ==0.7.1.0 - - HDBC-session ==0.1.1.0 + - HDBC-session ==0.1.1.1 - hdevtools ==0.1.5.0 + - hdocs ==0.5.2.1 - heap ==1.0.3 - - heaps ==0.3.4.1 + - heaps ==0.3.5 + - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - - hedis ==0.9.8 + - hedgehog ==0.5 + - hedgehog-quickcheck ==0.1 + - hedis ==0.9.9 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 @@ -996,92 +1028,91 @@ default-package-overrides: - hexml ==0.3.2 - hexpat ==0.20.13 - hexstring ==0.11.1 - - hflags ==0.4.2 - - hformat ==0.1.0.1 + - hformat ==0.3.0.0 - hfsevents ==0.1.6 - - hgal ==2.0.0.2 - hid ==0.2.2 - hidapi ==0.1.4 - - hidden-char ==0.1.0.0 + - hidden-char ==0.1.0.1 - hierarchical-clustering ==0.4.6 - 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.6.0 - - hip ==1.5.3.0 + - hint ==0.7.0 + - hinterface ==0.5.0.2 - histogram-fill ==0.8.5.0 - hit ==0.6.3 - - hjpath ==3.0.1 - hjsmin ==0.2.0.2 - - hjson ==1.3.2 - - hjsonpointer ==1.1.1 - - hjsonschema ==1.5.0.1 + - hjsonpointer ==1.2.0 + - hjsonschema ==1.6.3 - hlibgit2 ==0.18.0.16 - - hlibsass ==0.1.6.0 - - hlint ==1.9.41 + - hlibsass ==0.1.6.1 + - hlint ==2.0.9 - hmatrix ==0.18.0.0 - hmatrix-gsl ==0.18.0.1 - hmatrix-gsl-stats ==0.4.1.6 - - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - - hmpfr ==0.4.2.1 - - hmt ==0.15 - - hoauth2 ==0.5.7 + - hmpfr ==0.4.3 + - hoauth2 ==1.3.0 - hocilib ==0.2.0 - holy-project ==0.2.0.1 - - hOpenPGP ==2.5.5 - - hopenpgp-tools ==0.19.4 - hopfli ==0.2.2.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 + - hourglass-orphans ==0.1.0.0 + - hp2pretty ==0.8.0.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.0 + - hpp ==0.4.1 - hpqtypes ==1.5.1.1 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - - hruby ==0.3.4.3 + - hreader-lens ==0.1.3.0 + - hruby ==0.3.4.4 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - hsass ==0.4.1 - hsb2hs ==0.3.1 - hscolour ==1.24.1 - hscurses ==1.4.2.0 + - hsdev ==0.2.5.1 - hsdns ==1.7 - hse-cpp ==0.2 - hsebaysdk ==0.4.0.0 - hsemail ==2 - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.1 + - hsexif ==0.6.1.2 - hsignal ==0.2.7.5 - - hsinstall ==1.5 + - hsinstall ==1.6 - hslogger ==1.2.10 - hslua ==0.4.1 - hslua-aeson ==0.1.0.4 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.9 + - HsOpenSSL ==0.11.4.11 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.4.3 + - hspec ==2.4.4 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.4.0 - - hspec-core ==2.4.3 - - hspec-discover ==2.4.3 + - hspec-core ==2.4.4 + - hspec-discover ==2.4.4 - hspec-expectations ==0.8.2 + - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 - hspec-megaparsec ==0.3.1 - - hspec-meta ==2.3.2 + - 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 @@ -1092,10 +1123,10 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.6 - hsx-jmacro ==7.3.8 - - hsx2hs ==0.14.1 - - hsyslog ==4 - - htaglib ==1.0.4 - - HTF ==0.13.1.0 + - hsx2hs ==0.14.1.1 + - hsyslog ==5.0.1 + - htaglib ==1.1.1 + - HTF ==0.13.2.2 - html ==1.0.1.2 - html-conduit ==1.2.1.1 - html-email-validate ==0.2.0.0 @@ -1106,7 +1137,7 @@ default-package-overrides: - http-client-openssl ==0.2.0.5 - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 - - http-conduit ==2.2.3.1 + - http-conduit ==2.2.3.2 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 @@ -1118,20 +1149,17 @@ default-package-overrides: - human-readable-duration ==0.2.0.3 - HUnit ==1.5.0.0 - HUnit-approx ==1.1 - - hunit-dejafu ==0.3.0.3 + - hunit-dejafu ==0.6.0.0 - hvect ==0.4.0.0 - - hw-balancedparens ==0.1.0.0 - - hw-bits ==0.5.0.0 - - hw-conduit ==0.1.0.0 + - hw-balancedparens ==0.1.0.2 + - hw-bits ==0.5.0.3 - hw-diagnostics ==0.0.0.5 - - hw-excess ==0.1.0.0 + - hw-excess ==0.1.0.1 - hw-int ==0.0.0.1 - - hw-json ==0.4.0.0 - - hw-mquery ==0.1.0.1 - - hw-parser ==0.0.0.1 + - hw-parser ==0.0.0.2 - hw-prim ==0.4.0.3 - - hw-rankselect ==0.8.0.0 - - hw-rankselect-base ==0.2.0.0 + - hw-rankselect ==0.8.0.2 + - hw-rankselect-base ==0.2.0.1 - hw-string-parse ==0.0.0.3 - hw-succinct ==0.1.0.1 - hweblib ==0.6.3 @@ -1139,12 +1167,16 @@ default-package-overrides: - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 + - hxt-curl ==9.1.1.1 + - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - hxt-pickle-utils ==0.1.0.3 - hxt-regex-xmlschema ==9.2.0.3 + - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.1 - - hyphenation ==0.6 + - hyperloglog ==0.4.2 + - hyphenation ==0.7 - ical ==0.0.1 - iconv ==0.4.1.3 - identicon ==0.2.2 @@ -1154,33 +1186,35 @@ default-package-overrides: - IfElse ==0.85 - iff ==0.0.6 - ignore ==0.1.1.0 - - ilist ==0.2.0.0 + - ihs ==0.1.0.1 + - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - - imm ==1.1.0.0 + - Imlib ==0.1.2 + - imm ==1.2.0.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - incremental-parser ==0.2.5.1 - - indentation-core ==0.0 - - indentation-parsec ==0.0 + - indentation-core ==0.0.0.1 + - indentation-parsec ==0.0.0.1 - indents ==0.4.0.0 - inflections ==0.3.0.0 - ini ==0.3.5 - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 - - inline-java ==0.6.1 + - inline-java ==0.6.5 - inline-r ==0.9.0.1 - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.1.1 - - integer-logarithms ==1.0.1 + - integer-logarithms ==1.0.2 - integration ==0.2.1 - - intero ==0.1.20 - - interpolate ==0.1.0 + - intero ==0.1.21 + - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - interpolation ==0.1.0.1 - IntervalMap ==0.5.2.0 - - intervals ==0.7.2 - - intro ==0.1.0.10 - - invariant ==0.4.2 + - intervals ==0.8.1 + - intro ==0.3.0.1 + - invariant ==0.4.3 - invertible ==0.2.0.2 - io-choice ==0.0.6 - io-machine ==0.2.0.0 @@ -1188,53 +1222,52 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.3.6.1 + - io-streams ==1.4.1.0 - io-streams-haproxy ==1.0.0.1 - ip6addr ==0.5.3 - iproute ==1.7.1 - - IPv6Addr ==0.6.3 + - IPv6Addr ==1.0.1 + - IPv6DB ==0.2.1 - irc ==0.6.1.0 - - irc-client ==0.4.4.1 - - irc-conduit ==0.2.2.1 + - irc-client ==0.4.4.4 + - irc-conduit ==0.2.2.3 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 - - isotope ==0.4.0.0 + - isotope ==0.5.0.1 - iterable ==3.0 - ix-shapable ==0.1.0 - - ixset ==1.0.7 - - ixset-typed ==0.3.1 + - ixset-typed ==0.3.1.1 + - jack ==0.7.1.1 - jailbreak-cabal ==1.3.2 - javascript-extras ==0.3.1.0 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-snap ==0.3 - - jni ==0.2.3 - - jose ==0.5.0.4 + - jni ==0.3.1 + - jose ==0.6.0.3 - jose-jwt ==0.7.6 - js-flot ==0.8.3 - - js-jquery ==3.1.1 + - js-jquery ==3.2.1 - json ==0.9.1 - - json-ast ==0.3.1 - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - JuicyPixels ==3.2.8.2 - - JuicyPixels-extra ==0.1.1 + - JuicyPixels-extra ==0.2.1 - JuicyPixels-scale-dct ==0.1.1.2 - - jvm ==0.1.2 - - jvm-streaming ==0.1 + - jvm ==0.2.2 + - jvm-streaming ==0.2 - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.3.1.5 - - katip-elasticsearch ==0.3.1.0 - - kawhi ==0.2.3 + - katip ==0.5.0.0 + - kawhi ==0.3.0 - kdt ==0.2.4 - keter ==1.4.3.2 - keycode ==0.2.2 @@ -1246,35 +1279,35 @@ default-package-overrides: - l10n ==0.1.0.1 - labels ==0.3.2 - lackey ==0.4.3 - - language-c ==0.5.0 - - language-c-quote ==0.11.7.3 + - lame ==0.1.1 + - language-c ==0.6.1 + - language-c-quote ==0.12.1 - language-dockerfile ==0.3.6.0 - - language-ecmascript ==0.17.1.0 + - language-ecmascript ==0.17.2.0 - language-fortran ==0.5.1 - - language-glsl ==0.2.0 + - 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.7 + - language-puppet ==1.3.8.1 - language-python ==0.5.4 - language-thrift ==0.10.0.0 - - large-hashable ==0.1.0.4 - largeword ==1.2.5 - latex ==0.1.0.3 - lattices ==1.5.0 - - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.3 + - leancheck ==0.6.4 - leapseconds-announced ==2017 - - lens ==4.15.1 - - lens-action ==0.2.1 - - lens-aeson ==1.0.1 + - lens ==4.15.4 + - 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-th ==0.5.0.0 - - lens-labels ==0.1.0.1 + - 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 @@ -1284,54 +1317,58 @@ default-package-overrides: - libffi ==0.1 - libgit ==0.3.1 - libinfluxdb ==0.0.4 - - libmpd ==0.9.0.6 + - libmpd ==0.9.0.7 - libnotify ==0.2 - librato ==0.2.0.1 - - libsystemd-journal ==1.4.1 + - libsystemd-journal ==1.4.2 + - libxml-sax ==0.7.5 - LibZip ==1.0.1 - - licensor ==0.2.0 + - licensor ==0.2.1 - lift-generics ==0.1.1 - lifted-async ==0.9.3 - lifted-base ==0.2.3.11 - - line ==2.2.0 - - linear ==1.20.6 - - linear-accelerate ==0.2 + - line ==3.1.0 + - linear ==1.20.7 + - linear-accelerate ==0.4.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.0 - list-fusion-probe ==0.1.0.6 - list-prompt ==0.1.1.0 - - list-t ==1 + - list-t ==1.0.0.1 - ListLike ==4.5.1 - - llvm-hs-pure ==4.0.0.0 + - listsafe ==0.1.0.1 + - llvm-hs ==4.2.0 + - llvm-hs-pure ==4.1.0.0 - lmdb ==0.2.5 - loch-th ==0.2.1 - - log ==0.7 - - log-base ==0.7.1.1 - - log-domain ==0.11.1 - - log-elasticsearch ==0.7 - - log-postgres ==0.7.0.1 + - log ==0.9.0.1 + - log-base ==0.7.2.0 + - log-domain ==0.11.2 + - log-elasticsearch ==0.9.1.0 + - log-postgres ==0.7.0.2 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.1.3 - - logging-facade ==0.1.1 + - logging-effect ==1.2.0 + - logging-facade ==0.3.0 + - logging-facade-syslog ==1 - logict ==0.6.0.2 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.2 - lucid ==2.9.8.1 - lucid-svg ==0.7.0.0 - - lzma-conduit ==1.1.3.1 - - machines ==0.6.2 + - lzma-conduit ==1.1.3.3 + - 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.1 - - mainland-pretty ==0.4.1.4 - - makefile ==0.1.1.0 + - mainland-pretty ==0.6.1 + - makefile ==1.0.0.4 - managed ==1.0.5 - mandrill ==0.5.3.2 - markdown ==0.1.16 @@ -1342,60 +1379,62 @@ default-package-overrides: - marvin-interpolate ==1.1.2 - math-functions ==0.2.1.0 - mathexpr ==0.3.0.0 - - matplotlib ==0.4.5 - - matrices ==0.4.4 + - matplotlib ==0.5.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.3 + - mbox ==0.3.4 - mbox-utility ==0.0.1 - mcmc-types ==1.0.3 - - mediabus ==0.3.3.0 - - mediabus-rtp ==0.3.2.1 + - med-module ==0.1.1 + - mediabus ==0.4.0.1 + - mediabus-rtp ==0.4.0.1 - median-stream ==0.7.0.0 - mega-sdist ==0.3.0.2 - - megaparsec ==5.2.0 + - megaparsec ==5.3.1 - memory ==0.14.6 - - MemoTrie ==0.6.7 - - mersenne-random ==1.0.0.1 + - MemoTrie ==0.6.8 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 - - metrics ==0.4.0.1 + - metrics ==0.4.1.1 - MFlow ==0.4.6.0 - mfsolve ==0.3.2.0 - - microbench ==0.1 - microformats2-parser ==1.0.1.7 - - microlens ==0.4.8.0 + - microlens ==0.4.8.1 - microlens-aeson ==2.2.0.1 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.8.0 - microlens-mtl ==0.1.11.0 - microlens-platform ==0.3.9.0 - microlens-th ==0.4.1.1 + - microstache ==1.0.1.1 - midi ==0.2.2.1 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.13.1 + - mime-mail ==0.4.14 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 - - minio-hs ==0.2.1 + - minio-hs ==0.3.0 - mintty ==0.1.1 - - misfortune ==0.1.1.2 + - miso ==0.4.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - - mixed-types-num ==0.1.0.1 + - mixed-types-num ==0.2.0.1 + - mltool ==0.1.0.2 - mmap ==0.5.9 - mmorph ==1.0.9 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 + - model ==0.3 - modify-fasta ==0.8.2.3 - - monad-control ==1.0.2.0 + - monad-control ==1.0.2.2 - monad-coroutine ==0.9.0.3 - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.24 + - monad-logger ==0.3.25 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.4.0 @@ -1405,27 +1444,25 @@ default-package-overrides: - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.2 - monad-peel ==0.2.1.2 - - monad-primitive ==0.1 - monad-products ==4.0.1 - - monad-skeleton ==0.1.3.2 + - monad-skeleton ==0.1.5 - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.0 - monadcryptorandom ==0.7.1 - monadic-arrays ==0.2.2 - - monadLib ==3.7.3 - monadloc ==0.7.1 - monadplus ==1.4.2 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - - mongoDB ==2.1.1.1 - - mono-traversable ==1.0.2 + - mongoDB ==2.3.0 + - mono-traversable ==1.0.2.1 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.3.2 + - monoid-subclasses ==0.4.4 - monoid-transformer ==0.0.3 - - monoidal-containers ==0.3.0.1 + - monoidal-containers ==0.3.0.2 - morte ==1.6.9 - mountpoints ==1.0.2 - mstate ==0.2.7 @@ -1436,32 +1473,29 @@ default-package-overrides: - multimap ==1.2.1 - multipart ==0.1.2 - multiset ==0.3.3 - - multiset-comb ==0.2.4.1 - - multistate ==0.7.1.1 + - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - mushu ==0.1.1 - - MusicBrainz ==0.2.4 - - mustache ==2.1.4 + - MusicBrainz ==0.3 + - mustache ==2.2.3 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - mwc-random ==0.13.6.0 - - mwc-random-monad ==0.7.3.1 - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 - mysql-haskell-openssl ==0.8.0.0 - mysql-simple ==0.4.0.1 - nagios-check ==0.3.2 - - names-th ==0.2.0.2 + - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 - nanospec ==0.2.1 - - nationstates ==0.5.0.0 + - naqsha ==0.2.0.1 - nats ==1.1.1 - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 - netpbm ==1.0.2 - - nettle ==0.2.0 - netwire ==5.0.2 - netwire-input ==0.0.6 - netwire-input-glfw ==0.0.6 @@ -1469,11 +1503,11 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - - network-carbon ==1.0.9 + - network-carbon ==1.0.10 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.8 - - network-ip ==0.3 + - network-ip ==0.3.0.2 - network-msgpack-rpc ==0.0.3 - network-multicast ==0.2.0 - Network-NineP ==0.4.1 @@ -1487,13 +1521,13 @@ default-package-overrides: - newtype ==0.2 - newtype-generics ==0.5 - next-ref ==0.1.0.2 - - nfc ==0.0.1 + - nfc ==0.1.0 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.0.1 - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - - non-negative ==0.1.1 + - non-negative ==0.1.1.2 - nonce ==1.0.4 - nondeterminism ==1.4 - NoTrace ==0.3.0.1 @@ -1502,12 +1536,17 @@ default-package-overrides: - numeric-extras ==0.1 - numeric-prelude ==0.4.2 - numeric-quest ==0.2.0.1 + - numhask ==0.0.9 + - numhask-range ==0.0.4 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 - - oanda-rest-api ==0.3.0.0 + - nvim-hs ==0.2.4 + - nvim-hs-contrib ==0.2.0 + - nvim-hs-ghcid ==0.2.0 + - oanda-rest-api ==0.4.1 - objective ==1.1.1 - ObjectName ==1.1.0.1 - - octane ==0.18.3 + - octane ==0.20.2 - Octree ==0.5.4.3 - oeis ==0.3.9 - ofx ==0.4.2.0 @@ -1516,24 +1555,27 @@ default-package-overrides: - once ==0.2 - one-liner ==0.9.1 - OneTuple ==0.2.1 + - online ==0.2.0 + - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.3.0 + - opaleye ==0.5.4.0 - opaleye-trans ==0.3.5 - open-browser ==0.2.1.0 - - open-witness ==0.4 + - open-witness ==0.4.0.1 - OpenAL ==1.7.0.4 + - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.0 - - OpenGLRaw ==3.2.4.0 + - OpenGLRaw ==3.2.5.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.6.0.1 + - opml-conduit ==0.6.0.3 - optional-args ==1.0.1 - options ==1.2.1.1 - optparse-applicative ==0.13.2.0 - - optparse-generic ==1.1.5 + - optparse-generic ==1.2.2 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 @@ -1541,68 +1583,76 @@ default-package-overrides: - overloaded-records ==0.4.2.0 - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 + - packunused ==0.1.2 - pager ==0.1.1.0 - pagerduty ==0.0.8 - - pagination ==0.1.1 + - pagination ==0.2.1 - palette ==0.1.0.4 - pandoc ==1.19.2.1 - - pandoc-citeproc ==0.10.4.1 + - pandoc-citeproc ==0.10.5.1 - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 + - papillon ==0.1.0.4 - 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 - - parsers ==0.12.5 + - parser-combinators ==0.1.0 + - parsers ==0.12.7 - 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 - path-extra ==0.0.3 - path-io ==1.2.2 - path-pieces ==0.2.1 + - pathtype ==0.8 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - - pcre-utils ==0.1.8.1 + - pcre-utils ==0.1.8.1.1 - pdf-toolbox-content ==0.0.5.1 - pdf-toolbox-core ==0.0.4.1 - pdf-toolbox-document ==0.0.7.1 - pdfinfo ==1.5.4 - pem ==0.2.2 - - permutation ==0.5.0.5 - - persistable-record ==0.4.1.1 - - persistable-types-HDBC-pg ==0.0.1.4 - - persistent ==2.6.1 + - perf ==0.1.2 + - persistable-record ==0.5.1.1 + - persistable-types-HDBC-pg ==0.0.1.5 + - persistent ==2.7.0 + - persistent-mongoDB ==2.6.0 - persistent-mysql ==2.6.1 + - persistent-mysql-haskell ==0.3.0.0 - persistent-postgresql ==2.6.1 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - persistent-sqlite ==2.6.2 - persistent-template ==2.5.2 + - pg-transact ==0.1.0.1 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 - picedit ==0.2.3.0 - picoparsec ==0.1.2.3 - - pid1 ==0.1.0.1 - - pinboard ==0.9.12.4 + - picosat ==0.1.4 + - pid1 ==0.1.2.0 + - pinboard ==0.9.12.5 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.4 - pipes-attoparsec ==0.5.1.5 - - pipes-bytestring ==2.1.5 - - pipes-cacophony ==0.4.1 + - pipes-bytestring ==2.1.6 + - pipes-cacophony ==0.5.0 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 - - pipes-csv ==1.4.3 - pipes-extras ==1.0.10 - pipes-fluid ==0.5.0.3 - - pipes-group ==1.0.6 - - pipes-misc ==0.2.5.0 + - pipes-group ==1.0.7 + - pipes-misc ==0.3.0.0 - pipes-mongodb ==0.1.0.0 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.3 @@ -1617,11 +1667,13 @@ default-package-overrides: - plot-gtk ==0.2.0.4 - plot-gtk-ui ==0.3.0.2 - plot-gtk3 ==0.1.0.2 + - plot-light ==0.2.7 - point-octree ==0.5.5.3 - pointed ==5 - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 + - poll ==0.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 @@ -1629,23 +1681,25 @@ default-package-overrides: - posix-paths ==0.2.1.1 - posix-realtime ==0.0.0.4 - post-mess-age ==0.2.1.0 - - postgresql-binary ==0.9.3 + - postgresql-binary ==0.12.1 - postgresql-libpq ==0.9.3.1 - postgresql-schema ==0.1.11 - postgresql-simple ==0.5.3.0 - - postgresql-simple-migration ==0.1.9.0 + - postgresql-simple-migration ==0.1.11.0 + - postgresql-simple-opts ==0.2.0.2 + - postgresql-simple-queue ==0.5.0.1 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.1 - - pqueue ==1.3.2.2 + - pqueue ==1.3.2.3 - pred-set ==0.0.1 + - pred-trie ==0.5.1.2 - prednote ==0.36.0.4 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.1 - prelude-extras ==0.4.0.3 - prelude-safeenum ==0.1.1.2 - preprocessor-tools ==1.0.1 - - presburger ==1.3.1 - present ==4.1.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 @@ -1653,52 +1707,58 @@ default-package-overrides: - pretty-simple ==2.0.0.0 - pretty-types ==0.2.3.1 - prettyclass ==1.0.0.0 + - prettyprinter ==1.1.1 + - prettyprinter-ansi-terminal ==1.1.1.1 + - prettyprinter-compat-annotated-wl-pprint ==1 + - prettyprinter-compat-ansi-wl-pprint ==1.0.1 + - prettyprinter-compat-wl-pprint ==1.0.0.1 - primes ==0.2.1.0 - - primitive ==0.6.1.0 + - primitive ==0.6.2.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - process-extras ==0.7.2 - - product-profunctors ==0.7.1.0 + - product-profunctors ==0.8.0.3 + - profiterole ==0.1 - profiteur ==0.4.3.0 - profunctor-extras ==4.0 - - profunctors ==5.2 + - profunctors ==5.2.1 - project-template ==0.2.0 - projectroot ==0.2.0.1 - - prometheus-client ==0.1.1 - - prometheus-metrics-ghc ==0.1.1 + - prometheus-client ==0.2.0 + - prometheus-metrics-ghc ==0.2.0 - prompt ==0.1.1.2 - proto-lens ==0.2.1.0 - - proto-lens-arbitrary ==0.1.0.3 + - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 - proto-lens-descriptors ==0.2.1.0 - - proto-lens-optparse ==0.1.0.3 + - proto-lens-optparse ==0.1.0.4 + - proto-lens-protobuf-types ==0.2.1.0 - proto-lens-protoc ==0.2.1.0 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.0 - - protocol-buffers-descriptor ==2.4.0 + - protocol-buffers ==2.4.3 + - protocol-buffers-descriptor ==2.4.3 - protolude ==0.1.10 - - proxied ==0.2 + - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.2.3 - - publicsuffix ==0.20170109 - - pure-cdb ==0.1.2 + - psqueues ==0.2.3.0 + - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.10.1.0 - - pusher-http-haskell ==1.1.0.4 + - purescript-bridge ==0.11.0.0 + - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - - pwstore-purehaskell ==2.1.4 - QuasiText ==0.1.2.6 - questioner ==0.1.1.0 - quickbench ==1.0 - QuickCheck ==2.9.2 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 + - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.12 - - quickcheck-io ==0.1.4 - - quickcheck-simple ==0.1.0.1 + - quickcheck-io ==0.2.0 + - quickcheck-simple ==0.1.0.2 - quickcheck-special ==0.1.0.5 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 @@ -1716,35 +1776,35 @@ default-package-overrides: - rank-product ==0.2.0.1 - rank1dynamic ==0.3.3.0 - Rasterific ==0.7.2.1 - - rasterific-svg ==0.3.2.1 - - ratel ==0.3.3 + - rasterific-svg ==0.3.3 + - ratel ==0.3.5 - ratel-wai ==0.2.0 - - rattletrap ==2.1.5 + - rattletrap ==2.5.0 - raw-strings-qq ==1.1 - - rawfilepath ==0.1.1 + - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - rdf ==0.1.0.1 - rdtsc ==1.3.0.1 + - reactive-banana ==1.1.0.1 - read-editor ==0.1.0.2 - - read-env-var ==0.1.0.1 + - read-env-var ==1.0.0.0 - readable ==0.3.1 - ReadArgs ==1.2.3 - readline ==1.0.3.0 - - rebase ==1.0.8 + - rebase ==1.0.8.1 - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 - - reedsolomon ==0.0.4.3 - ref-fd ==0.4.0.1 - refact ==0.3.0.2 - - references ==0.3.2.1 + - references ==0.3.2.2 - refined ==0.1.2.1 - reflection ==2.1.2 - reform ==0.2.7.1 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.1 + - reform-happstack ==0.2.5.2 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 - regex ==1.0.1.3 @@ -1761,14 +1821,11 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.8.4.0 - - relational-query-HDBC ==0.6.0.3 - - relational-record ==0.1.7.1 - - relational-schemas ==0.1.3.1 + - relational-query ==0.9.4.1 + - relational-query-HDBC ==0.6.4.0 + - relational-record ==0.1.8.0 + - relational-schemas ==0.1.4.0 - renderable ==0.2.0.1 - - repa ==3.4.1.2 - - repa-algorithms ==3.4.1.1 - - repa-io ==3.4.1.1 - RepLib ==0.5.4 - repline ==0.1.6.0 - req ==0.2.0 @@ -1780,7 +1837,7 @@ default-package-overrides: - resourcet ==1.1.9 - rest-client ==0.5.1.1 - rest-core ==0.39 - - rest-gen ==0.20.0.0 + - rest-gen ==0.20.0.1 - rest-happstack ==0.3.1.1 - rest-snap ==0.2.0.1 - rest-stringmap ==0.2.0.6 @@ -1788,38 +1845,36 @@ default-package-overrides: - rest-wai ==0.2.0.1 - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - - rethinkdb-client-driver ==0.0.23 + - rethinkdb-client-driver ==0.0.24 - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - riak ==1.1.2.0 - - riak-protobuf ==0.22.0.0 - - RNAlien ==1.3.7 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 - - rot13 ==0.1.0.2 + - rot13 ==0.2.0.1 - rotating-log ==0.4.2 - - RSA ==2.2.0 - - rss-conduit ==0.3.0.0 + - 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 - safe ==0.3.15 - - safe-exceptions ==0.1.5.0 + - safe-exceptions ==0.1.6.0 - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.3.2 + - safeio ==0.0.3.0 - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.2 - - sandi ==0.4.0 + - sandi ==0.4.1 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbv ==5.14 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - - scientific ==0.3.4.15 + - schematic ==0.1.4.0 + - scientific ==0.3.5.1 - scotty ==0.11.0 - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 @@ -1827,41 +1882,45 @@ default-package-overrides: - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==0.1 - - search-algorithms ==0.1.0 + - sdl2-ttf ==1.0.0 + - search-algorithms ==0.2.0 - securemem ==0.1.9 - SegmentTree ==0.3 + - selda ==0.1.10.1 + - selda-postgresql ==0.1.6.0 + - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - - semigroupoids ==5.1 - - semigroups ==0.18.2 + - semigroupoids ==5.2.1 + - semigroups ==0.18.3 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 + - sensu-run ==0.2.0 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 - - servant ==0.9.1.1 - - servant-aeson-specs ==0.5.2.0 - - servant-auth-cookie ==0.4.4 + - servant ==0.11 + - servant-auth-cookie ==0.5.0.5 - servant-blaze ==0.7.1 - - servant-cassava ==0.8 - - servant-client ==0.9.1.1 - - servant-docs ==0.9.1.1 + - servant-cassava ==0.9 + - servant-checked-exceptions ==0.4.0.0 + - servant-client ==0.11 + - servant-docs ==0.10.0.1 - servant-elm ==0.4.0.1 - - servant-foreign ==0.9.1.1 + - servant-foreign ==0.10.1 - servant-js ==0.9.3 - - servant-JuicyPixels ==0.3.0.2 + - servant-JuicyPixels ==0.3.0.3 - servant-lucid ==0.7.1 - - servant-mock ==0.8.1.1 - - servant-purescript ==0.6.0.0 + - servant-mock ==0.8.2 + - servant-purescript ==0.8.0.0 - servant-ruby ==0.2.1.0 - - servant-server ==0.9.1.1 - - servant-static-th ==0.1.0.3 - - servant-subscriber ==0.5.0.3 - - servant-swagger ==1.1.2 - - servant-swagger-ui ==0.2.3.2.2.8 + - servant-server ==0.11 + - servant-static-th ==0.1.0.5 + - servant-subscriber ==0.6.0.0 + - servant-swagger ==1.1.3.1 + - servant-swagger-ui ==0.2.4.3.0.20 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - - serversession-backend-acid-state ==1.0.3 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - servius ==1.2.0.2 @@ -1874,21 +1933,21 @@ default-package-overrides: - shake ==0.15.11 - shake-language-c ==0.10.1 - shakespeare ==2.0.13 - - shell-conduit ==4.5.2 + - shell-conduit ==4.6.1 - shelly ==1.6.8.3 + - shikensu ==0.3.7 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-prettyprint ==0.1.2.1 + - show-prettyprint ==0.2 - sibe ==0.2.0.5 - - signal ==0.1.0.3 + - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 - simple-download ==0.0.2 - - simple-log ==0.5.1 + - simple-log ==0.9.3 - simple-reflect ==0.3.2 - simple-sendfile ==0.2.25 - simple-session ==0.10.1.1 - - simple-smt ==0.6.0 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 - singletons ==2.2 @@ -1897,28 +1956,32 @@ default-package-overrides: - skeletons ==0.4.0 - skylighting ==0.1.1.5 - slave-thread ==1.0.2 - - slug ==0.1.6 + - slug ==0.1.7 - smallcaps ==0.6.0.4 - - smallcheck ==1.1.1 + - smallcheck ==1.1.2 + - smallcheck-series ==0.6 - smoothie ==0.4.2.7 - - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.2.1 - - snap-server ==1.0.2.2 + - snap-core ==1.0.3.0 + - snap-server ==1.0.3.0 - snowflake ==0.1.1.1 + - snowtify ==0.1.0.3 - soap ==0.2.3.5 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - - socket ==0.7.0.0 + - 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 - sort ==1.0.0.0 - sorted-list ==0.2.0.0 + - sound-collage ==0.2.0.1 - sourcemap ==0.1.6 - - sparkle ==0.4.0.2 + - sox ==0.2.2.7 + - soxlib ==0.0.3 + - sparkle ==0.5.0.1 - sparse-linear-algebra ==0.2.9.7 - spdx ==0.2.2.0 - speculation ==1.5.0.3 @@ -1927,38 +1990,37 @@ default-package-overrides: - Spintax ==0.3.2 - splice ==0.6.1.1 - split ==0.2.3.2 + - split-record ==0.1.1.3 + - splitmix ==0 - 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.3.0.0 + - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spool ==0.1 - - spoon ==0.3.1 - - spreadsheet ==0.1.3.4 - - sql-words ==0.1.5.0 - - sqlite-simple ==0.4.13.0 + - spreadsheet ==0.1.3.5 + - sql-words ==0.1.5.1 + - sqlite-simple ==0.4.14.0 - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.1 - stache ==0.2.2 - stack-run-auto ==0.1.1.4 - stack-type ==0.1.0.0 - stackage-curator ==0.14.5 - - stackage-query ==0.1.0 + - stackage-query ==0.1.1 - stackage-types ==1.2.0 - - state-plus ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 - - stateWriter ==0.2.8 + - stateWriter ==0.2.8.2 - static-canvas ==0.2.0.3 - statistics ==0.13.3.0 - - stb-image-redux ==0.2.1.0 - stemmer ==0.5.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 - - stm-containers ==0.2.15 + - stm-containers ==0.2.16 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.2 - stm-split ==0.0.2 @@ -1970,13 +2032,14 @@ default-package-overrides: - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - storable-tuple ==0.0.3.2 - - storablevector ==0.2.12 + - storablevector ==0.2.12.1 - storablevector-carray ==0.0 - store ==0.4.3.1 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.3 + - 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 @@ -1993,47 +2056,44 @@ default-package-overrides: - stringable ==0.1.3 - stringbuilder ==0.5.0 - stringsearch ==0.3.6.6 - - stripe-core ==2.2.1 - - stripe-haskell ==2.2.1 - - stripe-http-streams ==2.2.1 - - stripe-tests ==2.2.1 - - strive ==3.0.3 - - stylish-haskell ==0.7.1.0 - - success ==0.2.6 + - strive ==3.0.4 + - stylish-haskell ==0.8.1.0 + - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - - superbuffer ==0.2.0.1 + - superbuffer ==0.3.1.1 + - superrecord ==0.3.0.0 - svg-builder ==0.1.0.2 - - svg-tree ==0.6.1 + - svg-tree ==0.6.2 - SVGFonts ==1.6.0.1 - swagger ==0.3.0 - - swagger2 ==2.1.4 - - syb ==0.6 - - syb-with-class ==0.6.1.7 + - swagger2 ==2.1.4.1 + - syb ==0.7 - 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 - system-filepath ==0.4.13.4 - system-posix-redirect ==1.1.0.1 - - syz ==0.2.0.0 - tabular ==0.2.2.7 - tagchup ==0.4.1 - tagged ==0.8.5 - - tagged-binary ==0.2.0.0 + - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - - taggy ==0.2.0 - - taggy-lens ==0.1.2 - tagshare ==0.0 - tagsoup ==0.14.1 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - - tasty ==0.11.2.1 - - tasty-ant-xml ==1.0.5 - - tasty-auto ==0.1.0.2 - - tasty-dejafu ==0.3.0.2 - - tasty-discover ==1.1.0 + - tasty ==0.11.2.5 + - tasty-ant-xml ==1.1.0 + - tasty-auto ==0.2.0.0 + - tasty-dejafu ==0.6.0.0 + - tasty-discover ==3.0.2 - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.2 - tasty-golden ==2.3.1.1 @@ -2043,39 +2103,43 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.8.4 - - tasty-rerun ==1.1.6 + - tasty-rerun ==1.1.7 - tasty-silver ==3.1.10 - tasty-smallcheck ==0.8.1 - - tasty-stats ==0.2.0.2 + - 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 - tdigest ==0.1 - tdigest-Chart ==0 - - telegram-api ==0.6.3.0 + - teardown ==0.1.0.1 - template ==0.2.0.10 - - temporary ==1.2.1 + - 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.0.1 + - test-fixture ==0.5.0.2 - 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 - - test-invariant ==0.4.5.0 - - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.9.4 - - text ==1.2.2.1 - - text-all ==0.3.1.0 + - texmath ==0.9.4.1 + - text ==1.2.2.2 + - text-all ==0.4.1.1 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 - text-format ==0.3.1.1 @@ -2084,38 +2148,39 @@ default-package-overrides: - text-latin1 ==0.3 - text-ldap ==0.1.1.8 - text-manipulate ==0.2.0.1 - - text-metrics ==0.2.0 - - text-postgresql ==0.0.2.2 + - text-metrics ==0.3.0 + - text-postgresql ==0.0.2.3 - text-printer ==0.5 - - text-region ==0.1.0.1 - - text-show ==3.4.1.1 - - text-show-instances ==3.5 + - text-region ==0.3.0.0 + - text-show ==3.6 + - text-show-instances ==3.6 - text-zipper ==0.10 - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.0.2 - - th-abstraction ==0.2.3.0 - - th-data-compat ==0.0.2.2 + - th-abstraction ==0.2.5.0 + - th-data-compat ==0.0.2.4 - th-desugar ==1.6 - th-expand-syns ==0.4.3.0 - th-extras ==0.0.0.4 - th-lift ==0.7.7 - th-lift-instances ==0.1.11 - - th-orphans ==0.13.3 - - th-reify-compat ==0.0.1.1 - - th-reify-many ==0.1.7 - - th-to-exp ==0.0.1.0 + - th-orphans ==0.13.4 + - th-reify-compat ==0.0.1.2 + - th-reify-many ==0.1.8 + - th-to-exp ==0.0.1.1 - th-utilities ==0.2.0.1 - these ==0.7.3 - thread-local-storage ==0.1.1 - - threads ==0.5.1.4 - - threepenny-gui ==0.7.0.2 - - threepenny-gui-flexbox ==0.3.0.2 + - threads ==0.5.1.5 + - threepenny-editors ==0.4.1 + - threepenny-gui ==0.8.0.1 + - threepenny-gui-flexbox ==0.4.2 - through-text ==0.1.0.0 + - throwable-exceptions ==0.1.0.8 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 - - tibetan-utils ==0.1.1.2 - - tidal ==0.8.2 + - tidal ==0.9.4 - time-compat ==0.1.0.3 - time-lens ==0.4.0.1 - time-locale-compat ==0.1.1.3 @@ -2126,23 +2191,29 @@ default-package-overrides: - timerep ==2.0.0.2 - timespan ==0.3.0.0 - timezone-olson ==0.1.8 - - timezone-series ==0.1.6.1 + - timezone-series ==0.1.8 - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - - titlecase ==0.1.0.3 + - titlecase ==1.0.1 + - tldr ==0.2.2 - tls ==1.3.11 - tls-debug ==0.4.4 + - tls-session-manager ==0.0.0.1 + - tmp-postgres ==0.1.0.8 - 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-compat ==0.5.1.4 - - transformers-lift ==0.1.0.1 - - transient ==0.4.4.1 - - transient-universe ==0.3.5.1 - - traverse-with-class ==0.2.0.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-fun ==0.8.1.0 + - tries ==0.0.4.2 - trifecta ==1.6.2.1 + - triplesec ==0.1.2.0 - true-name ==0.1.0.2 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 @@ -2152,13 +2223,13 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.3.6 - turtle-options ==0.1.0.4 + - twitter-conduit ==0.2.2.1 - twitter-feed ==0.2.0.11 - 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-eq ==0.5 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2171,11 +2242,10 @@ default-package-overrides: - typed-process ==0.1.0.0 - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 - - tz ==0.1.2.1 - - tzdata ==0.1.20161123.0 - - ua-parser ==0.7.3 + - tz ==0.1.3.0 + - tzdata ==0.1.20170320.0 + - ua-parser ==0.7.4 - uglymemo ==0.1.0.1 - - unagi-chan ==0.4.0.0 - unbound ==0.5.1 - unbound-generics ==0.3.1 - unbounded-delays ==0.1.1.0 @@ -2185,9 +2255,9 @@ default-package-overrides: - unfoldable-restricted ==0.0.3 - unicode ==0.0 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.2.1 + - unicode-transforms ==0.3.3 - unification-fd ==0.10.0.1 - - union ==0.1.1.1 + - union ==0.1.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 @@ -2196,7 +2266,7 @@ default-package-overrides: - unit-constraint ==0.0.0 - units ==2.4 - units-defs ==2.0.1.1 - - units-parser ==0.1.0.0 + - units-parser ==0.1.0.1 - universe ==1.0 - universe-base ==1.0.2.1 - universe-instances-base ==1.0 @@ -2206,16 +2276,17 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - - Unixutils ==1.54.1 + - unliftio ==0.1.0.0 + - unliftio-core ==0.1.0.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 - unsafe ==0.0 - uri-bytestring ==0.2.3.3 + - uri-bytestring-aeson ==0.1.0.2 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 - url ==2.1.3 - urlpath ==5.0.0.1 - - userid ==0.1.2.8 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 @@ -2225,34 +2296,34 @@ default-package-overrides: - uu-interleaved ==0.2.0.0 - uu-parsinglib ==2.9.1.1 - uuid ==1.3.13 - - uuid-orphans ==1.4.1 - uuid-types ==1.0.3 - - vado ==0.0.8 + - vado ==0.0.9 - validate-input ==0.4.0.0 - validation ==0.5.4 + - validationt ==0.2.0.0 - varying ==0.7.0.3 - vault ==0.3.0.7 - - vcswrapper ==0.1.5 - - vector ==0.11.0.0 + - vcswrapper ==0.1.6 + - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 - vector-binary-instances ==0.2.3.5 - vector-buffer ==0.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-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - vectortiles ==1.2.0.5 - verbosity ==0.2.3.0 - - versions ==3.0.2.1 + - versions ==3.1.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - - viewprof ==0.0.0.1 + - viewprof ==0.0.0.8 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.2 - - vty ==5.15.1 + - vty ==5.16 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-cli ==0.1.1 @@ -2262,7 +2333,7 @@ default-package-overrides: - wai-extra ==3.0.20.0 - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 - - wai-middleware-auth ==0.1.2.0 + - 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 @@ -2270,31 +2341,30 @@ default-package-overrides: - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - - wai-middleware-prometheus ==0.1.1 - - wai-middleware-rollbar ==0.3.0 + - wai-middleware-rollbar ==0.4.0 - 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.9.10 + - wai-routes ==0.10.0 - wai-routing ==0.13.0 - wai-session ==0.3.2 - wai-session-postgresql ==0.2.1.0 + - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.12 - - warp-tls ==3.2.3 + - warp ==3.2.13 + - warp-tls ==3.2.4 - wave ==0.1.5 - - wavefront ==0.7.1 - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - - web-routes ==0.27.11 + - web-routes ==0.27.12 - web-routes-boomerang ==0.28.4.2 - - web-routes-happstack ==0.23.10 + - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.6.1 + - web-routes-th ==0.22.6.2 - web-routes-wai ==0.24.3 - webdriver ==0.8.5 - webdriver-angular ==0.1.11 @@ -2303,33 +2373,34 @@ default-package-overrides: - webpage ==0.0.5 - webrtc-vad ==0.1.0.3 - websockets ==0.10.0.0 - - websockets-rpc ==0.0.2 - - websockets-snap ==0.10.2.2 - - weigh ==0.0.4 - - wikicfp-scraper ==0.1.0.8 + - websockets-rpc ==0.4.0 + - websockets-simple ==0.0.2 + - websockets-snap ==0.10.2.3 + - weeder ==0.1.7 + - weigh ==0.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-x11 ==0.1.0.6 + - wild-bind-x11 ==0.1.0.7 - Win32 ==2.3.1.1 - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 - wire-streams ==0.1.1.0 - with-location ==0.1.0 - - withdependencies ==0.2.4 + - withdependencies ==0.2.4.1 - witherable ==0.1.3.4 - witness ==0.4 - wizards ==1.0.2 - wl-pprint ==1.2 - - wl-pprint-annotated ==0.0.1.4 + - wl-pprint-annotated ==0.1.0.0 - wl-pprint-console ==0.1.0.1 - wl-pprint-extras ==3.5.0.5 - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.1.1.0 - word-trie ==0.3.0 - word24 ==2.0.1 - - word8 ==0.1.2 - - wordpass ==1.0.0.7 + - word8 ==0.1.3 - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.5.0.1 @@ -2338,25 +2409,25 @@ default-package-overrides: - writer-cps-morph ==0.1.0.2 - writer-cps-mtl ==0.1.1.4 - writer-cps-transformers ==0.1.1.3 - - wuss ==1.1.4 + - wuss ==1.1.5 - X11 ==1.8 - X11-xft ==0.3.1 - - x509 ==1.6.5 - - x509-store ==1.6.2 - - x509-system ==1.6.4 - - x509-validation ==1.6.5 + - x11-xim ==0.0.9.0 + - x509 ==1.7.2 + - x509-store ==1.6.5 + - x509-system ==1.6.6 + - x509-validation ==1.6.9 - Xauth ==0.1 - xdcc ==1.1.4 - xdg-basedir ==0.2.2 - - xeno ==0.1 + - xeno ==0.2 - xenstore ==0.1.1 - xhtml ==3000.2.2 - - xlsior ==0.1.0.1 - - xlsx ==0.4.3 + - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - - xml-conduit ==1.4.0.4 + - xml-conduit ==1.5.1 - xml-conduit-parse ==0.3.1.1 - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 @@ -2364,16 +2435,18 @@ default-package-overrides: - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 + - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 - xmlgen ==0.6.2.1 - - xmlhtml ==0.2.4 - xmonad ==0.13 - xmonad-contrib ==0.13 + - xmonad-extras ==0.13.0 - 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.23.1 + - yaml ==0.8.23.3 - Yampa ==0.10.6 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 @@ -2381,50 +2454,57 @@ default-package-overrides: - yesod-auth ==1.4.17.2 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 + - yesod-auth-fb ==1.8.1 - yesod-auth-hashdb ==1.6.1 - - yesod-bin ==1.5.2.3 - - yesod-core ==1.4.35 + - yesod-bin ==1.5.2.5 + - yesod-core ==1.4.36 + - yesod-default ==1.2.0 - yesod-eventsource ==1.4.1 - - yesod-fay ==0.8.0 - - yesod-form ==1.4.12 - - yesod-form-richtext ==0.1.0.1 + - yesod-fb ==0.4.0 + - yesod-form ==1.4.13 + - yesod-form-bootstrap4 ==0.1.0.1 + - 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.0 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.3 + - yesod-static ==1.5.3.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.7 + - yesod-test ==1.5.8 - yesod-websockets ==0.2.6 - - yi-core ==0.13.7 - - yi-frontend-vty ==0.13.7 - - yi-fuzzy-open ==0.13.7 - - yi-ireader ==0.13.7 - - yi-keymap-cua ==0.13.7 - - yi-keymap-emacs ==0.13.7 - - yi-keymap-vim ==0.13.7 - - yi-language ==0.13.7 - - yi-misc-modes ==0.13.7 - - yi-mode-haskell ==0.13.7 - - yi-mode-javascript ==0.13.7 - - yi-rope ==0.8 - - yi-snippet ==0.13.7 + - 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 + - yjsvg ==0.2.0.1 - yjtools ==0.9.18 - yoga ==0.0.0.1 - - youtube ==0.2.1 + - youtube ==0.2.1.1 - zero ==0.1.4 - zeromq4-haskell ==0.6.7 - zip ==0.1.11 - zip-archive ==0.3.1.1 - - zippers ==0.2.3 + - zippers ==0.2.4 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 + - zm ==0.2.4 - zot ==0.0.3 - ztail ==1.2 @@ -2433,10 +2513,12 @@ extra-packages: - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x + - base-orphans < 0.6 # required by liquidhaskell-0.8.0.0 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - 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. - 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 @@ -2447,7 +2529,6 @@ extra-packages: - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 - - hpack < 0.18 # required by stack-1.4.0 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2457,12 +2538,9 @@ extra-packages: - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - split < 0.2 # newer versions don't work with GHC 6.12.3 - - store < 0.4 # needed by stack 1.4.0 - - store-core < 0.4 # needed by stack 1.4.0 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet - vector < 0.10.10 # newer versions don't work with GHC 6.12.3 - - zlib < 0.6 # newer versions break cabal-install package-maintainers: peti: @@ -2516,6 +2594,8 @@ package-maintainers: abbradar: - Agda - lambdabot + alunduil: + - collection-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2561,7 +2641,7 @@ dont-distribute-packages: XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] xmobar: [ x86_64-darwin ] - # Depens on shine, which is a ghcjs project. + # Depends on shine, which is a ghcjs project. shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages depend on software with an unfree license @@ -2585,12 +2665,54 @@ dont-distribute-packages: yices-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] + # these packages don't evaluate because they have broken dependencies + 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 ] + fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] + hbro: [ 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 ] + jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] + leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] + markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] + 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 ] + 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 ] + 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 ] + websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + # soft restrictions because of build errors 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] abacate: [ i686-linux, x86_64-linux, x86_64-darwin ] - abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2602,7 +2724,6 @@ dont-distribute-packages: accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2636,7 +2757,6 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] - activehs-base: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2650,7 +2770,6 @@ dont-distribute-packages: adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2664,11 +2783,7 @@ dont-distribute-packages: aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-filthy: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-injector: [ 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-quick: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2682,19 +2797,16 @@ dont-distribute-packages: Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] - alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] + algebraic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2716,31 +2828,6 @@ dont-distribute-packages: alure: [ i686-linux, x86_64-linux, 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 ] - amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-codebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-ec2: [ i686-linux ] - amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-polly: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-rekognition: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-s3: [ i686-linux ] - amazonka-s3-streaming: [ i686-linux ] - amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-shield: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-sms: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-swf: [ i686-linux ] - amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ 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 ] @@ -2761,7 +2848,6 @@ dont-distribute-packages: antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] - antigate: [ i686-linux, x86_64-linux, x86_64-darwin ] antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ] antisplice: [ i686-linux, x86_64-linux, x86_64-darwin ] antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2792,18 +2878,14 @@ dont-distribute-packages: AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux-web: [ 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 ] @@ -2813,8 +2895,6 @@ 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 ] - arithmetic: [ 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 ] arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2833,11 +2913,11 @@ dont-distribute-packages: ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] + asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ 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-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2858,7 +2938,6 @@ dont-distribute-packages: attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] - audacity: [ i686-linux, x86_64-linux, x86_64-darwin ] audiovisual: [ i686-linux, x86_64-linux, x86_64-darwin ] augeas: [ i686-linux, x86_64-linux, x86_64-darwin ] augur: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2877,6 +2956,7 @@ dont-distribute-packages: avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avl-static: [ i686-linux, x86_64-linux, x86_64-darwin ] AvlTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + avro: [ i686-linux, x86_64-linux, x86_64-darwin ] avr-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] awesome-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2898,15 +2978,11 @@ dont-distribute-packages: aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] - axiom: [ i686-linux, x86_64-linux, x86_64-darwin ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] - babl: [ i686-linux, x86_64-linux, x86_64-darwin ] - babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2928,14 +3004,11 @@ dont-distribute-packages: barley: [ i686-linux, x86_64-linux, x86_64-darwin ] Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ 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 ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] - basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - basic-sop: [ 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 ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2943,7 +3016,6 @@ dont-distribute-packages: battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] - bdd: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2952,7 +3024,6 @@ dont-distribute-packages: beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] - bench: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2963,8 +3034,6 @@ dont-distribute-packages: betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] bet: [ i686-linux, x86_64-linux, x86_64-darwin ] bff: [ i686-linux, x86_64-linux, x86_64-darwin ] - bff-mono: [ i686-linux, x86_64-linux, x86_64-darwin ] - bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2975,7 +3044,6 @@ dont-distribute-packages: billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-pane: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] - bimaps: [ 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-file: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2999,38 +3067,31 @@ dont-distribute-packages: bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-linux-videodev2: [ 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-sane: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ 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 ] - BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] - BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ 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 ] @@ -3039,7 +3100,6 @@ dont-distribute-packages: bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitcoin-payment-channel: [ 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 ] @@ -3047,13 +3107,10 @@ dont-distribute-packages: bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitwise: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] - black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] - blacktip: [ i686-linux, x86_64-linux, x86_64-darwin ] bla: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3065,6 +3122,7 @@ dont-distribute-packages: 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 ] blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] ble: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3075,11 +3133,7 @@ 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 ] - blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3087,8 +3141,9 @@ dont-distribute-packages: 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 ] - board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] + bno055-haskell: [ 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 ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3097,34 +3152,29 @@ dont-distribute-packages: 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 ] - boomange: [ 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 ] - bound-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - bound: [ 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 ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] - break: [ 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 ] 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 ] - bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - buffer-builder: [ 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: [ 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 ] @@ -3137,43 +3187,36 @@ dont-distribute-packages: bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] - byline: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ 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 ] bytestringreadp: [ 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-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] + c2hsc: [ 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 ] cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2spec: [ 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-debian: [ 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 ] cabalgraph: [ 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 ] cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ 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 ] cabalQuery: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3182,15 +3225,11 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-test-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] - cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] - cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3200,9 +3239,9 @@ dont-distribute-packages: caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] call: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3211,7 +3250,6 @@ dont-distribute-packages: cap: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] car-pool: [ 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 ] @@ -3223,15 +3261,20 @@ dont-distribute-packages: casadi-bindings-snopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] - cases: [ i686-linux, x86_64-linux, x86_64-darwin ] cash: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-html: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-reports-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-reports: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-reports-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-reports-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-types: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3242,7 +3285,6 @@ dont-distribute-packages: category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cautious-file: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3261,13 +3303,13 @@ dont-distribute-packages: cef3-simple: [ 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 ] cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cereal-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] cf: [ i686-linux, x86_64-linux, x86_64-darwin ] cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3280,14 +3322,12 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] - charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty-utils: [ 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 ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3329,33 +3369,23 @@ dont-distribute-packages: 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: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ 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 ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - clay: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-mailinglist: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - clean-home: [ i686-linux, x86_64-linux, x86_64-darwin ] + cld2: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] cless: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3365,10 +3395,11 @@ dont-distribute-packages: clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] clif: [ i686-linux, x86_64-linux, x86_64-darwin ] CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] + clingo: [ i686-linux, x86_64-linux, x86_64-darwin ] clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] - clist: [ i686-linux, x86_64-linux, x86_64-darwin ] + clit: [ i686-linux, x86_64-linux, x86_64-darwin ] cloben: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3377,6 +3408,7 @@ dont-distribute-packages: cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloud-seeder: [ 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 ] @@ -3386,6 +3418,7 @@ dont-distribute-packages: clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmark-sections: [ i686-linux, x86_64-linux, x86_64-darwin ] cmath: [ i686-linux, x86_64-linux, x86_64-darwin ] cmathml3: [ i686-linux, x86_64-linux, x86_64-darwin ] CMCompare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3398,14 +3431,12 @@ dont-distribute-packages: 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - codex: [ i686-linux, x86_64-linux, x86_64-darwin ] cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3414,53 +3445,41 @@ dont-distribute-packages: collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ 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 ] - combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinat: [ i686-linux, x86_64-linux, x86_64-darwin ] + columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commutative: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] - compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] + compact: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + compact-mutable: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] - complex-generic: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-ekg: [ 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 ] @@ -3470,6 +3489,7 @@ dont-distribute-packages: concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] + concrete-haskell-autogen: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3479,6 +3499,7 @@ dont-distribute-packages: condor: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ 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 ] 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 ] @@ -3499,10 +3520,8 @@ dont-distribute-packages: consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - constrained-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ 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 ] @@ -3537,7 +3556,6 @@ dont-distribute-packages: copr: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] - core-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3560,8 +3578,6 @@ dont-distribute-packages: cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3591,22 +3607,20 @@ dont-distribute-packages: criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] criu-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] criu-rpc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + crjdt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] cron-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] + cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-enigma: [ 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 ] 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 ] - csp: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ 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 ] @@ -3615,14 +3629,11 @@ dont-distribute-packages: CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] - csv-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] - cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3632,7 +3643,6 @@ 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 ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3665,18 +3675,10 @@ dont-distribute-packages: data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-case-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-new-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ 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 ] - dataenc: [ i686-linux, x86_64-linux, x86_64-darwin ] data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3685,15 +3687,16 @@ dont-distribute-packages: data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3703,6 +3706,7 @@ dont-distribute-packages: 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 ] + data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3711,7 +3715,6 @@ 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 ] - dbmigrations: [ 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 ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3721,6 +3724,7 @@ dont-distribute-packages: dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-th-introspection: [ 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 ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3739,10 +3743,10 @@ dont-distribute-packages: ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - debian-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3776,7 +3780,6 @@ dont-distribute-packages: 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-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3789,45 +3792,38 @@ 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 ] - dia-functions: [ 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-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams: [ 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-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-rubiks-cube: [ 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 ] - dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] - dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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: [ 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 ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ 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 ] @@ -3838,31 +3834,34 @@ dont-distribute-packages: directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-plugins: [ 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-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - discount: [ 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-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ 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: [ 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 ] @@ -3881,17 +3880,14 @@ dont-distribute-packages: docker: [ i686-linux, x86_64-linux, x86_64-darwin ] doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] - doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] + DOH: [ i686-linux, x86_64-linux, x86_64-darwin ] doi: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] - dominion: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] - download-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] - download: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ 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 ] @@ -3929,6 +3925,9 @@ dont-distribute-packages: dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtw: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3940,8 +3939,6 @@ dont-distribute-packages: dwarfadt: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-linker-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-mvector: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3957,10 +3954,11 @@ dont-distribute-packages: 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 ] + easytensor: [ i686-linux, x86_64-linux, x86_64-darwin ] ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] + eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3976,20 +3974,17 @@ dont-distribute-packages: EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - effin: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ 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 ] - electrum-mnemonic: [ i686-linux, x86_64-linux, 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 ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4006,29 +4001,20 @@ dont-distribute-packages: enchant: [ 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: [ 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 ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] - EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - equal-files: [ i686-linux, x86_64-linux, x86_64-darwin ] EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] erd: [ i686-linux, x86_64-linux, x86_64-darwin ] erf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4040,12 +4026,12 @@ dont-distribute-packages: 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 ] + ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] - esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4075,22 +4061,17 @@ dont-distribute-packages: 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 ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] exference: [ i686-linux, x86_64-linux, x86_64-darwin ] - exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ] exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-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 ] - existential: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ 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 ] - exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4108,9 +4089,10 @@ dont-distribute-packages: extensible-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ 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 ] - factory: [ i686-linux, x86_64-linux, x86_64-darwin ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4123,13 +4105,20 @@ dont-distribute-packages: fastbayes: [ 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 ] - fast-tags: [ 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 ] + fay-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-geoposition: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] - fb: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4156,6 +4145,7 @@ dont-distribute-packages: ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] + fgl-extras-decompositions: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] ficketed: [ i686-linux, x86_64-linux, x86_64-darwin ] fields: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4167,6 +4157,8 @@ dont-distribute-packages: file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ 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 ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4176,15 +4168,14 @@ dont-distribute-packages: filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] - find-clumpiness: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ 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 ] - fishfood: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] + fitspec: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4192,10 +4183,8 @@ dont-distribute-packages: fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-imports: [ 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 ] - fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4216,16 +4205,12 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-statistics: [ i686-linux ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4235,7 +4220,6 @@ dont-distribute-packages: fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] - ForestStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4243,7 +4227,6 @@ dont-distribute-packages: FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] formal: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] - format-numbers: [ i686-linux ] format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] formattable: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4257,7 +4240,6 @@ dont-distribute-packages: 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 ] - foundation: [ 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 ] @@ -4267,14 +4249,12 @@ dont-distribute-packages: franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] fraxl: [ i686-linux, x86_64-linux, x86_64-darwin ] - freddy: [ i686-linux, x86_64-linux, x86_64-darwin ] free-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 ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer: [ 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 ] free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4284,18 +4264,14 @@ dont-distribute-packages: free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, 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 ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4321,7 +4297,6 @@ dont-distribute-packages: fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4329,7 +4304,6 @@ dont-distribute-packages: g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4339,7 +4313,6 @@ dont-distribute-packages: gcodehs: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4363,28 +4336,19 @@ dont-distribute-packages: genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] - genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] geniplate: [ i686-linux, x86_64-linux, x86_64-darwin ] geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] genprog: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-aeson: [ 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-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-time: [ 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 ] - geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] - geoip2: [ i686-linux, x86_64-linux, x86_64-darwin ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4396,6 +4360,7 @@ dont-distribute-packages: getflag: [ 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 ] @@ -4407,11 +4372,7 @@ dont-distribute-packages: ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4423,30 +4384,17 @@ dont-distribute-packages: 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-syb-utils: [ 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 ] ght: [ 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 ] - gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-girepository: [ 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-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-ggit: [ 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-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: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - ginger: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ 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 ] @@ -4458,18 +4406,13 @@ dont-distribute-packages: git-freq: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] - github: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-tools: [ i686-linux ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-webhook-handler-snap: [ 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 ] git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ 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 ] - git-mediate: [ i686-linux, x86_64-linux, x86_64-darwin ] git-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4477,22 +4420,13 @@ dont-distribute-packages: gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] - givegif: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react-widget: [ 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 ] - glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] - glider-nlp: [ i686-linux, x86_64-linux, 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 ] @@ -4505,19 +4439,11 @@ dont-distribute-packages: 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-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-raster: [ 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 ] - gluturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4535,48 +4461,30 @@ dont-distribute-packages: goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] goat: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-manufacturers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-sheets: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-shopping-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-slides: [ 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 ] GoogleDirections: [ 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-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-jwt: [ 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 ] - GoogleSuggest: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ 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-logging: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ 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 ] @@ -4586,13 +4494,7 @@ dont-distribute-packages: 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-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-ui: [ 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 ] @@ -4601,18 +4503,11 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphql-api: [ i686-linux, x86_64-linux, 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: [ 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 ] graphtype: [ 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 ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4630,12 +4525,6 @@ dont-distribute-packages: grm: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-th: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4644,10 +4533,8 @@ dont-distribute-packages: gruff: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4675,24 +4562,19 @@ dont-distribute-packages: gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] gyah-bin: [ 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 ] 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 ] 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 ] - hack2-interface-wai: [ 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 ] hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-plot: [ 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 ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4716,6 +4598,7 @@ dont-distribute-packages: haddock-leksah: [ 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 ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4732,13 +4615,9 @@ dont-distribute-packages: hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ 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 ] - hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4746,7 +4625,6 @@ dont-distribute-packages: halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4768,6 +4646,7 @@ dont-distribute-packages: HAppS-IxSet: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Server: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-State: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ 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 ] @@ -4784,9 +4663,7 @@ dont-distribute-packages: 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-server-tls: [ 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 ] happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4794,13 +4671,11 @@ dont-distribute-packages: happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - happy-meta: [ 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 ] 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 ] - har: [ 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 ] @@ -4809,9 +4684,8 @@ dont-distribute-packages: haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascal: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4824,13 +4698,11 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskakafka: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskades: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4839,12 +4711,12 @@ dont-distribute-packages: haskell2010: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell98: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell98libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-abci: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4866,14 +4738,14 @@ dont-distribute-packages: haskelldb: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellLM: [ 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 ] @@ -4889,23 +4761,15 @@ dont-distribute-packages: haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-src-exts-observe: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4937,26 +4801,19 @@ dont-distribute-packages: HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-cabal-install: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - hastily: [ 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 ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4966,11 +4823,8 @@ dont-distribute-packages: hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Hawk: [ i686-linux, x86_64-linux, x86_64-darwin ] hax: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxl-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4985,8 +4839,6 @@ dont-distribute-packages: hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hburg: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] hcc: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4994,6 +4846,7 @@ dont-distribute-packages: HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] hcltest: [ i686-linux, x86_64-linux, x86_64-darwin ] hcoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcom: [ i686-linux, x86_64-linux, x86_64-darwin ] hcoord: [ i686-linux, x86_64-linux, x86_64-darwin ] hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5014,16 +4867,12 @@ 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 ] 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 ] - heaps: [ i686-linux, x86_64-linux, x86_64-darwin ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] - heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ 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 ] @@ -5039,7 +4888,6 @@ dont-distribute-packages: hellage: [ i686-linux, x86_64-linux, x86_64-darwin ] hell: [ i686-linux, x86_64-linux, x86_64-darwin ] hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - helm: [ i686-linux, x86_64-linux, x86_64-darwin ] help-esb: [ i686-linux, x86_64-linux, x86_64-darwin ] hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] hemokit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5065,12 +4913,9 @@ dont-distribute-packages: hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat: [ 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 ] - hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5119,27 +4964,21 @@ dont-distribute-packages: hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ 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 ] 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 ] hi3status: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ 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 ] - hidapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hifi: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] - higher-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson-swagger: [ i686-linux ] - highjson-th: [ i686-linux ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] hi: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5147,13 +4986,12 @@ dont-distribute-packages: hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ 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 ] 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 ] - hip: [ i686-linux, x86_64-linux, x86_64-darwin ] HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5179,9 +5017,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-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 ] @@ -5197,17 +5033,13 @@ dont-distribute-packages: hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-repa: [ 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-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5262,12 +5094,10 @@ dont-distribute-packages: hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] - hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] - hora: [ i686-linux ] ho-rewriting: [ 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 ] 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 ] @@ -5276,16 +5106,13 @@ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5304,9 +5131,9 @@ dont-distribute-packages: 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 ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] - hreader-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5319,11 +5146,9 @@ dont-distribute-packages: HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - hruby: [ i686-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hS3: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5331,7 +5156,6 @@ dont-distribute-packages: hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc2hs: [ 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-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5353,13 +5177,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 ] hs-di: [ 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 ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-duktape: [ 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 ] @@ -5372,7 +5194,6 @@ dont-distribute-packages: hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gen-iface: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gizapp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5380,10 +5201,9 @@ 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 ] - HSH: [ 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 ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5392,7 +5212,6 @@ dont-distribute-packages: hslibsvm: [ 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 ] - hslogger-template: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5407,19 +5226,14 @@ dont-distribute-packages: hsnsq: [ i686-linux, x86_64-linux, x86_64-darwin ] hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoM: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsOpenSSL: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoz: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5427,11 +5241,9 @@ dont-distribute-packages: hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ 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 ] @@ -5450,8 +5262,6 @@ dont-distribute-packages: hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp-th: [ 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 ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5467,7 +5277,6 @@ dont-distribute-packages: hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5475,6 +5284,7 @@ dont-distribute-packages: hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ 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 ] @@ -5489,27 +5299,20 @@ dont-distribute-packages: http-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-client-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-link-header: [ i686-linux ] - http-pony: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] - hub: [ i686-linux, x86_64-linux, x86_64-darwin ] - hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] huff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5520,7 +5323,6 @@ dont-distribute-packages: hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - HUnit-Plus: [ 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 ] @@ -5533,32 +5335,20 @@ dont-distribute-packages: huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json-lens: [ 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 ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ 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-expat: [ 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 ] @@ -5582,12 +5372,9 @@ dont-distribute-packages: 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 ] - hyper-extra: [ 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 ] - hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5599,14 +5386,12 @@ dont-distribute-packages: ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-server: [ 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 ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] iException: [ i686-linux, x86_64-linux, x86_64-darwin ] ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] - iff: [ i686-linux, x86_64-linux, x86_64-darwin ] IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] ig: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5644,7 +5429,6 @@ dont-distribute-packages: implicit-params: [ 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 ] - imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5662,11 +5446,8 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] - influxdb: [ 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-java: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5675,26 +5456,19 @@ 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 ] - int-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] - integer-logarithms: [ 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 ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - intro: [ i686-linux, x86_64-linux, x86_64-darwin ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] ion: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5711,9 +5485,6 @@ dont-distribute-packages: iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5722,14 +5493,11 @@ dont-distribute-packages: ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - is: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5741,14 +5509,8 @@ dont-distribute-packages: ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5766,7 +5528,6 @@ dont-distribute-packages: jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ 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 ] @@ -5775,30 +5536,21 @@ dont-distribute-packages: 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 ] - jenga: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] - jni: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] - jose-jwt: [ i686-linux ] - jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ 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 ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-assertions: [ 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 ] @@ -5807,6 +5559,7 @@ dont-distribute-packages: JSON-Combinator: [ 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 ] JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5815,27 +5568,19 @@ dont-distribute-packages: json-qq: [ 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 ] - jsonschema-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-stream: [ 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 ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] - juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-streaming: [ 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 ] @@ -5856,7 +5601,6 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - katip: [ 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 ] @@ -5883,7 +5627,6 @@ dont-distribute-packages: keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5899,7 +5642,6 @@ dont-distribute-packages: knots: [ i686-linux, x86_64-linux, x86_64-darwin ] koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] - kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5919,9 +5661,7 @@ dont-distribute-packages: lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5940,10 +5680,7 @@ dont-distribute-packages: Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdatex: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5965,18 +5702,15 @@ dont-distribute-packages: language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ 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: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] - large-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6008,19 +5742,15 @@ dont-distribute-packages: legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah: [ 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 ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lentil: [ i686-linux, x86_64-linux, x86_64-darwin ] - lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ 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 ] @@ -6040,7 +5770,6 @@ dont-distribute-packages: 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 ] - libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6050,20 +5779,14 @@ dont-distribute-packages: libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] librandomorg: [ i686-linux, x86_64-linux, x86_64-darwin ] - librato: [ i686-linux, x86_64-linux, x86_64-darwin ] - libroman: [ 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 ] - libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvorbis: [ 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 ] - libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ 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 ] @@ -6074,25 +5797,19 @@ dont-distribute-packages: Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] limp: [ i686-linux, x86_64-linux, x86_64-darwin ] - lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linden: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearmap-category: [ 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 ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] - linebreak: [ i686-linux, x86_64-linux, x86_64-darwin ] - LinguisticsTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] - linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6105,20 +5822,17 @@ dont-distribute-packages: lipsum-gen: [ 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 ] liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ 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-libcurl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] - live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] llsd: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6128,11 +5842,9 @@ dont-distribute-packages: llvm-data-interop: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general-darwin: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6140,16 +5852,12 @@ dont-distribute-packages: lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ 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 ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] - lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6159,17 +5867,19 @@ dont-distribute-packages: Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - logsink: [ 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 ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] lojysamban: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-apps: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-benches: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-cpp: [ i686-linux, x86_64-linux, x86_64-darwin ] lol: [ i686-linux, x86_64-linux, x86_64-darwin ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6182,15 +5892,12 @@ dont-distribute-packages: lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] loup: [ i686-linux, x86_64-linux, x86_64-darwin ] lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltext: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltiv1p1: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6208,21 +5915,17 @@ dont-distribute-packages: 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-clib: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-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 ] - 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 ] @@ -6236,9 +5939,7 @@ dont-distribute-packages: makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-all: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6249,7 +5950,6 @@ dont-distribute-packages: manatee-mplayer: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-pdfviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-processmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-template: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6258,21 +5958,16 @@ dont-distribute-packages: manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] - map-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup-preview: [ 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 ] - marxup: [ 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 ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6290,7 +5985,6 @@ dont-distribute-packages: MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-transformers: [ 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 ] @@ -6311,12 +6005,9 @@ dont-distribute-packages: 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: [ i686-linux ] - mediabus-rtp: [ i686-linux ] 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 ] - mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6338,28 +6029,23 @@ dont-distribute-packages: metricsd-client: [ 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 ] + metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] - microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - microlens-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - milena: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-string: [ 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 ] @@ -6377,7 +6063,6 @@ dont-distribute-packages: mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] - mix-arrows: [ i686-linux, x86_64-linux, x86_64-darwin ] mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6385,11 +6070,8 @@ dont-distribute-packages: 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 ] - mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] - modbus-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - modify-fasta: [ 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 ] @@ -6398,7 +6080,6 @@ dont-distribute-packages: modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] - moesocks: [ 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 ] @@ -6409,9 +6090,9 @@ dont-distribute-packages: MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6428,8 +6109,6 @@ dont-distribute-packages: monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6437,7 +6116,6 @@ dont-distribute-packages: 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-st: [ 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 ] @@ -6450,7 +6128,6 @@ dont-distribute-packages: mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] money: [ i686-linux, x86_64-linux, x86_64-darwin ] - mongoDB: [ 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 ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6476,8 +6153,6 @@ 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 ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6502,8 +6177,8 @@ dont-distribute-packages: mud: [ i686-linux, x86_64-linux, x86_64-darwin ] mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ 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 ] @@ -6531,7 +6206,6 @@ dont-distribute-packages: musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6546,15 +6220,11 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell: [ 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-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] - mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6575,7 +6245,6 @@ dont-distribute-packages: native: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - NaturalLanguageAlphabets: [ 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 ] @@ -6603,9 +6272,6 @@ dont-distribute-packages: nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6614,15 +6280,12 @@ dont-distribute-packages: 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-carbon: [ 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 ] - networked-game: [ 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-msgpack-rpc: [ 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 ] @@ -6633,6 +6296,7 @@ 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-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6643,7 +6307,6 @@ dont-distribute-packages: newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] newt: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-deriving: [ i686-linux, x86_64-linux, x86_64-darwin ] - newtype-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] nfc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6656,38 +6319,31 @@ dont-distribute-packages: 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-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 ] nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] - n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] + noether: [ 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-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ 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 ] - normalization-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ 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 ] @@ -6699,27 +6355,25 @@ dont-distribute-packages: NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] + numeric-ode: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ 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 ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] + obdd: [ i686-linux, x86_64-linux, x86_64-darwin ] obd: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] obj: [ i686-linux, x86_64-linux, x86_64-darwin ] - octane: [ i686-linux ] + 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 ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6727,6 +6381,7 @@ dont-distribute-packages: oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6740,14 +6395,13 @@ dont-distribute-packages: 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 ] - one-liner: [ 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 ] 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 ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6760,24 +6414,17 @@ dont-distribute-packages: opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLRaw21: [ i686-linux, x86_64-linux, x86_64-darwin ] open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - openid: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-Crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] opensoundcontrol-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - openssl-createkey: [ i686-linux, x86_64-linux, x86_64-darwin ] - openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] - operational-alacarte: [ 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 ] @@ -6794,23 +6441,24 @@ dont-distribute-packages: ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] - orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] orgstat: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] + orizentic: [ i686-linux, x86_64-linux, x86_64-darwin ] OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ] osc: [ i686-linux, x86_64-linux, x86_64-darwin ] + oscpacking: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] + otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ 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 ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] pack: [ 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 ] @@ -6819,22 +6467,17 @@ dont-distribute-packages: panda: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ 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-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude: [ 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 ] - papillon: [ i686-linux, x86_64-linux, x86_64-darwin ] pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] + paprika: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6845,7 +6488,6 @@ dont-distribute-packages: parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6856,9 +6498,7 @@ dont-distribute-packages: parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] partage: [ i686-linux, x86_64-linux, x86_64-darwin ] partial: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-isomorphisms: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -6881,12 +6521,10 @@ 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 ] - pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-slave-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdfname: [ 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 ] - peano: [ i686-linux, x86_64-linux, x86_64-darwin ] PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6895,29 +6533,26 @@ dont-distribute-packages: penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + penrose: [ i686-linux, x86_64-linux, x86_64-darwin ] peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] - period: [ i686-linux, x86_64-linux, x86_64-darwin ] + perf: [ 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 ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] persona: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6925,9 +6560,9 @@ dont-distribute-packages: peyotls-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] peyotls: [ i686-linux, x86_64-linux, x86_64-darwin ] pez: [ i686-linux, x86_64-linux, x86_64-darwin ] - pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6949,11 +6584,9 @@ dont-distribute-packages: pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6963,7 +6596,6 @@ dont-distribute-packages: pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6975,10 +6607,8 @@ 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-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 ] pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6987,19 +6617,16 @@ dont-distribute-packages: plailude: [ 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 ] PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] - playlists: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] - ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7015,19 +6642,16 @@ dont-distribute-packages: polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] polimorf: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ i686-linux, x86_64-linux, x86_64-darwin ] - poly-arity: [ i686-linux, x86_64-linux, x86_64-darwin ] poly-control: [ i686-linux, x86_64-linux, x86_64-darwin ] polynom: [ i686-linux, x86_64-linux, x86_64-darwin ] polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ 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 ] @@ -7038,7 +6662,6 @@ dont-distribute-packages: porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-pty: [ 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 ] @@ -7046,9 +6669,6 @@ dont-distribute-packages: 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 ] @@ -7057,13 +6677,9 @@ dont-distribute-packages: postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - powermate: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] - pptable: [ 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 ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7073,24 +6689,18 @@ dont-distribute-packages: prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] - pregame: [ i686-linux, x86_64-linux, x86_64-darwin ] - preliminaries: [ 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 ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] - present: [ 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 ] - pretty-error: [ 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 ] - pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ 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 ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7113,6 +6723,7 @@ dont-distribute-packages: 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 ] prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7124,27 +6735,20 @@ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-protoc: [ 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 ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] - pub: [ 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-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 ] @@ -7152,14 +6756,13 @@ dont-distribute-packages: 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: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ 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 ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + pursuit-client: [ 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 ] - pusher-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ 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 ] @@ -7177,8 +6780,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 ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7199,8 +6802,6 @@ dont-distribute-packages: queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7208,16 +6809,13 @@ dont-distribute-packages: quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-special: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quick-schema: [ 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 ] - quickterm: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7225,21 +6823,19 @@ dont-distribute-packages: 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 ] - rabocsv2qif: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - radium: [ i686-linux, x86_64-linux, x86_64-darwin ] radix: [ 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 ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7252,7 +6848,6 @@ dont-distribute-packages: random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-variates: [ i686-linux, x86_64-linux, x86_64-darwin ] rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7279,7 +6874,6 @@ dont-distribute-packages: rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] raz: [ i686-linux, x86_64-linux, x86_64-darwin ] razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - rbpcp-api: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7287,21 +6881,15 @@ dont-distribute-packages: react-haskell: [ 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-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ReadArgs: [ i686-linux, x86_64-linux, x86_64-darwin ] - read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] read-io: [ i686-linux, x86_64-linux, x86_64-darwin ] readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7314,45 +6902,31 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] - records-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] - Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] - references: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ 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 ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-animation: [ 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-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] - refty: [ i686-linux, x86_64-linux, x86_64-darwin ] - refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexchar: [ 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 ] - regexdot: [ 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: [ 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 ] regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7363,7 +6937,6 @@ 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 ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] regions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7379,10 +6952,7 @@ dont-distribute-packages: reheat: [ 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 ] - rei: [ i686-linux, x86_64-linux, x86_64-darwin ] - reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] - relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ 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 ] @@ -7396,18 +6966,18 @@ dont-distribute-packages: remote-monad: [ 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-fftw: [ 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 ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7420,7 +6990,7 @@ dont-distribute-packages: req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] req: [ 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 ] + resin: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ 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 ] @@ -7449,6 +7019,7 @@ dont-distribute-packages: ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] ridley: [ 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 ] @@ -7460,7 +7031,6 @@ dont-distribute-packages: RJson: [ 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 ] - rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7468,16 +7038,15 @@ dont-distribute-packages: RNAdraw: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFold: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] - RNAlien: [ 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 ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - rocksdb-haskell: [ i686-linux ] + roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - rollbar: [ 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 ] @@ -7488,8 +7057,6 @@ dont-distribute-packages: rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] route-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7501,17 +7068,14 @@ dont-distribute-packages: rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ 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 ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] + rubberband: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruff: [ 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 ] @@ -7520,14 +7084,12 @@ dont-distribute-packages: rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] SableCC2Hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-access: [ i686-linux, x86_64-linux, x86_64-darwin ] safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money: [ 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 ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7558,15 +7120,13 @@ dont-distribute-packages: sat: [ i686-linux, x86_64-linux, x86_64-darwin ] sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbp2udp: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] sbvPlugin: [ 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 ] - s-cargot: [ 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 ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7597,11 +7157,9 @@ dont-distribute-packages: 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 ] - sdl2-cairo: [ 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-image: [ 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 ] @@ -7609,11 +7167,9 @@ dont-distribute-packages: sec: [ i686-linux, x86_64-linux, x86_64-darwin ] seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] - secure-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7631,52 +7187,43 @@ 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 ] 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 ] - serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ 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: [ 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-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-docs: [ i686-linux ] + 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-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pandoc: [ 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-purescript: [ 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-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-subscriber: [ 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 ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] services: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7685,16 +7232,12 @@ dont-distribute-packages: ses-html-snaplet: [ 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 ] - setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] - setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] - sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sext: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7712,7 +7255,6 @@ 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-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 ] @@ -7725,9 +7267,8 @@ dont-distribute-packages: she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] + shell-conduit: [ 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 ] - shellmate: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7737,21 +7278,17 @@ dont-distribute-packages: 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 ] - sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - sigma-ij: [ i686-linux ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] simd: [ i686-linux, x86_64-linux, x86_64-darwin ] simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7761,7 +7298,7 @@ dont-distribute-packages: simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7771,18 +7308,15 @@ dont-distribute-packages: simple-postgresql-orm: [ 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 ] - simple-sql-parser: [ 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 ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - sindre: [ 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 ] - sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + sitemap: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7791,14 +7325,11 @@ dont-distribute-packages: skell: [ i686-linux, x86_64-linux, x86_64-darwin ] skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - slack-api: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] slack-web: [ 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 ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7813,7 +7344,6 @@ dont-distribute-packages: sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ 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 ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7823,7 +7353,6 @@ dont-distribute-packages: smtp-mail-ng: [ 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-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7876,8 +7405,6 @@ dont-distribute-packages: snappy-framing: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7892,19 +7419,15 @@ dont-distribute-packages: snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] - soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-unix: [ 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 ] 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 ] @@ -7913,12 +7436,10 @@ dont-distribute-packages: sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] sorting: [ i686-linux, x86_64-linux, x86_64-darwin ] sorty: [ i686-linux, x86_64-linux, x86_64-darwin ] - sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7934,23 +7455,18 @@ dont-distribute-packages: sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] - spike: [ 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 ] splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] spline3: [ i686-linux, x86_64-linux, x86_64-darwin ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] - split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlcipher: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7961,8 +7477,8 @@ dont-distribute-packages: sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ 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 ] sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7970,16 +7486,14 @@ dont-distribute-packages: sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-setup: [ 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 ] - stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7989,7 +7503,6 @@ dont-distribute-packages: state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] state: [ 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 ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7997,25 +7510,21 @@ dont-distribute-packages: statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - staversion: [ 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 ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] - StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - store: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8027,18 +7536,15 @@ dont-distribute-packages: streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] str: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-identity: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-io: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] - StringUtils: [ 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 ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8050,7 +7556,6 @@ dont-distribute-packages: 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 ] - styx: [ 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 ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8064,8 +7569,8 @@ dont-distribute-packages: sunroof-server: [ 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 ] super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8075,46 +7580,39 @@ dont-distribute-packages: 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 ] - swagger2: [ i686-linux ] - swagger: [ 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 ] - swish: [ 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 ] SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + symantic-lib: [ 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 ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] syntax-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ 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 ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] - sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-info: [ 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 ] @@ -8133,6 +7631,8 @@ dont-distribute-packages: 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: [ i686-linux, x86_64-linux, x86_64-darwin ] + taggy-lens: [ 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 ] @@ -8140,7 +7640,6 @@ dont-distribute-packages: tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] Tahin: [ i686-linux, x86_64-linux, x86_64-darwin ] ta: [ i686-linux, x86_64-linux, x86_64-darwin ] - tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8152,27 +7651,22 @@ 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-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcod-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - tdoc: [ 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 ] @@ -8199,14 +7693,13 @@ dont-distribute-packages: tensorflow-records: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ 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 ] - TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] + testbench: [ 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 ] @@ -8220,21 +7713,15 @@ dont-distribute-packages: testrunner: [ 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-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-quickcheck: [ 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 ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + TeX-my-math: [ 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-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-lips: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8243,8 +7730,6 @@ dont-distribute-packages: 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-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] textual: [ 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 ] @@ -8254,8 +7739,6 @@ dont-distribute-packages: tga: [ 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 ] - THEff: [ 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 ] @@ -8267,51 +7750,38 @@ dont-distribute-packages: th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui: [ 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 ] throttled-io-loop: [ 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 ] - tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ 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 ] - tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] - TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] tightrope: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] - timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8324,7 +7794,6 @@ 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 ] - tld: [ 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 ] @@ -8337,29 +7806,23 @@ dont-distribute-packages: 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 ] + tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] - toolshed: [ 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 ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - total: [ i686-linux, x86_64-linux, x86_64-darwin ] touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] - tower: [ i686-linux ] 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 ] traced: [ 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 ] - 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 ] @@ -8368,22 +7831,18 @@ dont-distribute-packages: TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - transformers-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa-reflex: [ 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 ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - treemap: [ 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 ] t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8402,7 +7861,6 @@ dont-distribute-packages: tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] - tslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8417,6 +7875,7 @@ dont-distribute-packages: turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] twee: [ i686-linux, x86_64-linux, x86_64-darwin ] + tweet-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8424,32 +7883,25 @@ dont-distribute-packages: twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] twentyseven: [ i686-linux, x86_64-linux, x86_64-darwin ] - twfy-api-client: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types-lens: [ 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 ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ 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 ] - typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ 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 ] @@ -8464,7 +7916,7 @@ dont-distribute-packages: type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-of-html: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8486,16 +7938,14 @@ dont-distribute-packages: udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ 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 ] - uid: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ 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 ] 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 ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicoder: [ 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 ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8508,15 +7958,12 @@ dont-distribute-packages: universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - unjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ 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 ] update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8526,14 +7973,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-templater: [ 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 ] + url-decoders: [ 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 ] url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] + urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8545,6 +7993,7 @@ dont-distribute-packages: utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ 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 ] @@ -8566,12 +8015,12 @@ dont-distribute-packages: vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, 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 ] 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-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 ] vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8589,10 +8038,9 @@ dont-distribute-packages: verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - ViennaRNA-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] + Villefort: [ 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 ] @@ -8605,7 +8053,6 @@ dont-distribute-packages: visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8619,10 +8066,7 @@ dont-distribute-packages: wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-app-file-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-cors: [ 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-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8635,7 +8079,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-auth: [ i686-linux ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8644,13 +8087,13 @@ 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-static: [ 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-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 ] @@ -8663,42 +8106,31 @@ dont-distribute-packages: warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] - watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] - wave: [ 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 ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + web3: [ i686-linux, x86_64-linux, x86_64-darwin ] webapi: [ i686-linux, x86_64-linux, x86_64-darwin ] webapp: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] webcloud: [ i686-linux, x86_64-linux, x86_64-darwin ] WebCont: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ 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 ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] - webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit2gtk3-javascriptcore: [ 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 ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8706,9 +8138,6 @@ dont-distribute-packages: web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] - websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] wedged: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8731,9 +8160,7 @@ dont-distribute-packages: 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 ] - wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] - wiringPi: [ i686-linux, x86_64-linux, x86_64-darwin ] + wires: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8743,11 +8170,11 @@ dont-distribute-packages: wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] - word24: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ 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-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8757,8 +8184,9 @@ dont-distribute-packages: wraxml: [ 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 ] - writer-cps-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8768,15 +8196,10 @@ 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 ] - 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 ] - wx: [ i686-linux, x86_64-linux, x86_64-darwin ] wxSimpleCanvas: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8784,12 +8207,10 @@ 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 ] - x11-xinput: [ 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 ] - xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ 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 ] @@ -8799,7 +8220,6 @@ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8810,17 +8230,16 @@ dont-distribute-packages: xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ 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 ] - XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8843,9 +8262,6 @@ dont-distribute-packages: xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - xtc: [ i686-linux, x86_64-linux, x86_64-darwin ] - xturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] - xxhash: [ i686-linux, x86_64-linux, x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8860,12 +8276,10 @@ dont-distribute-packages: yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-union: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] - YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa-glut: [ 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 ] yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8881,12 +8295,11 @@ dont-distribute-packages: 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 ] - yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-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 ] @@ -8898,19 +8311,16 @@ dont-distribute-packages: yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-csp: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-fb: [ 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-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paypal-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8919,7 +8329,6 @@ dont-distribute-packages: yesod-raml-bin: [ 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-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8932,26 +8341,17 @@ dont-distribute-packages: yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] - yet-another-logger: [ i686-linux ] YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-mode-javascript: [ 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 ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ] - yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8960,7 +8360,6 @@ dont-distribute-packages: yst: [ 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 ] 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 ] @@ -8983,14 +8382,12 @@ dont-distribute-packages: zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zip: [ i686-linux ] 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 ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] - zm: [ i686-linux, x86_64-linux, x86_64-darwin ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix index cd7857e23de9..be90794f58d9 100644 --- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix +++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 34048c0b4391..36f5f28f2f81 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -25,9 +25,9 @@ # * enabling/disabling certain features in packages # # If you have an override of this kind, see configuration-common.nix instead. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; # All of the overrides in this set should look like: # @@ -64,8 +64,19 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' - unset CC # unconfuse the haskell-cuda configure script - sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + nvvm = overrideCabal super.nvvm (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + cufft = overrideCabal super.cufft (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} ''; }); @@ -408,6 +419,17 @@ self: super: builtins.intersectAttrs super { testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; }); + # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required + # on darwin: https://github.com/NixOS/cabal2nix/issues/146. + hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; + + # FSEvents API is very buggy and tests are unreliable. See + # http://openradar.appspot.com/10207999 and similar issues. + # https://github.com/haskell-fswatch/hfsnotify/issues/62 + fsnotify = if pkgs.stdenv.isDarwin + then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa + else dontCheck super.fsnotify; + hidapi = addExtraLibrary super.hidapi pkgs.libudev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; @@ -430,7 +452,7 @@ self: super: builtins.intersectAttrs super { 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_12; }; + 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: { @@ -467,10 +489,4 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); - # Needs a newer version of brick than lts-8.x provides. - hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; }; - - # Needs a newer version of hsyslog than lts-8.x provides. - logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; }; - } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 9a67adf57aca..9eeae0eddc76 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc, all-cabal-hashes +{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -11,17 +11,17 @@ self: # Provided by `callPackageWithOutput` let - inherit (stdenv.lib) extends makeExtensible; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet; + inherit (lib) extends makeExtensible; + inherit (haskellLib) overrideCabal makePackageSet; - haskellPackages = makePackageSet { + haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; extensible-self = self; - inherit ghc; + inherit stdenv haskellLib ghc; }; - commonConfiguration = configurationCommon { inherit pkgs; }; - nixConfiguration = configurationNix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; + nixConfiguration = configurationNix { inherit pkgs haskellLib; }; in (extends overrides (extends packageSetConfig diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 97a3adaf220f..60cce56cca02 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs, lib -}: let isCross = (ghc.cross or null) != null; in +, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo +}: +let isCross = (ghc.cross or null) != null; in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -53,6 +54,8 @@ , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" +, enableSeparateDataOutput ? false +, enableSeparateDocOutput ? doHaddock } @ args: assert editedCabalFile != null -> revision != null; @@ -76,6 +79,9 @@ let then "package-db" else "package-conf"; + # the target dir for haddock documentation + docdir = docoutput: docoutput + "/share/doc"; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { url = newCabalFileUrl; @@ -108,6 +114,8 @@ let defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" + (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") + (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") "--with-gcc=$CC" # Clang won't work without that extra information. "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") @@ -144,9 +152,9 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; - nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; + nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs @@ -173,6 +181,9 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; + outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc")); + setOutputFlags = false; + pos = builtins.unsafeGetAttrPos "pname" args; prePhases = ["setupCompilerEnvironmentPhase"]; @@ -211,7 +222,7 @@ stdenv.mkDerivation ({ configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" # nativePkgs defined in stdenv/setup.hs - for p in $nativePkgs; do + for p in "''${nativePkgs[@]}"; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue @@ -224,18 +235,18 @@ stdenv.mkDerivation ({ fi done '' + (optionalString stdenv.isDarwin '' - # Work around a limit in the Mac OS X Sierra linker on the number of paths + # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # - # Create a local directory with symlinks of the *.dylib (Mac OS X shared + # Create a local directory with symlinks of the *.dylib (macOS shared # 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 - ln -s $d/*.dylib $dynamicLinksDir + for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do + ln -s "$d/"*.dylib $dynamicLinksDir done # Edit the local package DB to reference the links directory. - for f in $packageConfDir/*.conf; do + for f in "$packageConfDir/"*.conf; do sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f done '') + '' @@ -311,7 +322,7 @@ stdenv.mkDerivation ({ ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" - printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + printWords '#!${nodejs}/bin/node' > "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done @@ -323,6 +334,14 @@ stdenv.mkDerivation ({ done ''} + ${optionalString enableSeparateDocOutput '' + for x in ${docdir "$doc"}/html/src/*.html; do + remove-references-to -t $out $x + done + mkdir -p $doc + ''} + ${optionalString enableSeparateDataOutput "mkdir -p $data"} + runHook postInstall ''; @@ -332,6 +351,14 @@ stdenv.mkDerivation ({ isHaskellLibrary = hasActiveLibrary; + # TODO: ask why the split outputs are configurable at all? + # TODO: include tests for split if possible + # Given the haskell package, returns + # the directory containing the haddock documentation. + # `null' if no haddock documentation was built. + # TODO: fetch the self from the fixpoint instead + haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null; + env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; nativeBuildInputs = [ ghcEnv systemBuildInputs ] @@ -341,6 +368,7 @@ stdenv.mkDerivation ({ shellHook = '' export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" + # TODO: is this still valid? export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${ makeLibraryPath (filter (x: !isNull x) systemBuildInputs) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f6a39b86510..b90e11cc51c9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -269,7 +269,6 @@ self: { homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ADPfusionSet" = callPackage @@ -478,7 +477,9 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: + ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar + , transformers + }: mkDerivation { pname = "ALUT"; version = "2.4.0.2"; @@ -487,6 +488,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base OpenAL StateVar transformers ]; librarySystemDepends = [ freealut ]; + executableHaskellDepends = [ base pretty ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; @@ -654,6 +656,7 @@ self: { sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Library for incremental computing"; license = stdenv.lib.licenses.bsd3; @@ -682,6 +685,7 @@ self: { pname = "AesonBson"; version = "0.2.2"; sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bson unordered-containers vector ]; @@ -721,10 +725,11 @@ self: { pname = "Agda"; version = "2.5.2"; sha256 = "0f8ld7sqkfhirhs886kp090iaq70qxsj8ms8farc80vzpz1ww4nq"; - revision = "2"; - editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d"; + revision = "3"; + editedCabalFile = "10j2hf2g9vv2xibywgd8s96x05clfxr4wli00011vkhblr4p9br8"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary boxes bytestring containers data-hash deepseq directory EdisonCore edit-distance equivalence filepath @@ -849,6 +854,7 @@ self: { sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ async base containers enummapset-th filepath LambdaHack random template-haskell text zlib @@ -942,11 +948,12 @@ self: { }) {}; "AppleScript" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base }: mkDerivation { pname = "AppleScript"; version = "0.2.0.1"; sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr"; + libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/reinerp/haskell-AppleScript"; description = "Call AppleScript from Haskell, and then call back into Haskell"; @@ -1384,7 +1391,6 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -1411,16 +1417,27 @@ self: { }) {}; "BiobaseBlast" = callPackage - ({ mkDerivation, array, base, BiobaseXNA, containers }: + ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes + , BiobaseXNA, bytestring, cereal, containers, deepseq, directory + , filepath, PrimitiveArray, split, tasty, tasty-quickcheck + , tasty-silver, tasty-th, vector, vector-th-unbox + }: mkDerivation { pname = "BiobaseBlast"; - version = "0.0.0.1"; - sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f"; - libraryHaskellDepends = [ array base BiobaseXNA containers ]; - homepage = "http://www.tbi.univie.ac.at/~choener/"; + version = "0.2.0.0"; + sha256 = "0x4skz0akhhxplwk7v7jnyfgih4iwv8p5lkfh2cn1dm79bkbyj53"; + libraryHaskellDepends = [ + aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring + cereal containers deepseq directory PrimitiveArray vector + vector-th-unbox + ]; + testHaskellDepends = [ + base bytestring containers filepath split tasty tasty-quickcheck + tasty-silver tasty-th + ]; + homepage = "https://github.com/choener/BiobaseBlast"; description = "BLAST-related tools"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseDotP" = callPackage @@ -1528,18 +1545,23 @@ self: { "BiobaseNewick" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal - , cereal-text, containers, fgl, ForestStructures, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-binary, vector + , cereal-text, cmdargs, containers, fgl, ForestStructures + , QuickCheck, test-framework, test-framework-quickcheck2 + , test-framework-th, text, text-binary, vector }: mkDerivation { pname = "BiobaseNewick"; - version = "0.0.0.1"; - sha256 = "0izhxk24zjf767ng0gcjmcjfnngk0zh01a2sbd6icmmb45zaw75s"; + version = "0.0.0.2"; + sha256 = "1g8kdmraxv0qf3nzm7hi36nhw0j8kyjmjlwslp7a5n2zly2gcck4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base binary cereal cereal-text containers fgl ForestStructures QuickCheck text text-binary vector ]; + executableHaskellDepends = [ + base cmdargs ForestStructures text vector + ]; testHaskellDepends = [ aeson base binary cereal QuickCheck test-framework test-framework-quickcheck2 test-framework-th @@ -1547,7 +1569,6 @@ self: { homepage = "https://github.com/choener/BiobaseNewick"; description = "Newick file format parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseTrainingData" = callPackage @@ -1613,7 +1634,6 @@ self: { homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1646,6 +1666,7 @@ self: { sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector containers csv deepseq file-embed hashable lens primitive @@ -1659,7 +1680,6 @@ self: { homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1749,6 +1769,7 @@ self: { sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory HaXml polyparse pretty wx wxcore ]; @@ -1786,7 +1807,6 @@ 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 @@ -1807,7 +1827,6 @@ 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 @@ -1820,6 +1839,7 @@ self: { sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal MissingH ]; libraryHaskellDepends = [ base containers MissingH network-uri parsec @@ -1874,6 +1894,7 @@ self: { sha256 = "1a1g8ipppwrb42fvli27qi4i78vgdk3wwxsjhqy0p6pwpa0hvcaq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath pandoc pandoc-citeproc pandoc-types parseargs @@ -2183,6 +2204,7 @@ self: { sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 ]; description = "A simple Brainfuck interpretter"; license = stdenv.lib.licenses.bsd3; @@ -2317,6 +2339,7 @@ self: { pname = "CTRex"; version = "0.6"; sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers hashable mtl unordered-containers ]; @@ -2439,6 +2462,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cabal_2_0_0_2" = 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.0.2"; + sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testHaskellDepends = [ + array base bytestring containers directory filepath pretty + QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck + ]; + doCheck = false; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -2630,6 +2677,7 @@ self: { pname = "Chart-diagrams"; version = "1.8.2"; sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers data-default-class diagrams-core diagrams-lib diagrams-postscript @@ -2656,7 +2704,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -2703,6 +2750,7 @@ self: { sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory ]; homepage = "http://cheatsheet.codeslower.com"; description = "A Haskell cheat sheet in PDF and literate formats"; @@ -2806,8 +2854,8 @@ self: { ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { pname = "Clipboard"; - version = "2.3.1.0"; - sha256 = "1qsky3gh99l4csswd8w5iwx81v4cvg89h1wbr74ys0gswgiqbfyx"; + version = "2.3.2.0"; + sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz"; libraryHaskellDepends = [ base directory unix utf8-string X11 ]; homepage = "http://haskell.org/haskellwiki/Clipboard"; description = "System clipboard interface"; @@ -2872,7 +2920,6 @@ self: { librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; "Combinatorrent" = callPackage @@ -2888,6 +2935,7 @@ self: { sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array attoparsec base bytestring cereal containers deepseq directory filepath hopenssl hslogger HTTP HUnit mtl network @@ -3338,6 +3386,7 @@ self: { sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base HUnit pretty QuickCheck random ]; @@ -3472,20 +3521,52 @@ self: { }) {}; "DMuCheck" = callPackage - ({ mkDerivation, base, MuCheck }: + ({ mkDerivation, base, binary, directory, distributed-process + , distributed-process-simplelocalnet, hint, MuCheck + , network-transport-tcp, unix + }: mkDerivation { pname = "DMuCheck"; version = "0.3.0.2"; sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base MuCheck ]; + executableHaskellDepends = [ + base binary directory distributed-process + distributed-process-simplelocalnet hint MuCheck + network-transport-tcp unix + ]; homepage = "https://bitbucket.com/osu-testing/d-mucheck"; description = "Distributed Mutation Analysis framework for MuCheck"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "DOH" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , filepath, http-client, http-client-tls, http-types + , interpolatedstring-perl6, lens, mtl, QuickCheck + , quickcheck-instances, text, time, unordered-containers, uri + }: + mkDerivation { + pname = "DOH"; + version = "0.1.2.0"; + sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types lens mtl text time unordered-containers + uri + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types interpolatedstring-perl6 lens mtl + QuickCheck quickcheck-instances text time unordered-containers uri + ]; + description = "Complete API bindings for DigitalOcean API V2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DOM" = callPackage ({ mkDerivation, base, mtl, WebBits }: mkDerivation { @@ -3533,7 +3614,7 @@ self: { regex-posix split syb time unix ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ array base bytestring HTF ]; description = "Darcs Patch Manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -3574,6 +3655,7 @@ self: { pname = "DRBG"; version = "0.5.5"; sha256 = "1z9vqc1nw0mf2sqgddcipmlkz6mckq9wnrzqqdy3rj3c90135pr1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal cipher-aes128 crypto-api cryptohash-cryptoapi entropy mtl parallel prettyclass tagged @@ -3649,6 +3731,7 @@ self: { sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers haskell98 network process unix ]; @@ -3887,16 +3970,18 @@ self: { }) {}; "DeepDarkFantasy" = callPackage - ({ mkDerivation, base, bimap, constraints, containers, mtl, random + ({ mkDerivation, base, bimap, constraints, containers, mtl + , QuickCheck, random, recursion-schemes, template-haskell }: mkDerivation { pname = "DeepDarkFantasy"; - version = "0.2017.4.19"; - sha256 = "19fr67fkn4z47a27nbcqh1a24jh2ir32d6fzvjdmj7d0maman2rz"; + version = "0.2017.8.19"; + sha256 = "1hsmxb961jvlv77y3ajrd2gjfr84z2kq451fwwm4q6p28grjvj8l"; libraryHaskellDepends = [ - base bimap constraints containers mtl random + base bimap constraints containers mtl random recursion-schemes + template-haskell ]; - testHaskellDepends = [ base constraints mtl random ]; + testHaskellDepends = [ base constraints mtl QuickCheck random ]; description = "A DSL for creating neural network"; license = stdenv.lib.licenses.asl20; }) {}; @@ -3911,6 +3996,7 @@ self: { sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary bytestring containers GLUT HTTP MaybeT mtl network peakachu random time utility-ht zlib @@ -3965,6 +4051,7 @@ self: { pname = "Dflow"; version = "0.0.1"; sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers QuickCheck stm time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-quickcheck2 @@ -4096,6 +4183,7 @@ self: { sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Cabal chunks containers directory filepath hinstaller old-locale parsec pretty process template-haskell time xhtml @@ -4269,6 +4357,7 @@ self: { sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base filepath old-time process random @@ -4287,6 +4376,7 @@ self: { sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base old-time process random ]; homepage = "http://repetae.net/computer/haskell/DrIFT/"; description = "Program to derive type class instances"; @@ -4485,35 +4575,18 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "Earley"; - version = "0.11.0.1"; - sha256 = "1cw575wk6zzkzqpps05ww33s4j98q81zr821avh9s2xv4q4s81y2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ListLike ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ - base criterion deepseq ListLike parsec - ]; - description = "Parsing all context-free grammars using Earley's algorithm"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Earley_0_12_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, ListLike, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers }: mkDerivation { pname = "Earley"; - version = "0.12.0.0"; - sha256 = "0drkf9jc99vb82h0mb6x8plj1sn0ysdkmq5pqdyz7xq4ghj7srcq"; + version = "0.12.0.1"; + sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; + executableHaskellDepends = [ base unordered-containers ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -4522,7 +4595,6 @@ self: { ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ebnf2ps" = callPackage @@ -4625,6 +4697,7 @@ self: { sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base binary blaze-html blaze-markup bytestring cheapskate cmdargs containers directory filepath highlighting-kate @@ -4699,8 +4772,8 @@ self: { }: mkDerivation { pname = "EntrezHTTP"; - version = "1.0.3"; - sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; + version = "1.0.4"; + sha256 = "1gp5g3r05rwayk1gdb9dfzjmywwlr5d236dygryzmga9q13gwvxq"; libraryHaskellDepends = [ base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -4708,7 +4781,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 @@ -4871,6 +4943,7 @@ self: { sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 SDL SDL-mixer ]; homepage = "http://www.kryozahiro.org/eternal10/"; description = "A 2-D shooting game"; @@ -5146,6 +5219,7 @@ self: { pname = "FenwickTree"; version = "0.1.2.1"; sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base QuickCheck template-haskell ]; testHaskellDepends = [ base QuickCheck template-haskell ]; homepage = "https://github.com/mgajda/FenwickTree"; @@ -5271,6 +5345,7 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -5298,6 +5373,7 @@ self: { sha256 = "00sv8dd323lwyw6597xyza12h8m1pdp63b2jlqfsjgnxn2rb60lm"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; @@ -5400,6 +5476,7 @@ self: { sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cgi containers directory haskell98 old-time parsec xhtml ]; @@ -5447,22 +5524,6 @@ self: { }) {}; "FontyFruity" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, filepath, text, vector, xml - }: - mkDerivation { - pname = "FontyFruity"; - version = "0.5.3.2"; - sha256 = "05f558p3288qfg8prfvb28cc7mwd5nk07ias87xflq5x81pnw6c7"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq directory filepath text - vector xml - ]; - description = "A true type file format loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "FontyFruity_0_5_3_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , directory, filepath, text, vector, xml }: @@ -5476,7 +5537,6 @@ self: { ]; description = "A true type file format loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForSyDe" = callPackage @@ -5488,6 +5548,7 @@ self: { pname = "ForSyDe"; version = "3.1.1"; sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory filepath mtl old-time parameterized-data pretty process random regex-posix @@ -5501,25 +5562,24 @@ self: { "ForestStructures" = callPackage ({ mkDerivation, base, containers, criterion, fgl, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - , unordered-containers, vector, vector-th-unbox + , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector + , vector-th-unbox }: mkDerivation { pname = "ForestStructures"; - version = "0.0.0.1"; - sha256 = "04yiag6dwp2k4679b1ardccqayrq7503wxzy7y9a9pf2s558f7j5"; + version = "0.0.0.2"; + sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y"; libraryHaskellDepends = [ - base containers fgl unordered-containers vector vector-th-unbox + base containers fgl QuickCheck unordered-containers vector + vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base containers QuickCheck tasty tasty-quickcheck tasty-th vector ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/choener/ForestStructures"; description = "Tree- and forest structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForkableT" = callPackage @@ -5661,6 +5721,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Frames_0_2_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"; + sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-prim pipes primitive readable template-haskell text + transformers vector vinyl + ]; + testHaskellDepends = [ + base directory hspec htoml HUnit pipes 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -5684,6 +5770,7 @@ self: { sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base freetype2 OpenGL ]; description = "Loadable texture fonts for OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -5698,6 +5785,7 @@ self: { sha256 = "1bal6v1ps8ha5hkz12i20vwypvbcb6s9ykr8yylh4w4ddnsdgh3r"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; homepage = "http://joyful.com/fungen"; @@ -5759,6 +5847,7 @@ self: { pname = "GHood"; version = "0.0.6"; sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base process ]; homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood"; description = "A graphical viewer for Hood"; @@ -5784,6 +5873,7 @@ self: { pname = "GLFW-OGL"; version = "0.0"; sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl OGL ]; librarySystemDepends = [ libX11 libXrandr ]; homepage = "http://haskell.org/haskellwiki/GLFW-OGL"; @@ -5909,8 +5999,8 @@ self: { }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT" = callPackage - ({ mkDerivation, array, base, containers, OpenGL, StateVar - , transformers + ({ mkDerivation, array, base, bytestring, containers, OpenGL + , OpenGLRaw, random, StateVar, transformers }: mkDerivation { pname = "GLUT"; @@ -5921,6 +6011,9 @@ self: { libraryHaskellDepends = [ array base containers OpenGL StateVar transformers ]; + executableHaskellDepends = [ + array base bytestring OpenGLRaw random + ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; @@ -5969,6 +6062,7 @@ self: { pname = "GPipe"; version = "2.2.1"; sha256 = "1g5712apfv1jzi12shpzfp16274gfbjgf7r49fp1dawxnj8j734g"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers @@ -5976,7 +6070,6 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -6016,13 +6109,13 @@ self: { ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.4.1"; - sha256 = "0is6f58rs68pqnhqr26wj0nsaf2m6x40iaxvlq1w4m62f8n1g1kb"; + version = "1.4.1.1"; + sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-TextureLoad" = callPackage @@ -6066,8 +6159,9 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.1"; - sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd"; + version = "0.5.2"; + sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show @@ -6116,13 +6210,13 @@ self: { sha256 = "14shcs5wfkf4q473hsdgh7ky1fsrb59nf0g2ff4viyw1diyakw7x"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory random wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6138,6 +6232,7 @@ self: { sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring cabal-macosx containers deepseq directory errors filepath hslogger json mtl old-locale ordered parsec process @@ -6292,6 +6387,7 @@ self: { pname = "GeocoderOpenCage"; version = "0.1.0.1"; sha256 = "1c5sww3lvwkijsxg37zj77rxx021wlwjwsadiknvci9xlzccnw5b"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring HTTP text ]; homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git"; description = "Geocoder and Reverse Geocoding Service Wrapper"; @@ -6356,6 +6452,7 @@ self: { sha256 = "030p4ihh3zdjy0f687ffpnsf1zjb7mhwih47718fj2pawi4hkksi"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process temporary text ]; @@ -6381,29 +6478,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.7.14"; - sha256 = "0aw43izg8vlvjl40ms6k92w7gxg7n3l6smdvzla47fp82s4vhdr8"; - 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_8_0" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6424,7 +6498,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -6545,7 +6618,6 @@ self: { ]; description = "Interface to Google Suggest API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleTranslate" = callPackage @@ -6687,7 +6759,6 @@ self: { ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Grempa" = callPackage @@ -6865,7 +6936,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HARM" = callPackage @@ -6994,6 +7064,7 @@ self: { sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; executableHaskellDepends = [ base containers mtl QuickCheck random @@ -7055,6 +7126,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HDBC_2_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, convertible, mtl + , old-time, text, time, utf8-string + }: + mkDerivation { + pname = "HDBC"; + version = "2.4.0.2"; + sha256 = "0nnvfyivmw5pykbna953yb6z4al1ak5vsd308lpsyv2bczymf1v7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers convertible mtl old-time text time + utf8-string + ]; + homepage = "https://github.com/hdbc/hdbc"; + description = "Haskell Database Connectivity"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HDBC-mysql" = callPackage ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient , openssl, time, utf8-string, zlib @@ -7098,8 +7189,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.4"; - sha256 = "1zb8q44rvyykd6yfsmiqm9bl7fv1dks4383jh8z7gz1fvy18963i"; + version = "2.3.2.5"; + sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7130,8 +7221,8 @@ self: { ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; - version = "0.1.1.0"; - sha256 = "1fc0zi9i3cba0rn6q8ibn1kdij7glm73qkzc97qg5f0pkmn7mlsa"; + version = "0.1.1.1"; + sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15"; libraryHaskellDepends = [ base HDBC ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; @@ -7193,6 +7284,7 @@ self: { sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html blaze-markup MissingH mtl process random shakespeare template-haskell text uuid @@ -7811,6 +7903,7 @@ self: { pname = "HList"; version = "0.4.2.0"; sha256 = "15bpglqj33n4y68mg8l2g0rllrcisg2f94wsl3n7rpy43md596fd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors tagged template-haskell @@ -7877,6 +7970,7 @@ self: { pname = "HMap"; version = "1.2.7"; sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default hashable mtl unordered-containers ]; @@ -7914,6 +8008,7 @@ self: { sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory glib gtk haskell98 mtl process regex-posix unix @@ -8057,6 +8152,7 @@ self: { sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base data-accessor data-accessor-template GLFW OpenGL ]; @@ -8193,6 +8289,7 @@ self: { sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory haskell98 ]; homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/"; description = "Haskell raytracer"; @@ -8260,7 +8357,6 @@ self: { homepage = "http://software.complete.org/hsh"; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSHHelpers" = callPackage @@ -8315,6 +8411,7 @@ self: { pname = "HSmarty"; version = "0.2.0.3"; sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec attoparsec-expr base HTTP mtl scientific text unordered-containers vector @@ -8401,8 +8498,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "HSvm"; - version = "0.1.0.2.89"; - sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9"; + version = "0.1.0.3.22"; + sha256 = "015b1l2grjx79rvn17nmjnzdc5zh30v30f21svr7a9kn7ic8mb4d"; libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; license = stdenv.lib.licenses.bsd3; @@ -8419,8 +8516,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.13.1.0"; - sha256 = "0iz81pmc5prl0643jg53ywa65h7s16blchpvasnvfvvn47p6kd0w"; + version = "0.13.2.2"; + sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8488,6 +8585,7 @@ self: { sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs containers deepseq hylolib mtl strict ]; @@ -8506,6 +8604,7 @@ self: { sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base mtl random SDL SDL-image SDL-ttf ]; @@ -8575,7 +8674,6 @@ self: { homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-approx" = callPackage @@ -8629,6 +8727,7 @@ self: { pname = "HXQ"; version = "0.20.1"; sha256 = "1ba3b7a91h1qc5g9g9cw591mvsp711myijpzxr4c1wg6yapqbhxp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base haskeline HTTP mtl regex-base regex-compat template-haskell @@ -8647,6 +8746,7 @@ self: { sha256 = "1mvxzcq42h823gq025w86z03jigk271fj20r7yfjydj7yvn24kjv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base HUnit mtl QuickCheck ]; homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html"; description = "HaLeX enables modelling, manipulation and visualization of regular languages"; @@ -8680,43 +8780,6 @@ self: { }) {}; "HaRe" = 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, ghc-syb-utils - , gitrev, hslogger, hspec, HUnit, monad-control, mtl - , optparse-applicative, optparse-simple, parsec - , Strafunski-StrategyLib, syb, syz, turtle - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.4.0"; - sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk"; - revision = "2"; - editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cabal-helper containers directory filepath ghc ghc-exactprint - ghc-mod ghc-syb-utils hslogger monad-control mtl - Strafunski-StrategyLib syb syz - ]; - executableHaskellDepends = [ - base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple - ]; - testHaskellDepends = [ - attoparsec base base-prelude case-insensitive containers conversion - conversion-case-insensitive conversion-text Diff directory foldl - ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl - parsec turtle - ]; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "HaRe_0_8_4_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, Cabal , cabal-helper, case-insensitive, containers, conversion , conversion-case-insensitive, conversion-text, Diff, directory @@ -8731,6 +8794,7 @@ self: { sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cabal-helper containers directory filepath ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger monad-control mtl @@ -8752,20 +8816,20 @@ self: { }) {}; "HaTeX" = callPackage - ({ mkDerivation, base, bytestring, containers, matrix, parsec - , QuickCheck, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, base, bytestring, containers, hashable, matrix + , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers , wl-pprint-extras }: mkDerivation { pname = "HaTeX"; - version = "3.17.2.0"; - sha256 = "14bbxhipxd18h0dpmbc1m7wggg1bqzz0cjr7l27xks2k35ccllw5"; + version = "3.17.3.1"; + sha256 = "1vq22yf90cxq6a224zw73c1iqqbcsa2swasds605y9kwp9wzf6db"; libraryHaskellDepends = [ - base bytestring containers matrix parsec QuickCheck text + base bytestring containers hashable matrix parsec QuickCheck text transformers wl-pprint-extras ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck text + base parsec QuickCheck tasty tasty-quickcheck text ]; homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; description = "The Haskell LaTeX library"; @@ -8927,10 +8991,12 @@ self: { sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers HTTP hxt hxt-http mtl network network-uri parsec transformers ]; + executableHaskellDepends = [ base hxt ]; testHaskellDepends = [ base hspec hxt ]; homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; @@ -8955,28 +9021,24 @@ self: { "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff - , directory, filepath, ghc-prim, HarmTrace-Base, HCodecs, hmatrix - , hmatrix-gsl-stats, instant-generics, ListLike, mtl, parallel - , parseargs, process, sox, template-haskell, uu-parsinglib, vector + , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics + , ListLike, matrix, mtl, parallel, process, sox, template-haskell + , uu-parsinglib, vector }: mkDerivation { pname = "HarmTrace"; - version = "2.2.0"; - sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v"; - isLibrary = true; + version = "2.2.1"; + sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj"; + revision = "1"; + editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - array base binary deepseq Diff directory filepath ghc-prim - HarmTrace-Base HCodecs hmatrix hmatrix-gsl-stats instant-generics - ListLike mtl parallel parseargs process template-haskell - uu-parsinglib vector - ]; executableHaskellDepends = [ array base binary cmdargs deepseq Diff directory filepath ghc-prim - HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike - mtl parallel process sox template-haskell uu-parsinglib vector + HarmTrace-Base instant-generics ListLike matrix mtl parallel + process sox template-haskell uu-parsinglib vector ]; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace"; + homepage = "https://github.com/haas/harmtrace"; description = "Harmony Analysis and Retrieval of Music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9029,6 +9091,7 @@ self: { pname = "HasGP"; version = "0.1"; sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 hmatrix hmatrix-special mtl parsec random ]; @@ -9048,6 +9111,7 @@ self: { sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base list-tries monad-loops mtl numbers parsec ]; @@ -9084,6 +9148,7 @@ self: { pname = "HaskRel"; version = "0.1.0.2"; sha256 = "19q7x459g9s6g7kd9bmhh8lj2khbbmaafmcmm3ggrf4ijxmh5kp7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory ghc-prim HList tagged ]; @@ -9151,8 +9216,9 @@ self: { }: mkDerivation { pname = "HaskellNet-SSL"; - version = "0.3.3.0"; - sha256 = "1x6miw5ph4qndsy345yym209r5lxsjsmmgyap6x1xjwxjcmlcz8p"; + version = "0.3.4.0"; + sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring connection data-default HaskellNet network tls ]; @@ -9173,6 +9239,7 @@ self: { sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cereal cml containers directory hopenssl hslogger HTTP HUnit mtl network parsec pretty QuickCheck random @@ -9224,8 +9291,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.0.2"; - sha256 = "1w55kiqbg1qz402xiydkj71h9qqz4fd40xa702ai18047a84s7pf"; + version = "0.1.0"; + sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -9331,6 +9398,7 @@ self: { sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base editline mtl parsec pretty process QuickCheck regex-posix ]; @@ -9350,6 +9418,7 @@ self: { pname = "HerbiePlugin"; version = "0.2.0.0"; sha256 = "1vrlx1b85fvdcbcjn2mfhkznvvqag3pxhvkqsk80pyqiwf8xfgw7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq directory ghc mtl process split sqlite-simple template-haskell text @@ -9431,6 +9500,19 @@ self: { license = "unknown"; }) {}; + "Hipmunk-Utils" = callPackage + ({ mkDerivation, base, Hipmunk, linear, StateVar }: + mkDerivation { + pname = "Hipmunk-Utils"; + version = "0.1.0.0"; + sha256 = "0bybsm350fkqiwsmyd0x4ck4jrnzs1i0cdvww70dcbd2m4r099mm"; + libraryHaskellDepends = [ base Hipmunk linear StateVar ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme"; + description = "Useful functions for Hipmunk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HipmunkPlayground" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, OpenGL, StateVar , transformers @@ -9510,6 +9592,7 @@ self: { sha256 = "1nsiqcwx9xiz3774c0kv036v8pz53jzl9pfxyhm6ci8ag83za245"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cereal containers directory filepath FPretty libgraph mtl process RBTree regex-posix template-haskell @@ -9692,6 +9775,7 @@ self: { sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath ghc haskell-src-exts old-locale random syb time @@ -9727,14 +9811,15 @@ self: { }: mkDerivation { pname = "HsHTSLib"; - version = "1.3.2.0"; - sha256 = "0mambd3iimll6v2wv616qdai31r4kcj12401afq148h47fq2qk6m"; + version = "1.3.2.2"; + sha256 = "0i4lflc8s8byvsc4idh4fm6yzdspx0v4mahwrqrk7i2dbs84fpkw"; libraryHaskellDepends = [ base bytestring bytestring-lexing conduit-combinators containers inline-c mtl template-haskell ]; description = "High level bindings to htslib"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsHaruPDF" = callPackage @@ -9773,6 +9858,7 @@ self: { pname = "HsJudy"; version = "0.2"; sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ Judy ]; homepage = "http://www.pugscode.org/"; @@ -9787,8 +9873,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.9"; - sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za"; + version = "0.11.4.11"; + sha256 = "0dgywjkvzxwpr33l642cw8v2gqn3s8kclg97xs1w8a5pqcg647pp"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring integer-gmp network time @@ -9798,7 +9884,6 @@ self: { homepage = "https://github.com/vshabanov/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -9811,7 +9896,6 @@ self: { homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsParrot" = callPackage @@ -9820,6 +9904,7 @@ self: { pname = "HsParrot"; version = "0.0.2.20150805"; sha256 = "0d1xkfl5zbr2q60igl9092lr6zgh1jq10c0b7yd6i0jxs66d767a"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring HsSyck pretty pugs-DrIFT ]; @@ -9858,6 +9943,7 @@ self: { pname = "HsSyck"; version = "0.53"; sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring hashtables syb utf8-string ]; @@ -9888,6 +9974,7 @@ self: { sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cmdargs data-accessor data-accessor-template data-accessor-transformers directory filepath Glob @@ -9982,6 +10069,7 @@ self: { sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary directory HFitUI MissingH shakespeare yaml ]; @@ -10032,6 +10120,7 @@ self: { sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory haskell98 HaXml polyparse pretty process wx wxcore @@ -10048,6 +10137,7 @@ self: { pname = "IOR"; version = "0.1"; sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; description = "Region based resource management for the IO monad"; license = stdenv.lib.licenses.bsd3; @@ -10084,27 +10174,6 @@ self: { }) {}; "IPv6Addr" = callPackage - ({ mkDerivation, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; - version = "0.6.3"; - sha256 = "00hf8ypildbjmrhh010z4rarggq75m10pnmg1ilbwz1flwb767fm"; - revision = "1"; - editedCabalFile = "11dvmn6l2sicxmiy7hg0a7msi022gpzzaiyliclkdcnifs75lhjm"; - libraryHaskellDepends = [ - attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_1_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network , network-info, random, test-framework, test-framework-hunit, text }: @@ -10121,7 +10190,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IPv6DB" = callPackage @@ -10154,6 +10222,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "IPv6DB_0_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger + , hedis, hspec, http-client, http-types, IPv6Addr, mtl + , optparse-applicative, text, unordered-containers, vector, wai + , wai-logger, warp + }: + mkDerivation { + pname = "IPv6DB"; + version = "0.2.2"; + sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring fast-logger hedis http-types IPv6Addr mtl + optparse-applicative text unordered-containers vector wai + wai-logger warp + ]; + testHaskellDepends = [ + aeson base hspec http-client http-types vector + ]; + homepage = "http://ipv6db.cybervisible.com"; + description = "A RESTful Web Service for IPv6-related data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10392,6 +10490,10 @@ self: { attoparsec base bytestring bytestring-nums bytestring-trie containers utf8-string ]; + executableHaskellDepends = [ + attoparsec base bytestring bytestring-nums bytestring-trie + containers utf8-string + ]; homepage = "http://github.com/solidsnack/JSONb/"; description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; @@ -10485,6 +10587,7 @@ self: { sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath mtl parsec pretty syb WebBits WebBits-Html @@ -10538,6 +10641,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels_3_2_8_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.8.3"; + sha256 = "1g4cjldlncll6snykgm4qwkryqq66m5a3a5jrxq79nzfizvwsl4c"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -10552,21 +10673,6 @@ self: { }) {}; "JuicyPixels-extra" = callPackage - ({ mkDerivation, base, criterion, hspec, JuicyPixels }: - mkDerivation { - pname = "JuicyPixels-extra"; - version = "0.1.1"; - sha256 = "1zdrh95b51566m2dh79vv92vivv2i4pknlimhd78mqc0fxz2ayyk"; - libraryHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base hspec JuicyPixels ]; - benchmarkHaskellDepends = [ base criterion JuicyPixels ]; - homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; - description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "JuicyPixels-extra_0_2_1" = callPackage ({ mkDerivation, base, criterion, hspec, JuicyPixels }: mkDerivation { pname = "JuicyPixels-extra"; @@ -10574,13 +10680,13 @@ self: { sha256 = "0lai831n9iak96l854fynpa1bf41rq8mg45397zjg0p25w0i1dka"; revision = "1"; editedCabalFile = "0f42a7jirsk3ciyd081wcb2pkss34yzfwhaiaclgf17yiav4zzv0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; benchmarkHaskellDepends = [ base criterion JuicyPixels ]; homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -10594,7 +10700,6 @@ self: { ]; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-scale-dct" = callPackage @@ -10604,6 +10709,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; + revision = "1"; + editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -10767,6 +10874,7 @@ self: { sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers curry-frontend directory filepath network old-time process random syb unix @@ -10792,6 +10900,7 @@ self: { sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath haskell98 KiCS mtl readline syb ]; @@ -10812,6 +10921,7 @@ self: { sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath KiCS ]; executableHaskellDepends = [ base KiCS ]; homepage = "http://curry-language.org"; @@ -10911,7 +11021,7 @@ self: { }) {inherit (pkgs) openblasCompat;}; "LDAP" = callPackage - ({ mkDerivation, base, HUnit, lber, openldap }: + ({ mkDerivation, base, HUnit, openldap }: mkDerivation { pname = "LDAP"; version = "0.6.11"; @@ -10919,14 +11029,15 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ lber openldap ]; + librarySystemDepends = [ openldap ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; - testSystemDepends = [ lber openldap ]; + testSystemDepends = [ openldap ]; homepage = "https://github.com/ezyang/ldap-haskell"; description = "Haskell binding for C LDAP API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {lber = null; inherit (pkgs) openldap;}; + }) {inherit (pkgs) openldap;}; "LRU" = callPackage ({ mkDerivation, base, containers, QuickCheck }: @@ -10998,6 +11109,7 @@ self: { sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc"; 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 @@ -11034,6 +11146,7 @@ self: { sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers GLFW GLFW-task monad-task mtl OpenGL transformers vector @@ -11183,17 +11296,20 @@ self: { }) {}; "Lazy-Pbkdf2" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , cryptonite, memory + ({ mkDerivation, base, base16-bytestring, binary, byteable + , bytestring, criterion, cryptonite, memory }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "2.1.2"; - sha256 = "18x1md6ljxksqfp2336bk8l7fhw2rgafa0kqg8x1lskml9xkjfca"; + version = "3.0.0"; + sha256 = "0rcbsjypr4k5s8jsw1wchl9y3v7b9nvy92046hvzah69rd2hcqj1"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory ]; + benchmarkHaskellDepends = [ + base binary byteable bytestring criterion cryptonite memory + ]; description = "Lazy PBKDF2 generator"; license = stdenv.lib.licenses.mit; }) {}; @@ -11289,6 +11405,7 @@ self: { pname = "LinearSplit"; version = "0.2.1"; sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base cmdargs haskell98 QuickCheck ]; @@ -11324,7 +11441,6 @@ self: { homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LinkChecker" = callPackage @@ -11392,7 +11508,6 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListWriter" = callPackage @@ -11456,6 +11571,9 @@ self: { mtl multiset old-locale operational prefix-units pretty PSQueue sequential-index split stm time transformers void yjtools ]; + executableHaskellDepends = [ + base cereal cmdtheline containers transformers + ]; testHaskellDepends = [ base bytestring cereal composition containers data-ivar directory hslogger hslogger-template HUnit lens MonadCatchIO-transformers @@ -11486,6 +11604,9 @@ self: { MonadCatchIO-transformers stm transformers ]; librarySystemDepends = [ openmpi ]; + executableHaskellDepends = [ + base cereal cmdtheline hslogger LogicGrowsOnTrees + ]; executableSystemDepends = [ openmpi ]; description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; @@ -11509,6 +11630,9 @@ self: { hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers mtl network pretty transformers ]; + executableHaskellDepends = [ + base cereal cmdtheline LogicGrowsOnTrees + ]; testHaskellDepends = [ base hslogger hslogger-template HUnit LogicGrowsOnTrees network random stm test-framework test-framework-hunit transformers @@ -11535,6 +11659,9 @@ self: { hslogger hslogger-template LogicGrowsOnTrees MonadCatchIO-transformers process transformers ]; + executableHaskellDepends = [ + base cereal cmdtheline LogicGrowsOnTrees + ]; testHaskellDepends = [ base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees random test-framework test-framework-hunit transformers @@ -11641,7 +11768,6 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -11738,10 +11864,11 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.6.1"; - sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz"; + version = "0.9.6.7"; + sha256 = "0cl0lq45x8pxsbdiqg9sx39jvs8h2h32mni5zq2jb61ac7wim9g1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory ghc ghc-paths hashable haskell-src html mtl network network-uri pretty random syb @@ -11756,7 +11883,6 @@ 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 @@ -11827,6 +11953,7 @@ self: { sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory filepath HUnit mtl old-locale pretty random regex-posix time @@ -11890,11 +12017,12 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.7"; - sha256 = "0whnqibl1has9s3dnkf4l5aimma8flxl7b2467fq5scl2gf07ayd"; + version = "0.6.8"; + sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; @@ -12003,6 +12131,7 @@ self: { sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers haskell-src-exts mtl pretty ]; @@ -12210,6 +12339,7 @@ self: { sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base parsec template-haskell ]; executableHaskellDepends = [ base haskell98 process ]; homepage = "http://monadgarden.cs.missouri.edu/MonadLab"; @@ -12253,7 +12383,6 @@ self: { libraryHaskellDepends = [ base MonadRandom mtl random ]; description = "Lazy monad for psuedo random-number generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadStack" = callPackage @@ -12277,6 +12406,7 @@ self: { sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory GLUT OpenGL ]; homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html"; description = "2-D arcade scroller"; @@ -12294,6 +12424,7 @@ self: { sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory free free-game mtl ]; @@ -12461,28 +12592,6 @@ self: { }) {}; "MusicBrainz" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , HTTP, http-conduit, http-types, monad-control, resourcet, text - , time, time-locale-compat, transformers, vector, xml-conduit - , xml-types - }: - mkDerivation { - pname = "MusicBrainz"; - version = "0.2.4"; - sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj"; - revision = "1"; - editedCabalFile = "1bnj0wq9q6y2pxjnl1rk5ybdj16g17g7qkzrfnjrwmm7iq8xbm62"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra HTTP http-conduit - http-types monad-control resourcet text time time-locale-compat - transformers vector xml-conduit xml-types - ]; - homepage = "http://floss.scru.org/hMusicBrainz"; - description = "interface to MusicBrainz XML2 web service"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "MusicBrainz_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , HTTP, http-conduit, http-types, monad-control, resourcet, text , time, time-locale-compat, transformers, vector, xml-conduit @@ -12502,7 +12611,6 @@ self: { homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 web service"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -12711,11 +12819,10 @@ self: { homepage = "https://github.com/choener/NaturalLanguageAlphabets"; description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NaturalSort" = callPackage - ({ mkDerivation, base, bytestring, strict }: + ({ mkDerivation, base, bytestring, QuickCheck, strict }: mkDerivation { pname = "NaturalSort"; version = "0.2.1"; @@ -12723,6 +12830,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring strict ]; + executableHaskellDepends = [ base bytestring QuickCheck strict ]; homepage = "http://github.com/joachifm/natsort"; description = "Natural sorting for strings"; license = stdenv.lib.licenses.bsd3; @@ -12863,6 +12971,7 @@ self: { sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary bytestring containers filepath gloss network networked-game random @@ -12873,6 +12982,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NoHoed" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "NoHoed"; + version = "0.1.0"; + sha256 = "1xrdd45rr0b1zi8ig5wjig1dyh2x1va84gqglf10yb5r0x4rzm93"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/pepeiborra/NoHoed"; + description = "Placeholder package to preserve debug ability via conditional builds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "NoSlow" = callPackage ({ mkDerivation, array, base, containers, criterion, dph-base , dph-prim-seq, statistics, storablevector, template-haskell @@ -12952,6 +13073,7 @@ self: { pname = "Nomyx-Core"; version = "0.7.6"; sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -12975,6 +13097,7 @@ self: { pname = "Nomyx-Language"; version = "0.7.6"; sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -12994,6 +13117,7 @@ self: { pname = "Nomyx-Rules"; version = "0.1.0"; sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ghc hint-server hslogger mtl old-locale safe stm time time-recurrence @@ -13015,6 +13139,7 @@ self: { pname = "Nomyx-Web"; version = "0.7.6"; sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -13309,6 +13434,7 @@ self: { sha256 = "061j03ld96zkx1pfg7caxkyknj91b3maijx52610zmc9kfcjg5jd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base brick bytestring conduit conduit-extra containers control-monad-loop data-default itemfield listsafe microlens mtl @@ -13370,7 +13496,6 @@ self: { homepage = "https://github.com/audreyt/openafp/"; description = "IBM AFP document format parser and generator"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAFP-Utils" = callPackage @@ -13391,7 +13516,6 @@ self: { ]; description = "Assorted utilities to work with AFP data streams"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAL" = callPackage @@ -13408,6 +13532,7 @@ self: { base ObjectName OpenGL StateVar transformers ]; librarySystemDepends = [ openal ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; @@ -13492,8 +13617,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.2.4.0"; - sha256 = "0bnbgmf4jxz1vr7a2yjh3nqylsaqsnv2qnnv63gmydvbx45r3yg3"; + version = "3.2.5.0"; + sha256 = "1drxviqsx25isrxdq5f5gr5hrpfpbqcs7pj632qibmvpaqp4s3xg"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13761,6 +13886,7 @@ self: { sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers mtl network network-uri xml ]; @@ -13845,6 +13971,7 @@ self: { sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ Agda base containers directory filepath mtl pandoc pandoc-types QuickCheck text time xhtml @@ -14095,7 +14222,6 @@ self: { homepage = "https://github.com/MedeaMelana/Piso"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlayHangmanGame" = callPackage @@ -14108,6 +14234,7 @@ self: { sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory mtl random regex-compat ]; @@ -14148,6 +14275,7 @@ self: { data-default-class generic-accessors glib gtk3 lens text time transformers vector ]; + executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14162,6 +14290,7 @@ self: { sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory filepath haskell98 old-locale old-time parsec process random @@ -14261,7 +14390,6 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -14379,6 +14507,7 @@ self: { sha256 = "0w7x4zgz00wzchqdhajpf1ir3h0jxw1vgh030g384k1qbbjv4la2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring containers control-timeout directory filepath FindBin hashable hashtables haskeline HsParrot HsSyck @@ -14480,7 +14609,6 @@ 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 @@ -14638,15 +14766,14 @@ self: { homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-safe" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.2"; - sha256 = "1y7qa29wxjkfjlx360k5s85gnppmz2qqdl9pfm49klq010k42vib"; + version = "0.1.0.3"; + sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f"; libraryHaskellDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -14675,6 +14802,7 @@ self: { sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring haskell-src-meta parsec scientific snap snap-core template-haskell text vector websockets @@ -14943,7 +15071,6 @@ self: { ]; description = "Unsupervized construction of RNA family models"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RNAwolf" = callPackage @@ -14969,26 +15096,6 @@ self: { }) {}; "RSA" = callPackage - ({ mkDerivation, base, binary, bytestring, crypto-api - , crypto-pubkey-types, DRBG, pureMD5, QuickCheck, SHA, tagged - , test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "RSA"; - version = "2.2.0"; - sha256 = "1mzjlkw9i9r7r5a7mja01pq3ihvik2ncgah1jmznswaj6ga5cc19"; - libraryHaskellDepends = [ - base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA - ]; - testHaskellDepends = [ - base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5 - QuickCheck SHA tagged test-framework test-framework-quickcheck2 - ]; - description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "RSA_2_3_0" = callPackage ({ mkDerivation, base, binary, bytestring, crypto-api , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged , test-framework, test-framework-quickcheck2 @@ -15006,7 +15113,6 @@ self: { ]; description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Raincat" = callPackage @@ -15019,6 +15125,7 @@ self: { sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers extensible-exceptions GLUT mtl OpenGL random sdl2 sdl2-image sdl2-mixer time @@ -15107,6 +15214,7 @@ self: { sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base HTTP json network utf8-string XMPP ]; @@ -15127,6 +15235,7 @@ self: { sha256 = "1wk4bylydfdqdmzjybkpbmvp4znp9i26mvkl2541gp5vwv7blms6"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring cereal containers convertible directory filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa @@ -15168,7 +15277,6 @@ self: { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Redmine" = callPackage @@ -15193,7 +15301,6 @@ self: { homepage = "https://github.com/lookunder/RedmineHs"; description = "Library to access Redmine's REST services"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ref" = callPackage @@ -15317,6 +15424,7 @@ self: { pname = "Rlang-QQ"; version = "0.3.1.0"; sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring Cabal containers data-binary-ieee754 directory filepath haskell-src-meta HList lens mtl process repa SHA @@ -15432,6 +15540,7 @@ self: { sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; revision = "1"; editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; @@ -15444,6 +15553,7 @@ self: { pname = "SDL-gfx"; version = "0.6.0.2"; sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; @@ -15458,6 +15568,7 @@ self: { sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281"; revision = "1"; editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -15472,6 +15583,7 @@ self: { sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r"; revision = "1"; editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -15484,6 +15596,7 @@ self: { pname = "SDL-mpeg"; version = "0.0.1"; sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; @@ -15496,6 +15609,7 @@ self: { pname = "SDL-ttf"; version = "0.6.2.2"; sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -15602,8 +15716,8 @@ self: { }) {}; "SHA" = callPackage - ({ mkDerivation, array, base, binary, bytestring, QuickCheck - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, array, base, binary, bytestring, directory + , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "SHA"; @@ -15612,6 +15726,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring ]; + executableHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ array base binary bytestring QuickCheck test-framework test-framework-quickcheck2 @@ -15683,6 +15798,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SSTG" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-paths }: + mkDerivation { + pname = "SSTG"; + version = "0.1.1.7"; + sha256 = "1qgkqd025cd9q0la36i45kd356n8sxnzgnq40v71sdbv8f7wb4yh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ghc ghc-paths ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers ]; + homepage = "https://github.com/AntonXue/SSTG#readme"; + description = "STG Symbolic Execution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "STL" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, text }: mkDerivation { @@ -15738,6 +15869,7 @@ self: { pname = "SVGFonts"; version = "1.6.0.1"; sha256 = "1w6hh8anpb0psilzbp4k80rbavdmkmb5rn34x9m2s72rz0jfy9zp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal cereal-vector containers data-default-class diagrams-core @@ -15747,6 +15879,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SVGFonts_1_6_0_2" = callPackage + ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg + , bytestring, cereal, cereal-vector, containers, data-default-class + , diagrams-core, diagrams-lib, directory, parsec, split, text + , tuple, vector, xml + }: + mkDerivation { + pname = "SVGFonts"; + version = "1.6.0.2"; + sha256 = "07rimlhsvb5j77rkp1zw9567lbc0bq6172mzsm3yb4zw6x9aplaa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-markup blaze-svg bytestring cereal + cereal-vector containers data-default-class diagrams-core + diagrams-lib directory parsec split text tuple vector xml + ]; + description = "Fonts from the SVG-Font format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SVGPath" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -15861,20 +16014,23 @@ self: { }) {}; "SciFlow" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, directory - , exceptions, executable-path, fgl, graphviz, lens, lifted-async - , mtl, optparse-applicative, rainbow, shelly, split, sqlite-simple - , template-haskell, text, th-lift, transformers, yaml + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text + , containers, data-default-class, directory, exceptions + , executable-path, fgl, graphviz, lens, lifted-async, mtl, network + , optparse-applicative, rainbow, split, sqlite-simple + , template-haskell, temporary, text, th-lift, th-lift-instances + , time, transformers, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.5.3.1"; - sha256 = "1w6vdzbcznfkncad1qpigx89r5a469ryszapcvm4bcjpgq20i14d"; + version = "0.6.0"; + sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb"; libraryHaskellDepends = [ - base bytestring cereal containers directory exceptions - executable-path fgl graphviz lens lifted-async mtl - optparse-applicative rainbow shelly split sqlite-simple - template-haskell text th-lift transformers yaml + aeson base bytestring cereal cereal-text containers + data-default-class directory exceptions executable-path fgl + graphviz lens lifted-async mtl network optparse-applicative rainbow + split sqlite-simple template-haskell temporary text th-lift + th-lift-instances time transformers yaml ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; @@ -16290,6 +16446,7 @@ self: { sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers data-lens-light mtl ]; @@ -16407,6 +16564,7 @@ self: { sha256 = "12dpvm8lzp8gllyrf7yzpljpdr0jdk42zhi7zrnzvjzryv6w268j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-unicode-symbols binary derive directory mtl process random zlib @@ -16427,6 +16585,7 @@ self: { sha256 = "02j5ni8565ba7rvr6gw9z65qdfl7rd17586gqlkx2iz2v2bwkasf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-unicode-symbols binary GLUT OpenGL process random SoccerFun @@ -16499,7 +16658,6 @@ self: { homepage = "http://www.haskell.org/yampa/"; description = "Video game"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpacePrivateers" = callPackage @@ -16514,6 +16672,7 @@ self: { editedCabalFile = "1gv48zss4rw4z2n9grga090j1223ylzwi5pirqb0d1mdj9w617dm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers enummapset-th filepath LambdaHack template-haskell text @@ -16678,34 +16837,18 @@ 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 - ({ mkDerivation, base, blaze-builder, lucid, Spock, transformers }: - mkDerivation { - pname = "Spock-lucid"; - version = "0.3.0.0"; - sha256 = "0g3zf2gxcybh4kdz1vykk6drzb9jirdlfcx6cdx81wa5bl8ck4cj"; - libraryHaskellDepends = [ - base blaze-builder lucid Spock transformers - ]; - homepage = "http://github.com/aelve/Spock-lucid"; - description = "Lucid support for Spock"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spock-lucid_0_4_0_0" = callPackage ({ mkDerivation, base, lucid, Spock, transformers }: mkDerivation { pname = "Spock-lucid"; - version = "0.4.0.0"; - sha256 = "0v7jmfnmxmcqz8c490xb6wikb2rfb4zqjnjx8syw3mvdqpd1mjh9"; + version = "0.4.0.1"; + sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii"; libraryHaskellDepends = [ base lucid Spock transformers ]; 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 @@ -16829,7 +16972,6 @@ self: { ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -16871,6 +17013,7 @@ self: { sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory haskell-src mtl pretty process Strafunski-ATermLib Strafunski-StrategyLib template-haskell @@ -16886,6 +17029,8 @@ self: { pname = "Strafunski-StrategyLib"; version = "5.0.0.10"; sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih"; + revision = "1"; + editedCabalFile = "031p57vf33vdhwk1p4d1jzpk8fcl2js8kzdg7gyhz9g11vl2n4j9"; libraryHaskellDepends = [ base directory mtl syb transformers ]; description = "Library for strategic programming"; license = stdenv.lib.licenses.bsd3; @@ -16938,6 +17083,7 @@ self: { pname = "StrictBench"; version = "0.1.1"; sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base benchpress parallel ]; homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/"; description = "Benchmarking code through strict evaluation"; @@ -16954,7 +17100,6 @@ self: { libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SuffixStructures" = callPackage @@ -17028,6 +17173,7 @@ self: { pname = "Sysmon"; version = "0.1.2"; sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ConfigFile filepath fingertree Glob MissingH mtl old-locale pretty statistics template-haskell time vector @@ -17101,7 +17247,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TTTAS" = callPackage @@ -17229,6 +17374,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; + executableHaskellDepends = [ base mtl old-time ]; description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17253,8 +17399,8 @@ self: { }: mkDerivation { pname = "Taxonomy"; - version = "1.0.2"; - sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; + version = "1.0.3"; + sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; libraryHaskellDepends = [ aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; @@ -17282,6 +17428,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "TeX-my-math" = callPackage + ({ mkDerivation, base, decimal-literals, directory, dumb-cas + , filepath, hashable, haskell-src-meta, HaTeX, process + , template-haskell, text, unordered-containers, vector-space, void + }: + mkDerivation { + pname = "TeX-my-math"; + version = "0.201.0.0"; + sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4"; + libraryHaskellDepends = [ + base decimal-literals dumb-cas hashable haskell-src-meta HaTeX + template-haskell text unordered-containers vector-space void + ]; + testHaskellDepends = [ + base directory dumb-cas filepath haskell-src-meta HaTeX process + template-haskell text + ]; + homepage = "http://github.com/leftaroundabout/Symbolic-math-HaTeX"; + description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio."; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "TeaHS" = callPackage ({ mkDerivation, array, base, containers, mtl, SDL, SDL-image , SDL-mixer, SFont, Sprig @@ -17342,7 +17511,6 @@ 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 @@ -17438,7 +17606,6 @@ self: { libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TimePiece" = callPackage @@ -17451,6 +17618,7 @@ self: { sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers old-locale old-time random SDL SDL-gfx SDL-image SDL-ttf @@ -17709,6 +17877,7 @@ self: { sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers filepath random reactive-banana reactive-banana-sdl SDL SDL-ttf transformers @@ -17982,7 +18151,6 @@ self: { homepage = "http://github.com/grwlf/vkhs"; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Validation" = callPackage @@ -18069,6 +18237,7 @@ self: { sha256 = "1fig9zxxisd51v5vzcsapsp4qygikhwhpjzyagw7a3x6kv5qpipm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers matrix ]; description = "A solver for the WordBrain game"; license = stdenv.lib.licenses.mit; @@ -18092,7 +18261,6 @@ self: { homepage = "https://github.com/choener/ViennaRNA-bindings"; description = "ViennaRNA v2 bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ViennaRNAParser" = callPackage @@ -18112,25 +18280,29 @@ self: { }) {}; "Villefort" = callPackage - ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random - , scotty, split, text, time + ({ mkDerivation, base, bytestring, directory, filepath, FindBin + , HDBC, HDBC-sqlite3, mtl, process, random, scotty, split, strict + , text, time, transformers, unix }: mkDerivation { pname = "Villefort"; - version = "0.1.0.8"; - sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35"; + version = "0.1.1.5"; + sha256 = "1rp624kdrc8gx0zsxa5q68n458mdbjr0qf94s7dc7030rgvqs8l6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base FindBin HDBC HDBC-sqlite3 mtl random split time + base bytestring directory filepath FindBin HDBC HDBC-sqlite3 mtl + process random scotty split strict text time transformers unix ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 scotty split text time + base HDBC HDBC-sqlite3 random scotty split text time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base HDBC HDBC-sqlite3 ]; homepage = "https://github.com/Chrisr850/Villefort#readme"; description = "Villefort is a task manager and time tracker written in haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Vulkan" = callPackage @@ -18231,6 +18403,7 @@ self: { pname = "WXDiffCtrl"; version = "0.0.1"; sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers wx wxcore ]; homepage = "http://wewantarock.wordpress.com"; description = "WXDiffCtrl"; @@ -18328,6 +18501,7 @@ self: { pname = "WebBits-multiplate"; version = "0.0.0.1"; sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base multiplate multiplate-simplified transformers WebBits ]; @@ -18520,6 +18694,8 @@ self: { pname = "Win32-extras"; version = "0.2.0.1"; sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h"; + revision = "1"; + editedCabalFile = "0gxp1a5sk9jb7x1mvz5jk68n8npvh8b9nlqcw9s2dn4wlyicm4mp"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ imm32 msimg32 ]; homepage = "http://hub.darcs.net/shelarcy/Win32-extras/"; @@ -18550,6 +18726,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory Win32 ]; + executableHaskellDepends = [ base directory ]; description = "A binding to part of the Win32 library for file notification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18624,6 +18801,7 @@ self: { pname = "Wired"; version = "0.3"; sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base chalmers-lava2000 containers mtl QuickCheck ]; @@ -18881,7 +19059,6 @@ self: { homepage = "xy30.com"; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "XMMS" = callPackage @@ -18890,6 +19067,7 @@ self: { pname = "XMMS"; version = "0.1.1"; sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ xmmsclient xmmsclient-glib ]; homepage = "http://kawais.org.ua/XMMS/"; @@ -18906,6 +19084,7 @@ self: { pname = "XMPP"; version = "0.1.2"; sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 hsdns mtl network parsec random utf8-string ]; @@ -19005,6 +19184,7 @@ self: { sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base data-accessor-transformers fclabels monads-fd random SDL SDL-image SDL-mixer SDL-ttf transformers @@ -19046,6 +19226,7 @@ self: { sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-builder blaze-html bytestring case-insensitive clientsession conduit containers data-default directory filepath @@ -19101,6 +19282,22 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "Yampa_0_10_6_1" = callPackage + ({ mkDerivation, base, deepseq, hcwiid, random, SDL }: + mkDerivation { + pname = "Yampa"; + version = "0.10.6.1"; + sha256 = "108rn0hc5xqw8pmadaddgawxpsznhjg8kbn9m30lwz04hv2ivjrv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq random ]; + executableHaskellDepends = [ base deepseq hcwiid random SDL ]; + testHaskellDepends = [ base ]; + homepage = "http://www.haskell.org/haskellwiki/Yampa"; + description = "Library for programming hybrid systems"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -19113,6 +19310,8 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random vector-space ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/ony/Yampa-core"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; @@ -19128,13 +19327,13 @@ self: { sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers HCodecs Yampa ]; homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze"; description = "Software synthesizer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yocto" = callPackage @@ -19209,6 +19408,7 @@ self: { pname = "ZFS"; version = "0.0.2"; sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base CC-delcont containers mtl network unix ]; @@ -19226,6 +19426,7 @@ self: { sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base gtk mtl random ]; description = "A Z-machine interpreter"; license = stdenv.lib.licenses.bsd3; @@ -19297,6 +19498,7 @@ self: { sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base biofasta biopsl cmdargs containers directory process ]; @@ -19352,13 +19554,13 @@ self: { ]; librarySystemDepends = [ abc ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ aig base base-compat directory QuickCheck tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {abc = null;}; "abcnotation" = callPackage @@ -19519,26 +19721,6 @@ self: { }) {}; "accelerate" = callPackage - ({ mkDerivation, array, base, containers, fclabels, ghc-prim - , hashable, hashtables, pretty, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "accelerate"; - version = "0.15.1.0"; - sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv"; - revision = "1"; - editedCabalFile = "0dgzfcc2yjxqq5llvm19lak16ymsqghalm33y0calgp07fwkp1hj"; - libraryHaskellDepends = [ - array base containers fclabels ghc-prim hashable hashtables pretty - template-haskell unordered-containers - ]; - homepage = "https://github.com/AccelerateHS/accelerate/"; - description = "An embedded language for accelerated array processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "accelerate_1_0_0_0" = callPackage ({ mkDerivation, base, base-orphans, containers, deepseq, directory , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables , mtl, pretty, template-haskell, time, transformers, unique, unix @@ -19558,7 +19740,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 @@ -19591,6 +19772,8 @@ self: { pname = "accelerate-bignum"; version = "0.1.0.0"; sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w"; + revision = "1"; + editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -19651,6 +19834,7 @@ self: { sha256 = "10mnsl5bclqf1k9yjadxy4zsj6pm4qbsx2hkrrhkjxfvhcba3wcb"; revision = "3"; editedCabalFile = "04w0gy775lxjgvvg1mbyrz0xzbdrc0dzbygy4vi52j0y9lygb4vm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ accelerate array base binary bytestring containers cryptohash cuda directory fclabels filepath hashable hashtables language-c-quote @@ -19735,8 +19919,8 @@ self: { pname = "accelerate-fft"; version = "1.0.0.0"; sha256 = "1qw4ln9xamv86lvb7y5xfzs12br4jbszai17jlagffmc6rnlhjkq"; - revision = "1"; - editedCabalFile = "101gc2wjisilgs0mib8l31sy6m6w04c0jp0zzr20p5j1gr3qjlnd"; + revision = "2"; + editedCabalFile = "0vycxsl60rd87ypcbmfkj1sjl4bz60n5lj4bdv6p7f8qpa1hgya1"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base bytestring carray cuda cufft fft @@ -19820,13 +20004,14 @@ self: { pname = "accelerate-io"; version = "1.0.0.0"; sha256 = "0h5nr0n1cdch20ld7s7mchr7wciasac4rmf4w2z61a48nj2knayi"; + revision = "1"; + editedCabalFile = "0k8zwri66bsjiarmp0s4lvv67ja8ip8qg5kzhzw17n22m21ww0dq"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm" = callPackage @@ -20004,8 +20189,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.14.2"; - sha256 = "1h75xc2xrxy3hfphni4l4s0cij1qiw1kwk3n6g1f2w28rfxixp46"; + version = "0.14.3"; + sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -20014,7 +20199,7 @@ self: { benchmarkHaskellDepends = [ base criterion directory mtl random system-fileio system-filepath ]; - homepage = "http://acid-state.seize.it/"; + homepage = "https://github.com/acid-state/acid-state"; description = "Add ACID guarantees to any serializable Haskell data structure"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -20632,25 +20817,28 @@ self: { }) {}; "activehs" = callPackage - ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring - , cmdargs, containers, data-pprint, deepseq, dia-base - , dia-functions, directory, filepath, haskell-src-exts - , highlighting-kate, hint, hoogle, mtl, old-locale, old-time - , pandoc, process, pureMD5, QuickCheck, simple-reflect, snap-core - , snap-server, split, syb, text, time, utf8-string, xhtml + ({ mkDerivation, activehs-base, array, base, blaze-html + , blaze-markup, bytestring, cmdargs, containers, data-pprint + , deepseq, dia-base, dia-functions, directory, exceptions, filepath + , haskell-src-exts, highlighting-kate, hint, hoogle, mtl + , old-locale, old-time, pandoc, process, pureMD5, QuickCheck + , simple-reflect, snap-core, snap-server, split, syb, text, time + , utf8-string, xhtml }: mkDerivation { pname = "activehs"; - version = "0.3.1"; - sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc"; + version = "0.3.2"; + sha256 = "0n5bb5bdigf3b0016ljv5r3bki3fq6j5dv7csvkdq7pdvghzw3gp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - activehs-base array base blaze-html bytestring cmdargs containers - data-pprint deepseq dia-base dia-functions directory filepath - haskell-src-exts highlighting-kate hint hoogle mtl old-locale - old-time pandoc process pureMD5 QuickCheck simple-reflect snap-core - snap-server split syb text time utf8-string xhtml + activehs-base array base blaze-html blaze-markup bytestring cmdargs + containers data-pprint deepseq dia-base dia-functions directory + exceptions filepath haskell-src-exts highlighting-kate hint hoogle + mtl old-locale old-time pandoc process pureMD5 QuickCheck + simple-reflect snap-core snap-server split syb text time + utf8-string xhtml ]; description = "Haskell code presentation tool"; license = stdenv.lib.licenses.bsd3; @@ -20663,10 +20851,11 @@ self: { pname = "activehs-base"; version = "0.3.0.4"; sha256 = "0gmixyawdl0kk351k8n5g7k3cfxv1qlbish750kv5kip6xc1dmcj"; + revision = "1"; + editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd"; libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "activitystreams-aeson" = callPackage @@ -20690,6 +20879,7 @@ self: { pname = "actor"; version = "0.1.1"; sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 stm time ]; homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html"; description = "Actors with multi-headed receive clauses"; @@ -20704,8 +20894,10 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.3.3"; - sha256 = "0anvcw3zdslmbjra8h75s5fwcl7d1i79ydvdcd0vwz6m0cbqrf3j"; + version = "4.3.4"; + sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz"; + revision = "1"; + editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -20770,6 +20962,7 @@ self: { sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base case-insensitive containers directory filepath http-conduit MissingH mtl network network-uri old-locale parsec @@ -20996,31 +21189,32 @@ self: { "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, dlist - , generic-deriving, ghc-prim, hashable, hashable-time, HUnit - , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, time-locale-compat - , unordered-containers, vector + , 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.0.2.1"; - sha256 = "0rlhr225vb6apxw1m0jpnjpbcwb2ij30n6r41qyhd5lr1ax6z9p0"; + version = "1.1.2.0"; + sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"; revision = "1"; - editedCabalFile = "1wfplxb4bppx2bqxbwprl09w9h9bfwn4ak97g8nrdrm30xfqv16g"; + 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 vector + time-locale-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring - bytestring containers dlist generic-deriving ghc-prim hashable - hashable-time HUnit QuickCheck quickcheck-instances scientific - tagged template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time time-locale-compat - unordered-containers vector + 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"; @@ -21165,27 +21359,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-compat_0_3_7" = callPackage + "aeson-compat_0_3_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, 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 + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector }: mkDerivation { pname = "aeson-compat"; - version = "0.3.7"; - sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv"; + version = "0.3.7.1"; + sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring - containers exceptions hashable nats scientific semigroups tagged - text time time-locale-compat unordered-containers vector + containers exceptions hashable scientific 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 + containers exceptions hashable QuickCheck quickcheck-instances + scientific 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"; @@ -21193,7 +21387,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-diff" = callPackage + "aeson-diff_1_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, hlint, mtl , optparse-applicative, QuickCheck, quickcheck-instances @@ -21222,6 +21416,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-diff" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, doctest + , edit-distance-vector, filepath, Glob, hashable, hlint, mtl + , optparse-applicative, QuickCheck, quickcheck-instances + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-diff"; + version = "1.1.0.3"; + sha256 = "13fbb270zaljgimy6pnyy2n8iwcxnb2pgs9b55qr94k3jnrjnl0g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring edit-distance-vector hashable mtl scientific + text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest filepath Glob hlint + QuickCheck quickcheck-instances text unordered-containers vector + ]; + homepage = "https://github.com/thsutton/aeson-diff"; + description = "Extract and apply patches to JSON documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-extra" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat , bytestring, containers, exceptions, hashable, parsec @@ -21248,6 +21470,34 @@ self: { 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 + , 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.1.0"; + sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y"; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat + bytestring containers deepseq exceptions hashable parsec + recursion-schemes scientific template-haskell text these time + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -21266,7 +21516,6 @@ self: { homepage = "https://github.com/deviant-logic/aeson-filthy"; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flat" = callPackage @@ -21282,7 +21531,6 @@ self: { homepage = "https://github.com/seanhess/aeson-flat#readme"; description = "Tools for creating flat JSON serializations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flatten" = callPackage @@ -21300,6 +21548,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-flowtyped" = callPackage + ({ mkDerivation, aeson, base, containers, free, recursion-schemes + , reflection, scientific, tasty, tasty-hunit, text, time + , transformers, unordered-containers, vector, wl-pprint + }: + mkDerivation { + pname = "aeson-flowtyped"; + version = "0.9.1"; + sha256 = "0fp5a4r7nvwqsyq8f17afqpdw59n6sf0wj7z83rhq8n149673rsg"; + libraryHaskellDepends = [ + aeson base containers free recursion-schemes reflection scientific + text time transformers unordered-containers vector wl-pprint + ]; + testHaskellDepends = [ + aeson base containers recursion-schemes tasty tasty-hunit text + unordered-containers vector + ]; + homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme"; + description = "Create Flow type definitions from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-generic-compat" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -21331,7 +21602,6 @@ self: { ]; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage @@ -21531,6 +21801,7 @@ self: { sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h"; revision = "1"; editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -21733,6 +22004,7 @@ self: { pname = "afis"; version = "0.1.2"; sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring crypto-random cryptohash packer ]; @@ -21790,6 +22062,7 @@ self: { sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ Agda base cmdargs containers directory filepath HJavaScript mtl pandoc snap-core snap-server transformers utf8-string xhtml @@ -21818,7 +22091,6 @@ self: { homepage = "http://github.com/liamoc/agda-snippets#readme"; description = "Render just the Agda snippets of a literate Agda file to HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-snippets-hakyll" = callPackage @@ -21836,7 +22108,6 @@ self: { homepage = "https://github.com/liamoc/agda-snippets#readme"; description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agentx" = callPackage @@ -21856,6 +22127,11 @@ self: { fclabels mtl network pipes pipes-concurrency pipes-network safe snmp time transformers unix ]; + executableHaskellDepends = [ + base binary bitwise bytestring containers data-default Diff + fclabels mtl network pipes pipes-concurrency pipes-network safe + snmp time transformers unix + ]; description = "AgentX protocol for write SNMP subagents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -21930,6 +22206,7 @@ self: { pname = "air-spec"; version = "2013.7.1"; sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hspec text ]; homepage = "https://github.com/nfjinjing/air-spec"; description = "air spec helper"; @@ -22020,14 +22297,14 @@ self: { "aivika" = callPackage ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , random, vector + , mwc-random, random, vector }: mkDerivation { pname = "aivika"; - version = "5.1"; - sha256 = "1mmpqmcvsx3qygwm8iszhcdnafp09vbnnklkskd1qsg55nisp0ps"; + version = "5.2"; + sha256 = "19d9bshjf5sivgzcbb0yl00i1z1kq3jr6xr7gddikh9wl0flnp9r"; libraryHaskellDepends = [ - array base binary containers deepseq mtl random vector + array base binary containers deepseq mtl mwc-random random vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -22036,14 +22313,14 @@ self: { "aivika-branches" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , random + , mwc-random, random }: mkDerivation { pname = "aivika-branches"; - version = "0.2"; - sha256 = "0riavp8jvsxmlqxjljm0dsijvrc0vknhkrjgf9g501g5yypd6byy"; + version = "0.3"; + sha256 = "1xb7l92vhaccfx9n83x6viamnkxy97c6a3plcf7gllijzrc4i1pf"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl random + aivika aivika-transformers base containers mtl mwc-random random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library"; @@ -22052,20 +22329,21 @@ self: { "aivika-distributed" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, binary - , containers, distributed-process, exceptions, mtl, random, stm - , time + , containers, distributed-process, exceptions, mtl, mwc-random + , random, stm, time }: mkDerivation { pname = "aivika-distributed"; - version = "0.5"; - sha256 = "0ghsnq1a9jfrdgaf4gqplka53ywnr8jbabz4ikdzvrh80nnf3gpc"; + version = "0.7"; + sha256 = "0f1vb7948p7xn1x4ayzjpr222349bp70wsix384nhwsrksk2fiwp"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers - distributed-process exceptions mtl random stm time + distributed-process exceptions mtl mwc-random random stm time ]; 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 @@ -22136,16 +22414,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aivika-gpss" = callPackage + ({ mkDerivation, aivika, aivika-transformers, base, containers + , hashable, mtl, unordered-containers + }: + mkDerivation { + pname = "aivika-gpss"; + version = "0.3"; + sha256 = "00pmkhyyk12di9kc1z9zsab44sprra9j5l0byb0h74526jrrcq2b"; + libraryHaskellDepends = [ + aivika aivika-transformers base containers hashable mtl + unordered-containers + ]; + homepage = "http://www.aivikasoft.com"; + description = "GPSS-like DSL for Aivika"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aivika-lattice" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , random + , mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.2"; - sha256 = "0bd3xwga4cq2qibywq20rnl7fhhxs7ax1dl13ylcaxbg0sxyd0cj"; + version = "0.3"; + sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl random + aivika aivika-transformers base containers mtl mwc-random random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -22154,15 +22449,15 @@ self: { "aivika-realtime" = callPackage ({ mkDerivation, aivika, aivika-transformers, async, base - , containers, mtl, random, stm, time + , containers, mtl, mwc-random, random, stm, time, vector }: mkDerivation { pname = "aivika-realtime"; - version = "0.2"; - sha256 = "0dbbhf55w1i2wfr8lw3y5k2a51kw3223gnfhbamzz2283g5n80pg"; + version = "0.3"; + sha256 = "1qprmkklyna16n56zxkaryy0fawvc9mjws0mcw87bcl56m18npcm"; libraryHaskellDepends = [ - aivika aivika-transformers async base containers mtl random stm - time + aivika aivika-transformers async base containers mtl mwc-random + random stm time vector ]; homepage = "http://www.aivikasoft.com"; description = "Soft real-time simulation module for the Aivika library"; @@ -22170,15 +22465,15 @@ self: { }) {}; "aivika-transformers" = callPackage - ({ mkDerivation, aivika, array, base, containers, mtl, random - , vector + ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random + , random, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.1"; - sha256 = "0ihwgql0ilavwx81f3z902r51p180b4facicd4sximnyg6qankdr"; + version = "5.2"; + sha256 = "1mz5wa66xazhh5x2wm01d7ixqg82zxls0ggkbixcjdm23a0560c1"; libraryHaskellDepends = [ - aivika array base containers mtl random vector + aivika array base containers mtl mwc-random random vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -22197,6 +22492,7 @@ self: { sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers cpphs directory fgl filepath haskeline HsSyck mtl old-time pretty process random @@ -22232,8 +22528,8 @@ self: { ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.4.0.2"; - sha256 = "077950dzy89042l8dbm1vc7mvqrkbsdmrq3cj78j3lfyr4m42k58"; + version = "0.4.0.3"; + sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -22246,10 +22542,11 @@ self: { ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { pname = "alea"; - version = "0.5.2.0"; - sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09"; + version = "0.5.3.0"; + sha256 = "0b8b7ncdn9as8y2m4dk4wwk7gjh79yvr9q3jlw6khdsqh266jq1q"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base optparse-applicative random text ]; @@ -22274,7 +22571,6 @@ self: { homepage = "https://github.com/mjhopkins/alerta-client"; description = "Bindings to the alerta REST API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex" = callPackage @@ -22314,15 +22610,14 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-tools" = callPackage ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { pname = "alex-tools"; - version = "0.2.0.0"; - sha256 = "0vhqq8d138hgjas6697pwzij6wqc9pn8ix64bs17mhiyq3ygmyvg"; + version = "0.3"; + sha256 = "119g5am7nr8wbk0gjyia80pkj81p2z9ag3s97vbmzrkfamsjaik0"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -22344,7 +22639,6 @@ self: { ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -22359,6 +22653,7 @@ self: { sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions haskeline hxt megaparsec mtl path QuickCheck random text tf-random transformers @@ -22454,12 +22749,13 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "algebraic-classes"; - version = "0.7.1"; - sha256 = "0w0p3qzvwyj3ijdggaaagcd1x9iwnzxk9yi9vqba63xdbzr18zrc"; + version = "0.8"; + sha256 = "1ihrxm3gn4558wlwlm8wagq133ipy04kc3d6wsx0an83wyrcnz1w"; libraryHaskellDepends = [ base syb template-haskell ]; 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 @@ -22468,8 +22764,8 @@ self: { }: mkDerivation { pname = "algebraic-graphs"; - version = "0.0.4"; - sha256 = "1d8f92vlq7j0k578qkx92ffavwjxmdry8zncjm0vmvkl3nb4i4zm"; + version = "0.0.5"; + sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers extra QuickCheck ]; benchmarkHaskellDepends = [ base containers criterion ]; @@ -22489,6 +22785,7 @@ self: { libraryHaskellDepends = [ algebra base basic-prelude lens semigroups ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/konn/algebraic-prelude#readme"; description = "Algebraically structured Prelude"; license = stdenv.lib.licenses.bsd3; @@ -22614,6 +22911,7 @@ self: { sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory editline fgl filepath HUnit incremental-sat-solver mtl network parsec pretty QuickCheck random @@ -22750,6 +23048,7 @@ self: { sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base event-list midi non-negative ]; @@ -23027,7 +23326,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon API Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-application-autoscaling" = callPackage @@ -23064,7 +23362,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon AppStream SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling" = callPackage @@ -23101,7 +23398,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Budgets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-certificatemanager" = callPackage @@ -23300,7 +23596,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeBuild SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage @@ -23619,7 +23914,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ecr" = callPackage @@ -23782,7 +24076,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -23855,7 +24148,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Health APIs and Notifications SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam" = callPackage @@ -23982,7 +24274,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -24037,7 +24328,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -24056,7 +24346,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lightsail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -24147,7 +24436,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks for Chef Automate SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pinpoint" = callPackage @@ -24166,7 +24454,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Pinpoint SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-polly" = callPackage @@ -24185,7 +24472,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Polly SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -24204,7 +24490,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage @@ -24241,7 +24526,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Rekognition SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -24296,35 +24580,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-s3-streaming" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, conduit-extra, dlist, exceptions, lens - , lifted-async, mmap, mmorph, mtl, resourcet, text - }: - mkDerivation { - pname = "amazonka-s3-streaming"; - version = "0.1.0.4"; - sha256 = "07c87lgmm3vs2q24km7lmsg2gwa4dd06zfi4cbljd8r4n3jxzl7c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit dlist - exceptions lens lifted-async mmap mmorph mtl resourcet - ]; - executableHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra text - ]; - 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 = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "amazonka-s3-streaming_0_2_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet @@ -24348,7 +24606,6 @@ 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 @@ -24385,7 +24642,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -24422,7 +24678,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Shield SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sms" = callPackage @@ -24441,7 +24696,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Server Migration Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-snowball" = callPackage @@ -24460,7 +24714,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -24497,7 +24750,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage @@ -24534,7 +24786,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Step Functions SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway" = callPackage @@ -24607,7 +24858,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-test" = callPackage @@ -24684,7 +24934,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon X-Ray SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amby" = callPackage @@ -24699,6 +24948,7 @@ self: { pname = "amby"; version = "0.3.2"; sha256 = "0sck0jjr1iwiy6lxd0lhv4cww004pcm7i9b9d8wikfvp2g170yzs"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cassava Chart Chart-cairo Chart-diagrams colour containers data-default data-default-class datasets either @@ -24726,6 +24976,7 @@ self: { sha256 = "0i37ycyhks335gfby81mnjflk40ir66aprf4752sqnqs68wk6bpm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers csv directory filepath graphviz hashable HStringTemplate lens MissingH mtl old-locale old-time pandoc @@ -24752,8 +25003,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.14.1"; - sha256 = "02rh5pamzk89smww10bym3rkra8pz74s4nkwigh1f0brg396a12h"; + version = "0.15.1"; + sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24772,7 +25023,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amqp_0_15_1" = callPackage + "amqp_0_16_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -24780,8 +25031,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.15.1"; - sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; + version = "0.16.0"; + sha256 = "100krph1yaazxcs74r6v5785l50886rsbip98w8p4rzqgcya311a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24808,8 +25059,8 @@ self: { }: mkDerivation { pname = "amqp-conduit"; - version = "0.2.0.0"; - sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb"; + version = "0.3.0.0"; + sha256 = "0w4i8jk7s8j341nx6qsmvlj7n2nnpwy3vzvkfnbzkphy0abyg0yn"; libraryHaskellDepends = [ amqp base conduit exceptions lifted-base monad-control mtl resourcet text transformers transformers-base @@ -24823,6 +25074,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amqp-utils" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, process, text, time, tls, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.2.1.4"; + sha256 = "01q9n53p2797hzsyl0y4w9fi99xhq4n2dad8q8d7a884slv73q8x"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + process text time tls x509-system + ]; + description = "Generic Haskell AMQP Consumer"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool, split @@ -24868,6 +25137,7 @@ self: { pname = "analyze"; version = "0.1.0.0"; sha256 = "0ia4dcqzq168qy5qh65dsp7bb94bxmxnpi2l9vzp7492wrhij9mg"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring cassava exceptions foldl free hashable lucid text unordered-containers vector @@ -24966,6 +25236,7 @@ self: { sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ atomo base blaze-html bytestring containers directory filepath hashable haskeline highlighter mtl parsec pretty pretty-show @@ -25231,11 +25502,28 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_7" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.7"; + sha256 = "1p66w12i2nr653ixdxly98q4g895a4nav8afmgq6yifm96shf89f"; + 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 { @@ -25245,17 +25533,34 @@ self: { 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"; + version = "0.6.8.1"; + sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.2"; - sha256 = "082sy0fwhr41qg9q3igc31rc56sfw1lijqnahlv4fl87f52zrknk"; + version = "0.3.0.3"; + sha256 = "1f03lh9zf6kbimg2fsi8hgnz3kvhqls67j5y13f4j2rb7lynxvd3"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -25352,7 +25657,6 @@ self: { homepage = "https://github.com/exbb2/antigate"; description = "Interface for antigate.com captcha recognition API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antimirov" = callPackage @@ -25445,6 +25749,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl ]; + executableHaskellDepends = [ base containers MissingH mtl ]; homepage = "http://software.complete.org/anydbm"; description = "Interface for DBM-like database systems"; license = "GPL"; @@ -25522,6 +25827,7 @@ self: { sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath glib gtk HTTP mtl network process transformers tremulous-query @@ -25579,6 +25885,7 @@ self: { pname = "api-opentheory-unicode"; version = "1.2"; sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring opentheory-unicode ]; testHaskellDepends = [ base bytestring directory opentheory-unicode @@ -26130,7 +26437,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "applicative-splice" = callPackage @@ -26190,8 +26496,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.4.0.0"; - sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps"; + version = "0.4.1.0"; + sha256 = "00hmfdwyrva90wnkww2n6jl7h6s24brz58cacqy8wkgacqrb73kw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26265,8 +26571,8 @@ self: { }: mkDerivation { pname = "approximate"; - version = "0.3"; - sha256 = "0zg94yqbm6iasjkf8bxz1bnwc3gx5lh6603cvab8rrxz4xm7k27j"; + version = "0.3.1"; + sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens @@ -26278,7 +26584,6 @@ 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 @@ -26378,7 +26683,6 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -26480,7 +26784,6 @@ 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 @@ -26730,32 +27033,33 @@ self: { ]; description = "Natural number arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, criterion, ghc-prim - , integer-gmp, mtl, QuickCheck, random, smallcheck, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers - , transformers-compat + ({ 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.4.3.0"; - sha256 = "15nisn8m1kbaqqxrvil6ih4pac3giwccjhn5fj2hm7g19cyk98ys"; + version = "0.5.0.0"; + sha256 = "0gja9x6y2nprlg5d2wjycjvxgc7bb4p6y8d4fg3dxxzzwgqgrrab"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ - array base containers ghc-prim integer-gmp mtl random + array base containers exact-pi ghc-prim integer-gmp + integer-logarithms mtl random ]; testHaskellDepends = [ - base containers QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers transformers-compat + base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion integer-logarithms random ]; - benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/cartazio/arithmoi"; - description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; + description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arithmoi_0_5_0_1" = callPackage @@ -26895,8 +27199,8 @@ self: { }: mkDerivation { pname = "array-primops"; - version = "0.2.0.0"; - sha256 = "02ln59zhkgi1l1zbci2zxyyidhlxmz22csky1y0zdx119nsnhsza"; + version = "0.2.0.1"; + sha256 = "0kdf88xs6aplxah90pl2r94fgfl58a4fmpxjcbvb9996823q54qg"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck @@ -26991,8 +27295,8 @@ self: { }: mkDerivation { pname = "arrowp-qq"; - version = "0.1"; - sha256 = "05cj6drvnk74bcjkr1pqj65c57y09gwmribii887jvg6p77abkgv"; + version = "0.1.1"; + sha256 = "1khs7xcc234i4xk6gwjakrzmn8gymaradar9inqikb6wkrs61r53"; libraryHaskellDepends = [ array base containers haskell-src template-haskell transformers ]; @@ -27002,6 +27306,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arrowp-qq_0_2_0_1" = callPackage + ({ mkDerivation, arrows, base, containers, data-default + , haskell-src-exts, haskell-src-exts-util, haskell-src-meta, NoHoed + , template-haskell, transformers, uniplate + }: + mkDerivation { + pname = "arrowp-qq"; + version = "0.2.0.1"; + sha256 = "18m9h5v1c3w0f5f0iw2vxmdms73d4w9s1z7aa301h2c43fv0iym8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default haskell-src-exts haskell-src-exts-util + haskell-src-meta NoHoed template-haskell transformers uniplate + ]; + executableHaskellDepends = [ base haskell-src-exts NoHoed ]; + testHaskellDepends = [ arrows base template-haskell ]; + homepage = "https://github.com/pepeiborra/arrowp"; + description = "A preprocessor and quasiquoter for translating arrow notation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arrows" = callPackage ({ mkDerivation, base, Stream }: mkDerivation { @@ -27271,6 +27598,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "asn1-codec" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , containers, contravariant, cryptonite, directory, hashable, HUnit + , integer-gmp, memory, network, pretty, stm, test-framework + , test-framework-hunit, text, vector + }: + mkDerivation { + pname = "asn1-codec"; + version = "0.1.0"; + sha256 = "1l3ka458aggj04zn2sn3p1mzkrjsgy8p7rg45031cxr401msks5b"; + libraryHaskellDepends = [ + base bytestring containers contravariant cryptonite hashable + integer-gmp memory network pretty stm text vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring directory HUnit + test-framework test-framework-hunit text vector + ]; + homepage = "https://github.com/andrewthad/asn1-codec"; + description = "Encode and decode ASN.1"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1-data" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, text }: mkDerivation { @@ -27281,6 +27632,7 @@ self: { editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal mtl text ]; homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; @@ -27340,6 +27692,7 @@ self: { sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ asn1-encoding asn1-types base bytestring pem ]; @@ -27352,8 +27705,8 @@ self: { ({ mkDerivation, base, process, text }: mkDerivation { pname = "aspell-pipe"; - version = "0.2"; - sha256 = "11m2w8365amqy0r9ll2xyfrc07i4gcizyfvf0ayihvzaw1ciynkg"; + version = "0.3"; + sha256 = "1jl332g0v3zsjx4c340y5cw8rfpi527gki86y14zps6rb9b9nvzi"; libraryHaskellDepends = [ base process text ]; description = "Pipe-based interface to the Aspell program"; license = stdenv.lib.licenses.bsd3; @@ -27411,6 +27764,7 @@ self: { pname = "assertions"; version = "0.1.0.4"; sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base containers ]; testHaskellDepends = [ base interpolate process ]; description = "A simple testing framework"; @@ -27437,6 +27791,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; + revision = "1"; + editedCabalFile = "1rvdxx5gl22jp528z7b75fwm1dhfsdx2hhvwvfaw3wc59a66gmml"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mkdag/ast-monad#readme"; @@ -27481,6 +27837,7 @@ self: { sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory MonadRandom mtl OpenGL random SDL SDL-image SDL-mixer SDL-ttf unix @@ -27496,8 +27853,8 @@ self: { }: mkDerivation { pname = "astro"; - version = "0.4.1.3"; - sha256 = "1zakvwzdrlpqb8rx1bypb59gra3kxwb5yjwxgphzi9icgmd7y07p"; + version = "0.4.2.0"; + sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6"; libraryHaskellDepends = [ base matrix time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -27519,6 +27876,7 @@ self: { sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ astview-utils base bytestring containers directory filepath glade glib Glob gtk gtksourceview2 hint mtl process syb @@ -27586,18 +27944,6 @@ self: { }) {}; "async-extra" = callPackage - ({ mkDerivation, async, base, containers, deepseq }: - mkDerivation { - pname = "async-extra"; - version = "0.1.0.0"; - sha256 = "0an0glhn5kvm1jzb6mp884jmn26f0968wmn45796q44xq2dm1ks7"; - libraryHaskellDepends = [ async base containers deepseq ]; - homepage = "https://github.com/agrafix/async-extra#readme"; - description = "Useful concurrent combinators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "async-extra_0_2_0_0" = callPackage ({ mkDerivation, async, base, deepseq, split }: mkDerivation { pname = "async-extra"; @@ -27607,7 +27953,6 @@ self: { homepage = "https://github.com/agrafix/async-extra#readme"; description = "Useful concurrent combinators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-extras" = callPackage @@ -27625,7 +27970,6 @@ self: { homepage = "http://github.com/jfischoff/async-extras"; description = "Extra Utilities for the Async Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-io-either" = callPackage @@ -27677,28 +28021,6 @@ self: { }) {}; "async-refresh" = callPackage - ({ mkDerivation, base, criterion, formatting, HUnit, lens - , lifted-async, monad-control, monad-logger, safe-exceptions, stm - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "async-refresh"; - version = "0.2.0"; - sha256 = "075v54j8fivzchkrj4pnxpj0v36qd7q1yfslvvr0dm5k6qr0p498"; - libraryHaskellDepends = [ - base formatting lens lifted-async monad-control monad-logger - safe-exceptions stm text - ]; - testHaskellDepends = [ - base criterion HUnit monad-logger stm test-framework - test-framework-hunit text - ]; - homepage = "https://github.com/mtesseract/async-refresh"; - description = "Package implementing core logic for refreshing of expiring data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-refresh_0_2_0_2" = callPackage ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async , microlens, microlens-th, monad-control, monad-logger , safe-exceptions, stm, test-framework, test-framework-hunit, text @@ -27718,33 +28040,9 @@ self: { homepage = "https://github.com/mtesseract/async-refresh"; description = "Package implementing core logic for refreshing of expiring data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-refresh-tokens" = callPackage - ({ mkDerivation, async-refresh, base, bytestring, criterion - , formatting, HUnit, lens, lifted-async, monad-control - , monad-logger, safe-exceptions, stm, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "async-refresh-tokens"; - version = "0.1.0"; - sha256 = "0ghrqdw2cfw42x7dlq7r1hfv70gvp07wkpmbhkja23llzjf1wd1y"; - libraryHaskellDepends = [ - async-refresh base bytestring formatting lens lifted-async - monad-control monad-logger safe-exceptions stm text - ]; - testHaskellDepends = [ - base criterion HUnit monad-logger stm test-framework - test-framework-hunit - ]; - homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; - description = "Package implementing core logic for refreshing of expiring access tokens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-refresh-tokens_0_2_0_0" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lifted-async, microlens, microlens-th , monad-control, monad-logger, safe-exceptions, stm, test-framework @@ -27752,8 +28050,8 @@ self: { }: mkDerivation { pname = "async-refresh-tokens"; - version = "0.2.0.0"; - sha256 = "1inpl44hmk4g5y0p09wdg85k921174zz5f5kn0z69b13gfrhncw6"; + version = "0.3.0.0"; + sha256 = "11kwkqxxqipfl193wk1a441r8jr6h1lj50xrzmpjhqmacwr212nm"; libraryHaskellDepends = [ async-refresh base bytestring formatting lifted-async microlens microlens-th monad-control monad-logger safe-exceptions stm text @@ -27765,7 +28063,6 @@ self: { homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; description = "Package implementing core logic for refreshing of expiring access tokens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-timer" = callPackage @@ -27854,6 +28151,7 @@ self: { pname = "atlassian-connect-core"; version = "0.8.0.0"; sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -27982,32 +28280,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.1"; - sha256 = "1kswbcic7s3j0fldnzi6xz01apmicjscwalal7yzxd69vad5p5k2"; - 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; - }) {}; - - "atom-conduit_0_4_0_3" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -28031,7 +28303,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 @@ -28063,8 +28334,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; - version = "0.8.0.4"; - sha256 = "0r4qvf9cgv5a2h0dk6blxhahk808pmihma9k2ym3h1cchj9y7qa7"; + version = "0.8.1"; + sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1"; 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"; @@ -28134,6 +28405,7 @@ self: { sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory filepath hashable hint mtl parsec pretty regex-pcre template-haskell text time vector @@ -28263,6 +28535,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_0" = 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 + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.0"; + sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + 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 ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -28491,6 +28793,7 @@ self: { sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base Cabal directory epic haskell98 ]; @@ -28519,7 +28822,6 @@ self: { homepage = "http://hub.darcs.net/thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -28532,6 +28834,7 @@ self: { pname = "audiovisual"; version = "0.0"; sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base boundingboxes colors deepseq directory filepath free freetype2 hashable JuicyPixels JuicyPixels-util lens linear mtl objective @@ -28552,6 +28855,7 @@ self: { sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory unix ]; libraryPkgconfigDepends = [ augeas ]; executableHaskellDepends = [ HUnit ]; @@ -28753,8 +29057,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.0.0"; - sha256 = "1wx0mdw0dqa9brgznfvnpcaf4pka87nbkrqxbyi94fhlpcdsz6s5"; + version = "1.1.2"; + sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -28870,6 +29174,7 @@ self: { sha256 = "13z9c4j7f8smc441qawl7brljmgsgmfmp4dzq7914f7ycg24ck6g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory mtl process unix ]; homepage = "https://github.com/dagit/autoproc"; description = "EDSL for Procmail scripts"; @@ -28927,8 +29232,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "11"; - editedCabalFile = "0panmqlzp0mq004fc0rm6fywrmc07cgwsp2567g4v1ay8g812ls2"; + revision = "15"; + editedCabalFile = "06vhxs4172liq6ayf2cg3b45hk3jkcxbgz1ilwqrw9bbn8lfgq6s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28991,32 +29296,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.18.0"; - sha256 = "1xqwj124cgb88za7pdb3ggs435c7lk2g6c6ncc6awl93bzyigsj4"; - revision = "1"; - editedCabalFile = "0ngmb2w7yql2gix5hq5jk057xazdq8ffax39gw20pa68npfgg1g6"; - 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_0_19_0" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring , bytestring, bytestring-conversion, containers, cookie, cryptonite , either, http-types, memory, mtl, resource-pool @@ -29097,6 +29376,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avro" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, data-binary-ieee754, entropy, extra, fail + , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific + , semigroups, tagged, template-haskell, text, unordered-containers + , vector + }: + mkDerivation { + pname = "avro"; + version = "0.1.0.1"; + sha256 = "0pn3pll7yjkfiqllndsn5mcm07my6mgjzd7amncvl3pykw75w0jq"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific + semigroups tagged template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + entropy extra fail hashable hspec mtl pure-zlib QuickCheck + scientific semigroups tagged template-haskell text + unordered-containers vector + ]; + homepage = "https://github.com/GaloisInc/avro.git"; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -29668,7 +29975,6 @@ self: { homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sns" = callPackage @@ -29702,8 +30008,8 @@ self: { }: mkDerivation { pname = "axiom"; - version = "0.4.5"; - sha256 = "0z08zgqab3i3ipwry828fy5j1m1r5n6lw4mjsria07crq7ny8z3i"; + version = "0.4.6"; + sha256 = "0i78rbkzmlfr9454m6ax1wk2f76ks5mc2qp0zqir0ds1x2614rc3"; libraryHaskellDepends = [ base bytestring containers directory ghcjs-perch mtl transformers transient transient-universe @@ -29711,7 +30017,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 = stdenv.lib.platforms.none; }) {}; "axiomatic-classes" = callPackage @@ -29873,8 +30178,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.31"; - sha256 = "15bw30n89yhdskngsr8nfi78ks07fsy0n1mgq6h76vwgm1l9pk4d"; + version = "0.5.32"; + sha256 = "0d3ymgk83kfxzfd0a9x97sjcax4vd27p2dskpfiykqsn7wgylhhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29908,7 +30213,6 @@ self: { homepage = "http://github.com/nek0/babl#readme"; description = "Haskell bindings to BABL library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -29919,12 +30223,12 @@ self: { sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers random wx wxcore ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -30040,6 +30344,7 @@ self: { sha256 = "1xb05l5b94hdq65x24z1m4fhvsr977y912qa1c7wi8khc9xvbhqw"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cmdargs containers deepseq direct-sqlite directory disk-free-space extra filepath hashable HTTP http-client @@ -30067,17 +30372,18 @@ self: { }: mkDerivation { pname = "ballast"; - version = "0.1.0.0"; - sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf"; + version = "0.2.0.0"; + sha256 = "1l5d4ngbvmdba2gm2819mf0lb0bs8c19gvjqkxgb59i9y6qb0n6n"; libraryHaskellDepends = [ aeson base bytestring either-unwrap hspec hspec-expectations http-client http-client-tls http-types text time transformers unordered-containers utf8-string vector ]; testHaskellDepends = [ - base bytestring either-unwrap hspec hspec-expectations text time + base bytestring either-unwrap hspec hspec-expectations http-client + http-client-tls text time ]; - homepage = "https://github.com/bitemyapp/ballast#readme"; + homepage = "https://github.com/alexeyzab/ballast#readme"; description = "Shipwire API client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -30093,6 +30399,7 @@ self: { pname = "bamboo"; version = "2010.2.25"; sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath gravatar hack hack-contrib haskell98 mps mtl network old-locale old-time @@ -30115,6 +30422,7 @@ self: { sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ bamboo bamboo-theme-blueprint base bytestring data-default hack hack-contrib hack-handler-hyena haskell98 mps process @@ -30133,6 +30441,7 @@ self: { pname = "bamboo-plugin-highlight"; version = "2009.7.5"; sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ bamboo base bytestring hack hack-contrib highlighting-kate hxt mps xhtml @@ -30152,6 +30461,7 @@ self: { pname = "bamboo-plugin-photo"; version = "2009.7.5"; sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default directory filepath hack hack-contrib haskell98 hxt mps utf8-string xhtml @@ -30171,6 +30481,7 @@ self: { pname = "bamboo-theme-blueprint"; version = "2010.2.25.1"; sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ bamboo base bytestring containers data-default gravatar hack hack-contrib hcheat mps network rss utf8-string xhtml @@ -30192,6 +30503,7 @@ self: { pname = "bamboo-theme-mini-html5"; version = "2009.11.27"; sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ bamboo base base64-string bytestring cgi containers data-default directory filepath gravatar hack hack-contrib haskell98 hcheat moe @@ -30205,8 +30517,8 @@ self: { }) {}; "bamse" = callPackage - ({ mkDerivation, base, com, directory, filepath, old-time, pretty - , process, regex-compat + ({ mkDerivation, base, com, directory, filepath, HUnit, old-time + , pretty, process, QuickCheck, regex-compat }: mkDerivation { pname = "bamse"; @@ -30217,6 +30529,7 @@ self: { libraryHaskellDepends = [ base com directory filepath old-time pretty process regex-compat ]; + executableHaskellDepends = [ HUnit QuickCheck ]; description = "A Windows Installer (MSI) generator framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -30253,8 +30566,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.1.0.5"; - sha256 = "0q1pm1bx7nz3vxrn04ikswjnbql1mny4shyv92ps6bkn29wdn686"; + version = "0.1.0.6"; + sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; homepage = "https://bitbucket.org/davecturner/bank-holidays-england"; @@ -30335,6 +30648,7 @@ self: { sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers directory filepath ghc ghc-prim html plugins snap-core snap-server text transformers unix-compat @@ -30369,6 +30683,7 @@ self: { editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-svg bytestring template-haskell text unordered-containers @@ -30379,7 +30694,6 @@ self: { homepage = "https://github.com/philopon/barrier"; description = "Shields.io style badge generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barrier-monad" = callPackage @@ -30394,17 +30708,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_9_1_0" = callPackage - ({ mkDerivation, ghc-prim, integer-gmp, rts }: + "base_4_10_0_0" = callPackage + ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.9.1.0"; - sha256 = "0zpvf4yq52dkl9f30w6x4fv1lqcc175i57prhv56ky06by08anvs"; - libraryHaskellDepends = [ ghc-prim integer-gmp rts ]; + version = "4.10.0.0"; + sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv"; + libraryHaskellDepends = [ + ghc-prim invalid-cabal-flag-settings rts + ]; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {invalid-cabal-flag-settings = null;}; "base-compat" = callPackage ({ mkDerivation, base, hspec, QuickCheck, unix }: @@ -30469,7 +30786,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base-orphans" = callPackage + "base-noprelude_4_10_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.10.0.0"; + sha256 = "1jc1szrja1651vf73kprsa0yq73w331i1g08p54w1znkilf7jalf"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + 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_0_5_4" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; @@ -30480,9 +30811,10 @@ self: { homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans_0_6" = callPackage + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; @@ -30493,22 +30825,9 @@ self: { homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-prelude" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-prelude"; - version = "1.0.1.1"; - sha256 = "1d9iga5nj66h295j09q0wh246ahagjcqfv9br6x51ya57fd0mkyw"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/base-prelude"; - description = "The most complete prelude formed solely from the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-prelude_1_2_0_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; @@ -30518,7 +30837,6 @@ self: { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed solely from the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-unicode-symbols" = callPackage @@ -30567,6 +30885,7 @@ self: { pname = "base32string"; version = "0.9.1"; sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -30619,6 +30938,7 @@ self: { pname = "base58string"; version = "0.10.0"; sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -30699,6 +31019,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basement" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.0"; + sha256 = "1agqj5yp0nf7117qx62xp5mncans5szscbp6gz6ifhhsl6lng3k1"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -30727,6 +31059,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic-cpuid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-cpuid"; + version = "0.1.0.0"; + sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p"; + libraryHaskellDepends = [ base ]; + description = "A small package to access the cpuid instruction directly"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-lens" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -30754,7 +31097,6 @@ self: { homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basic-sop" = callPackage @@ -30768,7 +31110,6 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "baskell" = callPackage @@ -30779,6 +31120,7 @@ self: { sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers mtl parsec pretty unix ]; @@ -30976,7 +31318,6 @@ self: { homepage = "http://github.com/humane-software/haskell-bdd"; description = "Behavior-Driven Development DSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bdelta" = callPackage @@ -30999,6 +31340,7 @@ self: { sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base network text url ]; executableHaskellDepends = [ aeson base network text url ]; description = "Update CSS in the browser without reloading the page"; @@ -31155,6 +31497,7 @@ self: { sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers convertible Crypto directory filepath happstack-server happstack-util hdaemonize HDBC HDBC-postgresql @@ -31172,8 +31515,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.5"; - sha256 = "0fm92vwavgnh7pm0491vy5x21wylckga4a2n765nbw5hzmk9pz92"; + version = "1.0.6"; + sha256 = "0ss5liap1f71i7igpszdpb6himl30gibydlknx9ka44dsrh7dhq9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31182,7 +31525,6 @@ self: { homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "benchmark-function" = callPackage @@ -31201,8 +31543,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.9"; - sha256 = "1asabacjv8x61w6qpkqlxr5w1j6fcppiva1k2vrsr8brvsyrdihm"; + version = "0.2.2.10"; + sha256 = "1irrdx2l6pj96cc983jvpkfnkg43zrz1rk1qnin8c2l8kvpwbc76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -31434,7 +31776,6 @@ self: { homepage = "https://bitbucket.org/kztk/bff-mono/"; description = "\"Bidirectionalization for Free\" for Monomorphic Transformations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgmax" = callPackage @@ -31447,7 +31788,6 @@ self: { homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgzf" = callPackage @@ -31514,6 +31854,7 @@ self: { sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cgi containers directory hint mtl parsec pretty template-haskell unix utf8-string xhtml @@ -31761,7 +32102,6 @@ self: { homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary_0_7_6_1" = callPackage @@ -31848,8 +32188,8 @@ self: { }: mkDerivation { pname = "binary-conduit"; - version = "1.2.4.1"; - sha256 = "10nalqf3zhg49b5drhw4y8zv9c3nsnlbc7bvw9la8vgzpihbnp24"; + version = "1.2.5"; + sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11"; libraryHaskellDepends = [ base binary bytestring conduit resourcet vector ]; @@ -32049,22 +32389,6 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base-prelude, bytestring, success, text - , transformers - }: - mkDerivation { - pname = "binary-parser"; - version = "0.5.2"; - sha256 = "0iam4j4z560rnj69wjf0pbylizygk36daaz06x2708w4dzr30bbi"; - libraryHaskellDepends = [ - base-prelude bytestring success text transformers - ]; - homepage = "https://github.com/nikita-volkov/binary-parser"; - description = "A highly-efficient but limited parser API specialised for bytestrings"; - license = stdenv.lib.licenses.mit; - }) {}; - - "binary-parser_0_5_5" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, transformers @@ -32084,7 +32408,6 @@ 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 @@ -32165,6 +32488,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-serialise-cbor" = callPackage + ({ mkDerivation, base, bytestring, cborg, serialise }: + mkDerivation { + pname = "binary-serialise-cbor"; + version = "0.1.1.0"; + sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg"; + libraryHaskellDepends = [ base bytestring cborg serialise ]; + description = "Yet Another Binary Serialisation Library (compatibility shim)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-shared" = callPackage ({ mkDerivation, base, binary, bytestring, containers, mtl }: mkDerivation { @@ -32284,6 +32618,8 @@ self: { pname = "binary-typed"; version = "1.0"; sha256 = "02ans3vny69qfsmwlgri7v31rpff0h3mdp2zpikclay50a471ww5"; + revision = "1"; + editedCabalFile = "1jnmdi3bnyiyvqlmgh5k8cdcbnl594yq3wrs6cjipw0ik06ar0y2"; libraryHaskellDepends = [ base binary bytestring murmur-hash ]; testHaskellDepends = [ base binary bytestring tasty tasty-hunit tasty-quickcheck @@ -32370,7 +32706,6 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -32441,6 +32776,7 @@ self: { pname = "bindings-K8055"; version = "0.1.2"; sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ K8055D ]; homepage = "https://github.com/jputcu/bindings-K8055"; @@ -32740,7 +33076,6 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -32781,6 +33116,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + "bindings-libg15" = callPackage + ({ mkDerivation, base, bindings-DSL, g15 }: + mkDerivation { + pname = "bindings-libg15"; + version = "0.2.0.0"; + sha256 = "1dy4z0m7r7sicqzx4lfibi4nbx6vaq31x93h38v90vn5i4n903vs"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ g15 ]; + homepage = "https://github.com/Xandaros/bindings-libg15#readme"; + description = "Bindings to libg15"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {g15 = null;}; + "bindings-librrd" = callPackage ({ mkDerivation, base, bindings-DSL, librrd }: mkDerivation { @@ -33024,7 +33373,6 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -33033,6 +33381,7 @@ self: { pname = "bindings-sc3"; version = "0.4.1"; sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ scsynth ]; homepage = "https://github.com/kaoskorobase/bindings-sc3/"; @@ -33200,7 +33549,8 @@ self: { "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup + , directory, mtl, old-time, parallel, parsec, process, QuickCheck + , random, tagsoup }: mkDerivation { pname = "bio"; @@ -33208,17 +33558,37 @@ self: { sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers directory mtl parallel parsec QuickCheck tagsoup ]; - executableHaskellDepends = [ base bytestring random ]; + executableHaskellDepends = [ + base bytestring containers old-time process QuickCheck random + ]; homepage = "http://biohaskell.org/Libraries/Bio"; description = "A bioinformatics library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bio-sequence" = callPackage + ({ mkDerivation, array, base, bytestring, hspec, parsec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "bio-sequence"; + version = "0.1.0.0"; + sha256 = "0x9il05qdzmj6ka0pr8nbjg8zi073f52lpfd0dhzxy2f15zdralc"; + libraryHaskellDepends = [ + array base bytestring parsec template-haskell text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/biocad/bio-sequence"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bioace" = callPackage ({ mkDerivation, base, bioalign, biocore, bytestring, parsec }: mkDerivation { @@ -33283,20 +33653,20 @@ self: { "biohazard" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base-prelude , binary, bytestring, bytestring-mmap, containers, directory - , exceptions, filepath, hashable, ListLike, monad-control - , primitive, random, scientific, stm, text, transformers - , transformers-base, unix, unordered-containers, vector - , vector-algorithms, vector-th-unbox, zlib + , exceptions, filepath, hashable, monad-control, primitive, random + , scientific, stm, text, transformers, transformers-base, unix + , unordered-containers, vector, vector-algorithms, vector-th-unbox + , zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.13"; - sha256 = "0w9skla3h9a0l9aq8fyak72nsqh7ww91p5xlsza6jf1735903s55"; + version = "0.6.15"; + sha256 = "19w9rk0r835fzfk5k2fxfb54wa4fbyyfrppa4ifmc7z57bxii3gq"; libraryHaskellDepends = [ aeson async attoparsec base base-prelude binary bytestring bytestring-mmap containers directory exceptions filepath hashable - ListLike monad-control primitive random scientific stm text - transformers transformers-base unix unordered-containers vector + monad-control primitive random scientific stm text transformers + transformers-base unix unordered-containers vector vector-algorithms vector-th-unbox zlib ]; homepage = "http://github.com/udo-stenzel/biohazard"; @@ -33309,22 +33679,24 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-lexing, case-insensitive, clustering, conduit , conduit-combinators, containers, criterion, data-default-class - , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap - , math-functions, matrices, mtl, parallel, primitive, random, split - , statistics, tasty, tasty-golden, tasty-hunit, text, transformers - , unordered-containers, vector, vector-algorithms, word8 + , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit + , IntervalMap, math-functions, matrices, mtl, parallel, primitive + , random, split, statistics, tasty, tasty-golden, tasty-hunit, text + , transformers, unordered-containers, vector, vector-algorithms + , word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.3.1"; - sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl"; + version = "0.3.2"; + sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing case-insensitive clustering conduit-combinators containers - data-default-class double-conversion hexpat HsHTSLib http-conduit - IntervalMap math-functions matrices mtl parallel primitive split - statistics text transformers unordered-containers vector - vector-algorithms word8 + data-default-class data-ordlist double-conversion hexpat HsHTSLib + http-conduit IntervalMap math-functions matrices mtl parallel + primitive split statistics text transformers unordered-containers + vector vector-algorithms word8 ]; testHaskellDepends = [ base bytestring conduit conduit-combinators data-default-class @@ -33426,6 +33798,7 @@ self: { sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default hack hack-handler-happstack haskell98 MissingH mtl parsec process rallod @@ -33450,6 +33823,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bit-stream" = callPackage + ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector + }: + mkDerivation { + pname = "bit-stream"; + version = "0.1.0.2"; + sha256 = "1x4vcg2y2il540syqdzk2wdixs8g672lhzjm46y40x4299yjw7w1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim vector ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + 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 ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , tasty-th, vector @@ -33465,7 +33861,6 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitarray" = callPackage @@ -33492,6 +33887,7 @@ self: { pname = "bitcoin-api"; version = "0.12.1"; sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -33515,6 +33911,7 @@ self: { pname = "bitcoin-api-extra"; version = "0.9.1"; sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit lens stm stm-chans stm-conduit text transformers @@ -33536,6 +33933,7 @@ self: { pname = "bitcoin-block"; version = "0.13.1"; sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bitcoin-tx bitcoin-types bytestring cryptohash hexstring largeword lens @@ -33610,7 +34008,6 @@ self: { homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {blockchain-restful-address-index-api = null;}; @@ -33646,6 +34043,7 @@ self: { pname = "bitcoin-script"; version = "0.11.1"; sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base16-bytestring binary bytestring text ]; @@ -33663,6 +34061,7 @@ self: { pname = "bitcoin-tx"; version = "0.13.1"; sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bitcoin-script bitcoin-types bytestring cryptohash hexstring lens @@ -33683,6 +34082,7 @@ self: { pname = "bitcoin-types"; version = "0.9.2"; sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base58string binary bytestring hexstring text ]; @@ -33761,6 +34161,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; + revision = "2"; + editedCabalFile = "1c209vyxxafr1pf1zqcydy85w9v5gvfjy64i5i6v9asfld6jppig"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -33857,6 +34259,7 @@ self: { pname = "bitset"; version = "1.4.8"; sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; librarySystemDepends = [ gmp ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; @@ -33979,13 +34382,14 @@ self: { pname = "bitwise"; version = "0.1.1.1"; sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; + revision = "1"; + editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; - homepage = "http://code.mathr.co.uk/bitwise"; + homepage = "https://code.mathr.co.uk/bitwise"; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitx-bitcoin" = callPackage @@ -34080,6 +34484,7 @@ self: { sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 unix ]; homepage = "http://github.com/nfjinjing/bla"; description = "a stupid cron"; @@ -34106,7 +34511,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 @@ -34129,7 +34533,6 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blake2" = callPackage @@ -34196,6 +34599,7 @@ self: { sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia"; revision = "11"; editedCabalFile = "1n5sf249kcrk276hdj68g7v6fmhfg6wfwaaibqx2am86iz8dvr06"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -34381,28 +34785,6 @@ self: { }) {}; "blaze-html" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.8.1.3"; - sha256 = "0dyn6cj5av4apmc3wav6asfap53gxy4hzdb7rph83yakscbyf5lc"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-html_0_9_0_1" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -34422,7 +34804,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-html-contrib" = callPackage @@ -34469,6 +34850,7 @@ self: { homepage = "http://github.com/mruegenberg/blaze-html-truncate"; description = "A truncator for blaze-html"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-json" = callPackage @@ -34495,25 +34877,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.7.1.1"; - sha256 = "00s3qlkbq9gxgy6l5skbhnl5h81mjgzqcrw3yn3wqnyd9scab3b3"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_0_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -34530,7 +34893,6 @@ self: { 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 @@ -34640,6 +35002,7 @@ self: { sha256 = "0c4m9ia92djr8lhp6n1zwwxskr344322m8g24ka4skbrp1vy3qnd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers d-bus data-default-class microlens microlens-ghc mtl random text transformers uuid @@ -34784,6 +35147,7 @@ self: { sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory feed filepath higherorder highlighting-kate mtl old-locale pandoc regex-compat time utf8-string xhtml xml @@ -34795,35 +35159,6 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, directory, doctest, errors, exceptions - , filepath, generics-sop, hashable, hspec, http-client, http-types - , mtl, mtl-compat, network-uri, QuickCheck, quickcheck-properties - , scientific, semigroups, temporary, text, time, transformers, unix - , unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; - version = "0.12.1.0"; - sha256 = "0v746ai757kqja600bixsn74n5kc5x95a4jcnk8w3ky93hyd4gns"; - 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 directory doctest errors - exceptions filepath generics-sop hspec http-client http-types mtl - network-uri QuickCheck quickcheck-properties semigroups temporary - text time unix unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_14_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 @@ -34850,7 +35185,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 @@ -34861,8 +35195,8 @@ self: { }: mkDerivation { pname = "bloodhound-amazonka-auth"; - version = "0.1.1.0"; - sha256 = "0145hn23jjk7kfcqj9dr2bk3my90nfdb3k805cpmbmg0w15s34ng"; + version = "0.1.2.0"; + sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm"; libraryHaskellDepends = [ amazonka-core amazonka-elasticsearch base bloodhound exceptions http-client http-types time transformers uri-bytestring @@ -34874,7 +35208,6 @@ 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 @@ -34937,7 +35270,6 @@ self: { homepage = "http://github.com/GregorySchwartz/blosum#readme"; description = "BLOSUM generator"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloxorz" = callPackage @@ -34948,6 +35280,7 @@ self: { sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; @@ -34983,6 +35316,7 @@ self: { sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cereal containers random ]; executableHaskellDepends = [ base Cabal cereal containers data-default-class network pandoc @@ -35021,6 +35355,7 @@ self: { sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ConfigFile containers directory filepath glade gtk mtl process random regex-compat unix utf8-string X11 X11-xft xmonad @@ -35082,6 +35417,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bno055-haskell" = callPackage + ({ mkDerivation, base, bytestring, cereal, h2c, mtl, resourcet }: + mkDerivation { + pname = "bno055-haskell"; + version = "0.1.0"; + sha256 = "1n4s0ljlgf1qrlyzaj161nbx7sa162v26p0i2i17n12m8zwjkp3s"; + libraryHaskellDepends = [ + base bytestring cereal h2c mtl resourcet + ]; + homepage = "https://bitbucket.org/fmapE/bno055-haskell"; + description = "Library for communication with the Bosch BNO055 orientation sensor"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "board-games" = callPackage ({ mkDerivation, array, base, cgi, containers, html, httpd-shed , network-uri, QuickCheck, random, transformers, utility-ht @@ -35105,7 +35455,6 @@ 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 @@ -35169,6 +35518,7 @@ self: { homepage = "https://github.com/bflyblue/bolt#readme"; description = "Bolt driver for Neo4j"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boltzmann-samplers" = callPackage @@ -35232,6 +35582,7 @@ self: { pname = "bond-haskell"; version = "0.1.5.0"; sha256 = "01l6n6gx2qdwan1dx8vswvm13scp0dxbdvnv5j4w34iyj6qg0qnv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -35320,8 +35671,8 @@ self: { ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: mkDerivation { pname = "bookkeeping"; - version = "0.2.1.1"; - sha256 = "1dbzw6q35v35xvrcs9q2digiv0r8h32f4yby2kw5m8qiba3cf86r"; + version = "0.2.1.4"; + sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz"; libraryHaskellDepends = [ base dlist mtl text time ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; @@ -35451,12 +35802,12 @@ self: { sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers descrilo directory filepath simtreelo ]; description = "A Bookmarks manager with a HTML generator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boombox" = callPackage @@ -35479,8 +35830,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.2"; - sha256 = "1gm2l34f5vzxh78vx02hwg7b19q3qvynff0y8kss5svx83a4bpl6"; + version = "1.4.5.3"; + sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; libraryHaskellDepends = [ base mtl template-haskell text ]; description = "Library for invertible parsing and printing"; license = stdenv.lib.licenses.bsd3; @@ -35567,7 +35918,7 @@ self: { }) {}; "boring-window-switcher" = callPackage - ({ mkDerivation, base, gtk, transformers, X11 }: + ({ mkDerivation, base, gtk, hspec, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; version = "0.1.0.4"; @@ -35576,6 +35927,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/debug-ito/boring-window-switcher"; description = "A boring window switcher"; license = stdenv.lib.licenses.bsd3; @@ -35628,10 +35980,10 @@ self: { }: mkDerivation { pname = "bound"; - version = "2"; - sha256 = "0z63k6kkj43rvwzsy7rbrxz97f8clq87ajbdv7768xziw4mb022x"; + version = "2.0.1"; + sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; revision = "1"; - editedCabalFile = "1sdsshbvhv955ncgxygzl4mfkkk76rdkilwc70w04j9jmbvj5p6j"; + editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -35644,7 +35996,6 @@ self: { homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bound-gen" = callPackage @@ -35656,7 +36007,6 @@ self: { libraryHaskellDepends = [ base bound monad-gen mtl ]; description = "Unwrap Scope's with globally fresh values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bounded-tchan" = callPackage @@ -35774,6 +36124,7 @@ 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 @@ -35835,8 +36186,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.3"; - sha256 = "0b153bjibqm6qicnh3r42fcv4w2c4qagllg0f1k5gxg903954xma"; + version = "0.1.0.4"; + sha256 = "0jar6jlid339k9rimlawah9800nqdybbr3l2k44y6i7q5pb656by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35847,6 +36198,7 @@ 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 @@ -35858,7 +36210,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Break from a loop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "breakout" = callPackage @@ -35888,6 +36239,7 @@ self: { sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base binary blaze-html bytestring configurator cryptohash directory hashtables http-types mtl random Spock Spock-core text @@ -35897,7 +36249,6 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -35916,35 +36267,14 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, containers, contravariant, deepseq, dlist - , microlens, microlens-mtl, microlens-th, stm, template-haskell - , text, text-zipper, transformers, vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.17.2"; - sha256 = "0ahwmrchy3wk6fvi1rfawzfyn7p4fsw4bpi16rf093f3nhilw5dd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers contravariant deepseq dlist microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "brick_0_19" = 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.19"; - sha256 = "17n8qcds1pv5vijpzw0w47qijcjxcydf3glwjxj645y0k8lpdcl1"; + version = "0.18"; + sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35952,6 +36282,34 @@ self: { 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_24_1" = callPackage + ({ mkDerivation, base, 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.24.1"; + sha256 = "0vjj64h683m28kwhp98crdyywbhpk7q6bx7crg2dr2g2mj41bb58"; + 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 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; @@ -35979,6 +36337,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + }: + mkDerivation { + pname = "brittany"; + version = "0.8.0.2"; + sha256 = "001nfcdj366avjcjz199s630v3z6r9mrj22b16qcixnwm3pzpxr7"; + revision = "1"; + editedCabalFile = "16ks5wxyjlgh7krvkr072pkhj4f5sa8bpnw1y15swx5d8xinp40w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory either 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 + ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory either extra 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 + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "broadcast-chan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -36117,7 +36518,6 @@ self: { ]; description = "Mapping between BSON and algebraic data types"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bspack" = callPackage @@ -36186,6 +36586,7 @@ self: { pname = "btree-concurrent"; version = "0.1.5"; sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base64-bytestring bytestring cereal containers directory filepath hashable mtl random snappy stm time @@ -36277,7 +36678,6 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder-aeson" = callPackage @@ -36368,6 +36768,7 @@ self: { data-default http-conduit http-types iso8601-time resourcet text time transformers unordered-containers vector ]; + executableHaskellDepends = [ base containers text time ]; homepage = "https://github.com/sethfowler/hsbugzilla"; description = "A Haskell interface to the Bugzilla native REST API"; license = stdenv.lib.licenses.bsd3; @@ -36395,6 +36796,8 @@ self: { pname = "buildbox"; version = "2.1.9.3"; sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5"; + revision = "1"; + editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale pretty process stm temporary text time @@ -36402,7 +36805,6 @@ self: { homepage = "http://code.ouroborus.net/buildbox"; description = "Rehackable components for writing buildbots and test harnesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buildbox-tools" = callPackage @@ -36598,28 +37000,29 @@ self: { }) {}; "bustle" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers, dbus + ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango - , parsec, pcap, process, QuickCheck, setlocale, system-glib - , test-framework, test-framework-hunit, text, time + , pcap, process, QuickCheck, setlocale, system-glib, test-framework + , test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; - version = "0.5.4"; - sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j"; + version = "0.6.1"; + sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ base bytestring cairo containers dbus directory filepath gio glib - gtk3 hgettext mtl pango parsec pcap process setlocale text time + gtk3 hgettext mtl pango pcap process setlocale text time ]; testHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gtk3 - hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework - test-framework-hunit text + base bytestring cairo containers dbus directory filepath gtk3 HUnit + mtl pango pcap QuickCheck test-framework test-framework-hunit text ]; - homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; + homepage = "https://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -36632,12 +37035,16 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.1.0.0"; - sha256 = "0z80gkx1b69742a784d95864rf9kqww702xcg9hfl8ra1ah45d96"; + version = "1.1.0.1"; + sha256 = "0j2qknsgq11nc3n0hjx9ck76014sg7if0d75vjjsw1kjlr3rykn5"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void ]; + testHaskellDepends = [ + base containers deque either extra free microlens microlens-th mtl + multistate pretty transformers unsafe + ]; homepage = "https://github.com/lspitzner/butcher/"; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; @@ -36654,6 +37061,7 @@ self: { sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa @@ -36693,10 +37101,10 @@ self: { ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers ]; + executableHaskellDepends = [ base text ]; homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -36717,6 +37125,7 @@ self: { pname = "byteable"; version = "0.1.1"; sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/vincenthz/hs-byteable"; description = "Type class for sequence of bytes"; @@ -36731,6 +37140,7 @@ self: { sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/vincenthz/hs-bytedump"; description = "Flexible byte dump helpers for human readers"; @@ -36759,6 +37169,8 @@ self: { pname = "bytes"; version = "0.15.3"; sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; + revision = "2"; + editedCabalFile = "07j20bmhysp4dawy8am1j4lhg21s5c2i8ckqby0iykmfgrlsrcv0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -36782,15 +37194,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_8_1" = callPackage + "bytestring_0_10_8_2" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.8.1"; - sha256 = "16zwb1p83z7vc5wlhvknpy80b5a2jxc5awx67rk52qnp9idmyq9d"; + version = "0.10.8.2"; + sha256 = "0fjc5ybxx67l0kh27l6vq4saf88hp1wnssj5ka90ii588y76cvys"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; testHaskellDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -36819,7 +37231,6 @@ 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 @@ -36994,13 +37405,13 @@ self: { pname = "bytestring-progress"; version = "1.0.7"; sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time ]; 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 @@ -37093,7 +37504,6 @@ 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 @@ -37225,6 +37635,7 @@ self: { pname = "bzlib-conduit"; version = "0.2.1.4"; sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl resourcet @@ -37357,30 +37768,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.1"; - sha256 = "1fsj0wx8nv19yavky6s47djyh9nxcj9bz968x5w10fpl5ks4xc4m"; - isLibrary = false; - isExecutable = 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_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , dlist, filepath, HUnit, language-c, pretty, process, shelly , test-framework, test-framework-hunit, text, transformers @@ -37391,6 +37778,7 @@ self: { sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory dlist filepath language-c pretty process @@ -37402,7 +37790,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 @@ -37435,6 +37822,7 @@ self: { homepage = "https://github.com/jwiegley/c2hsc"; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cab" = callPackage @@ -37502,8 +37890,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.1.0"; - sha256 = "12p5k0b4q66lbcsc59nvn7pnvwf627hfyrnl1p5nymirwkb4w4bl"; + version = "1.2.0"; + sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37516,7 +37904,6 @@ 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 @@ -37526,8 +37913,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.11"; - sha256 = "0xvjnl59zx424wyqcknzsma467a8bgg9588smqifk3qa390l838n"; + version = "0.8.1"; + sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37539,7 +37926,6 @@ 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 @@ -37602,10 +37988,13 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; + testHaskellDepends = [ + base Cabal containers debian Diff directory filepath hsemail HUnit + lens pretty process text + ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -37635,6 +38024,7 @@ self: { sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Cabal containers directory filepath HTTP mtl network pretty process setenv tar template-haskell transformers @@ -37791,35 +38181,36 @@ 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 ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, directory - , filepath, hackage-security, hashable, HTTP, mtl, network - , network-uri, pretty, process, QuickCheck, random, regex-posix - , stm, tagged, tar, tasty, tasty-hunit, tasty-quickcheck, time - , unix, zlib + , bytestring, Cabal, containers, cryptohash-sha256, deepseq + , directory, echo, edit-distance, filepath, hackage-security + , hashable, HTTP, mtl, network, network-uri, pretty, pretty-show + , process, QuickCheck, random, stm, tagged, tar, tasty, tasty-hunit + , tasty-quickcheck, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.2"; - sha256 = "1q0gl3i9cpg854lcsiifxxginnvhp2bpx19wkkzpzrd072983j1a"; + version = "2.0.0.0"; + sha256 = "0b9b0sx2nxas894ns1sjyirhvra8y8ixfcsya9pxkw0q5yn0ndsz"; revision = "1"; - editedCabalFile = "0v112hvvppa31sklpzg54vr0hfidy1334kg5p3jc0gbgl8in1n90"; + editedCabalFile = "047bf57sxaajaa0wi7v3bg6kq19ngfpw5n4cc46zlbqqjbvvq1d5"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 directory filepath hackage-security - hashable HTTP mtl network network-uri pretty process random stm tar - time unix zlib + containers cryptohash-sha256 deepseq directory echo edit-distance + filepath hackage-security hashable HTTP mtl network network-uri + pretty process random stm tar time unix zlib ]; testHaskellDepends = [ - array async base binary bytestring Cabal containers directory + array async base base16-bytestring binary bytestring Cabal + containers cryptohash-sha256 deepseq directory edit-distance filepath hackage-security hashable HTTP mtl network network-uri - pretty process QuickCheck random regex-posix stm tagged tar tasty + pretty pretty-show process QuickCheck random stm tagged tar tasty tasty-hunit tasty-quickcheck time unix zlib ]; doCheck = false; @@ -37918,8 +38309,8 @@ self: { }: mkDerivation { pname = "cabal-macosx"; - version = "0.2.4.0"; - sha256 = "1yl8fwbqgdp4hsd5hsgrrzvh1px79nxfsvs9nip6fq3q68qm5ys1"; + version = "0.2.4.1"; + sha256 = "01l0m11q5knq1n9vx73515dpzw1mwxf7qin8qfb5ci21yxg91mww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37936,7 +38327,6 @@ self: { homepage = "http://github.com/danfran/cabal-macosx"; description = "Cabal support for creating Mac OSX application bundles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-meta" = callPackage @@ -38000,12 +38390,13 @@ self: { "cabal-plan" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , bytestring, containers, directory, filepath, mtl, text + , bytestring, containers, directory, filepath, mtl + , optparse-applicative, text }: mkDerivation { pname = "cabal-plan"; - version = "0.1.1.0"; - sha256 = "0sgaysfgv6z0mvyvzrly4xmj273mwq96zygbq6j5vjhqp1zdacxa"; + version = "0.2.0.0"; + sha256 = "1hxsrk6avv69gqajx94n2nzlivhy3ywwmlx6c0w2nnaz854j1ya0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38013,11 +38404,13 @@ self: { filepath text ]; executableHaskellDepends = [ - ansi-terminal base bytestring containers mtl text + 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 @@ -38058,8 +38451,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.11.1"; - sha256 = "1pqj1i22icx6fzhfy1nmkcnfazakx0240i9dg6pm9q0g97cqaknv"; + version = "0.11.2"; + sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38076,6 +38469,7 @@ self: { pname = "cabal-scripts"; version = "0.1.1"; sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of Cabal maintenance"; @@ -38205,13 +38599,12 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.8"; - sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x"; + version = "0.1.8.1"; + sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -38251,6 +38644,7 @@ self: { sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ archlinux base bytestring Cabal cmdargs containers directory filepath mtl pretty process @@ -38322,8 +38716,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.3.1"; - sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj"; + version = "2.4.1"; + sha256 = "0dplmm32kckb5mk2gfkw63qkakzbgz7f4j0scaj74ncga4vjkzxg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -38553,7 +38947,6 @@ self: { executableHaskellDepends = [ base ]; description = "A simple library to cache a single IO action with timeout"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-traversable" = callPackage @@ -38572,36 +38965,6 @@ self: { }) {}; "cacophony" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , criterion, cryptonite, deepseq, directory, exceptions, free - , hlint, lens, memory, monad-coroutine, mtl, safe-exceptions, text - , transformers - }: - mkDerivation { - pname = "cacophony"; - version = "0.9.2"; - sha256 = "05h30ixcw6m2ghy5m3cf1z4j8ips4h3ph6kgi78c3dp6491k6rpv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cryptonite exceptions free lens memory - monad-coroutine mtl safe-exceptions transformers - ]; - testHaskellDepends = [ - aeson async base base16-bytestring bytestring directory free hlint - lens memory mtl text - ]; - benchmarkHaskellDepends = [ - async base base16-bytestring bytestring criterion deepseq lens - memory - ]; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cacophony_0_10_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions , free, hlint, lens, memory, monad-coroutine, mtl, safe-exceptions @@ -38611,6 +38974,8 @@ self: { pname = "cacophony"; version = "0.10.0"; sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; + revision = "1"; + editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38627,7 +38992,6 @@ self: { homepage = "https://github.com/centromere/cacophony#readme"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caf" = callPackage @@ -38682,6 +39046,7 @@ self: { pname = "cairo"; version = "0.13.3.1"; sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring mtl text utf8-string @@ -38700,11 +39065,25 @@ self: { sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; }) {}; + "cairo-canvas" = callPackage + ({ mkDerivation, base, cairo, linear, mtl, random, time }: + mkDerivation { + pname = "cairo-canvas"; + version = "0.1.0.0"; + sha256 = "11qi0lnd8wlv2zz44lvd6336a6iz634n2rfk69qsh72vxrb3hd99"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base cairo linear mtl random time ]; + description = "Simpler drawing API for Cairo"; + license = stdenv.lib.licenses.mit; + }) {}; + "cake" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmdargs , containers, derive, directory, filepath, mtl, parsek, process @@ -38725,7 +39104,6 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake3" = callPackage @@ -38741,6 +39119,7 @@ self: { sha256 = "1f8vpm9a6rv7bgi9a8zarxa0jlph1p6hj1cdqzk5g81mr4dc4vkv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq directory filepath haskell-src-meta mime-types monadloc mtl parsec process syb @@ -38799,6 +39178,7 @@ self: { sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ]; homepage = "http://haskell.org/haskellwiki/Cal3d_animation"; description = "Examples for the Cal3d animation library"; @@ -38924,6 +39304,7 @@ self: { sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-portaudio boundingboxes colors containers control-bool deepseq directory filepath free freetype2 GLFW-b @@ -38931,6 +39312,7 @@ self: { OpenGL OpenGLRaw random template-haskell text transformers vector WAVE ]; + executableHaskellDepends = [ base lens ]; homepage = "https://github.com/fumieval/call"; description = "The call game engine"; license = stdenv.lib.licenses.bsd3; @@ -38938,19 +39320,19 @@ self: { }) {}; "call-haskell-from-anything" = callPackage - ({ mkDerivation, base, bytestring, msgpack, mtl, template-haskell - , vector + ({ mkDerivation, base, bytestring, data-msgpack, mtl + , storable-endian, template-haskell }: mkDerivation { pname = "call-haskell-from-anything"; - version = "1.0.1.0"; - sha256 = "1z5zyyara0g6inyjqhq26zvln926kln29avvllsg94agdwdbqcqs"; + version = "1.1.0.0"; + sha256 = "1ys5xjf1jvrr2nybv5lw36x59n4jnxwqfkf3hdmrdz770y08gp0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring msgpack mtl template-haskell vector + base bytestring data-msgpack mtl storable-endian template-haskell ]; - executableHaskellDepends = [ base bytestring msgpack mtl ]; + executableHaskellDepends = [ base bytestring data-msgpack mtl ]; homepage = "https://github.com/nh2/call-haskell-from-anything"; description = "Call Haskell functions from other languages via serialization and dynamic libraries"; license = stdenv.lib.licenses.mit; @@ -38971,46 +39353,16 @@ self: { }) {}; "camfort" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim - , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text - , transformers, uniplate, vector - }: - mkDerivation { - pname = "camfort"; - version = "0.901"; - sha256 = "0b4ryjyj4m65z96lnldasawhfiyd65nnxr7vp44y4jgn4z2rdbra"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers - uniplate vector - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text - transformers uniplate vector - ]; - testHaskellDepends = [ - array base bytestring containers directory filepath fortran-src - hmatrix hspec mtl QuickCheck text uniplate - ]; - description = "CamFort - Cambridge Fortran infrastructure"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "camfort_0_902" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim - , happy, hmatrix, hspec, lattices, matrix, mtl, partial-order - , QuickCheck, sbv, syb, syz, text, transformers, uniplate, vector + , happy, hmatrix, hspec, lattices, matrix, mtl + , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz + , text, transformers, uniplate, vector }: mkDerivation { pname = "camfort"; - version = "0.902"; - sha256 = "0pakm4zdygzxpfnvxmn88pc1y1dx33xw71lkg0hbxj1k4dn4651q"; + version = "0.904"; + sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39019,17 +39371,13 @@ self: { partial-order sbv syb syz text transformers uniplate vector ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl - partial-order QuickCheck sbv syb syz text transformers uniplate - vector - ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ array base binary bytestring containers directory filepath fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv text uniplate ]; + homepage = "https://camfort.github.io"; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -39043,6 +39391,7 @@ self: { sha256 = "0r6wzn9kxwinfa383lbxsjlrpv4v2m72qzpsyc9gcigvd5h7zhzz"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Imlib terminfo ]; homepage = "not yet available"; description = "write image files onto 256(or 24bit) color terminals"; @@ -39111,7 +39460,6 @@ 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 @@ -39212,6 +39560,7 @@ self: { sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base cmdargs ConfigFile containers directory dlist filepath language-c mtl pretty process yices @@ -39231,6 +39580,7 @@ self: { sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers haskell98 ]; description = "Interprets and debug the cap language"; license = stdenv.lib.licenses.bsd3; @@ -39358,6 +39708,7 @@ self: { sha256 = "0k0zqi6c6cqhkxhdgn5n5cpq4pjlvv1m5wzxrsiw9aj23dk9bgxa"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo directory filepath gtk gtk2hs-buildtools hcwiid highlighting-kate mtl pandoc pango process text time @@ -39365,7 +39716,6 @@ 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 @@ -39374,8 +39724,8 @@ self: { }: mkDerivation { pname = "carray"; - version = "0.1.6.7"; - sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9"; + version = "0.1.6.8"; + sha256 = "04qny61gcjblqjrz761wp4bdkxk6zbm31xn6h426iybw9kanf6cg"; libraryHaskellDepends = [ array base binary bytestring ix-shapable QuickCheck syb ]; @@ -39662,7 +40012,6 @@ self: { homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cash" = callPackage @@ -39673,6 +40022,7 @@ self: { pname = "cash"; version = "0.1.0.1"; sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq haskell98 HaXml network parallel pretty ]; @@ -39749,6 +40099,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-meta"; description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-meta-html" = callPackage @@ -39790,6 +40141,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-reports"; description = "CASR 61.345 logbook (casr-logbook) reports."; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-reports-html" = callPackage @@ -39831,6 +40183,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-reports-meta"; description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-reports-meta-html" = callPackage @@ -39872,6 +40225,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-types"; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassandra-cql" = callPackage @@ -39936,24 +40290,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cassava_0_5_0_0" = callPackage + "cassava_0_5_1_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring , bytestring-builder, containers, deepseq, hashable, HUnit, Only - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unordered-containers, vector + , QuickCheck, quickcheck-instances, scientific, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.5.0.0"; - sha256 = "1fdydyl2qn8qgjcrdij3gff13zwzp2fqmr3a8g0j35qfhq4lnzl4"; + version = "0.5.1.0"; + sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n"; libraryHaskellDepends = [ array attoparsec base bytestring bytestring-builder containers - deepseq hashable Only text unordered-containers vector + deepseq hashable Only scientific text unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector ]; homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; @@ -40012,10 +40367,8 @@ self: { }: mkDerivation { pname = "cassava-megaparsec"; - version = "0.1.0"; - sha256 = "00h7b5y8414nc4861mm3k4b7kjhwk2z3hl8l3viykidfcsbj4xwd"; - revision = "4"; - editedCabalFile = "17hi4p5bwpfpvh3va80xwp0icpspvg58g05w8ibh3mihdxr6sqff"; + version = "1.0.0"; + sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -40026,6 +40379,7 @@ self: { homepage = "https://github.com/stackbuilders/cassava-megaparsec"; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-streams" = callPackage @@ -40050,6 +40404,7 @@ self: { homepage = "https://github.com/pjones/cassava-streams"; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassette" = callPackage @@ -40092,6 +40447,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cast" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cast"; + version = "0.1.0.2"; + sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-patterns/cast#readme"; + description = "Abstact cast pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "castle" = callPackage ({ mkDerivation, base, containers, optparse-applicative, shelly , system-fileio, system-filepath, text @@ -40120,6 +40487,7 @@ self: { sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base gtk haskell98 mtl parsec ]; homepage = "http://code.atnnn.com/projects/casui"; description = "Equation Manipulator"; @@ -40263,7 +40631,6 @@ self: { ]; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -40323,6 +40690,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cbor-tool" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg + , cborg-json, filepath, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "cbor-tool"; + version = "0.1.0.0"; + sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cborg cborg-json filepath + scientific text unordered-containers vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A tool for manipulating CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , half, integer-gmp, primitive, text + }: + mkDerivation { + pname = "cborg"; + version = "0.1.1.0"; + sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj"; + revision = "1"; + editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim half integer-gmp + primitive text + ]; + description = "Concise Binary Object Representation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg-json" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cborg-json"; + version = "0.1.0.0"; + sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz"; + libraryHaskellDepends = [ + aeson aeson-pretty base cborg scientific text unordered-containers + vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A library for encoding JSON as CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cci" = callPackage ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers , filepath, mtl, pretty, process, random, time @@ -40473,6 +40895,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; + "celtchar" = callPackage + ({ mkDerivation, base, directory, file-embed, filepath, hspec + , megaparsec, mtl, ogmarkup, optparse-generic, pandoc + , raw-strings-qq, shakespeare, text, yaml + }: + mkDerivation { + pname = "celtchar"; + version = "0.1.0.1"; + sha256 = "19br3ygxn6r4qvix3d9dy71w5nwfxhy5h7qavpkk6k3nl6jmawaj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath megaparsec mtl ogmarkup pandoc shakespeare text yaml + ]; + executableHaskellDepends = [ + base directory file-embed filepath optparse-generic text + ]; + testHaskellDepends = [ base hspec raw-strings-qq ]; + homepage = "https://github.com/ogma-project/celtchar#readme"; + description = "A tool to build a novel"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cerberus" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cmdargs , conduit-extra, ekg, ekg-core, hslogger, http-client @@ -40646,7 +41092,6 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -40924,6 +41369,7 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; + executableHaskellDepends = [ base ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard"; description = "Combinators for building and processing 2D images"; license = stdenv.lib.licenses.bsd3; @@ -40949,6 +41395,7 @@ self: { pname = "chalmers-lava2000"; version = "1.6.1"; sha256 = "12cwp804z1grsn4pyygd2mffr5lm02g1rxibjill5wyd24k1brgb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base process random ]; homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf"; description = "Hardware description EDSL"; @@ -41032,7 +41479,6 @@ self: { homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "charsetdetect-ae" = callPackage @@ -41060,41 +41506,16 @@ self: { }) {}; "chart-unit" = callPackage - ({ mkDerivation, base, colour, containers, data-default, diagrams - , diagrams-core, diagrams-lib, diagrams-rasterific, diagrams-svg - , foldl, lens, primitive, protolude, random-fu, text + ({ 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.1.0.0"; - sha256 = "13jy5l4dqq4nbf6hhnxfhvk9sp3cv9vfkqarlrawrfj6p24mwgb2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base colour containers data-default diagrams diagrams-core - diagrams-lib diagrams-rasterific diagrams-svg foldl lens primitive - protolude text - ]; - executableHaskellDepends = [ - base containers diagrams diagrams-core diagrams-lib - diagrams-rasterific diagrams-svg foldl lens primitive protolude - random-fu text - ]; - homepage = "https://github.com/tonyday567/chart-unit"; - description = "A set of native haskell charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "chart-unit_0_3_2" = callPackage - ({ mkDerivation, ad, base, colour, diagrams-lib, diagrams-svg - , foldl, formatting, lens, linear, mwc-probability, mwc-random - , numhask, numhask-range, primitive, protolude, reflection, tasty - , tasty-hspec, tdigest, text - }: - mkDerivation { - pname = "chart-unit"; - version = "0.3.2"; - sha256 = "06yilm8ldkf59vxycydfhn990x6lmykgma2nwc87mxnqc6820a22"; + version = "0.4.1"; + sha256 = "0ry6j00rmkbv9z98d7i6zmj5sxh4ram4nyaw39k2kgaxkgfa1iag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41102,12 +41523,13 @@ self: { numhask numhask-range text ]; executableHaskellDepends = [ - ad base foldl mwc-probability mwc-random numhask primitive - protolude reflection tdigest text + 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 = "A set of native haskell charts"; + description = "Native haskell charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41149,6 +41571,7 @@ self: { sha256 = "1q2jb2hycxqa9ka9q7yyl5ckvcc1mdiklwivms1mm4qylwaqmgy0"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cereal cereal-text containers deepseq directory filepath fullstop hashable mbox MonadRandom parsec @@ -41186,7 +41609,6 @@ self: { homepage = "http://hub.darcs.net/enum/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-text" = callPackage @@ -41212,30 +41634,42 @@ self: { homepage = "http://hub.darcs.net/enum/chatty-utils"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatwork" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection - , data-default-class, http-client, http-client-tls, http-types, req - , text + , data-default-class, hspec, http-api-data, http-client + , http-client-tls, http-types, req, servant-server, text, warp }: mkDerivation { pname = "chatwork"; - version = "0.1.0.0"; - sha256 = "1harahpwd3m8d4qyf7lswhragpsin0qdj7j97jl482qkzvnpzbmf"; + version = "0.1.1.2"; + sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-client http-client-tls http-types req text + http-api-data http-client http-client-tls http-types req text + ]; + executableHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req 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 ]; 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, base, blaze-html, bytestring, containers - , data-default, mtl, syb, text, uniplate, xss-sanitize + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , data-default, http-types, mtl, syb, text, uniplate, wai + , wai-extra, xss-sanitize }: mkDerivation { pname = "cheapskate"; @@ -41249,10 +41683,33 @@ self: { 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 + }: + mkDerivation { + pname = "cheapskate"; + version = "0.1.1"; + sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html containers data-default deepseq mtl syb text + uniplate xss-sanitize + ]; executableHaskellDepends = [ base blaze-html bytestring text ]; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate-highlight" = callPackage @@ -41263,6 +41720,8 @@ self: { pname = "cheapskate-highlight"; version = "0.1.0.0"; sha256 = "0w6k694gmnx7h8ix79z8scsdl65zbilxni1vjr90ka2fdfrazxss"; + revision = "1"; + editedCabalFile = "1c8kxqdqf0j962xjdrrjfcbjsl0c1kax31rjykymv7w16d6hmlj4"; libraryHaskellDepends = [ base blaze-html cheapskate highlighting-kate text ]; @@ -41277,6 +41736,8 @@ self: { pname = "cheapskate-lucid"; version = "0.1.0.0"; sha256 = "0ibjfy5dbkizg8cw4avhwl62xpk735a1a7bc0nkhf9zxpq9fb0pm"; + revision = "1"; + editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc"; libraryHaskellDepends = [ base blaze-html cheapskate lucid ]; homepage = "http://github.com/aelve/cheapskate-lucid"; description = "Use cheapskate with Lucid"; @@ -41454,6 +41915,7 @@ self: { sha256 = "0i94impyhsrj4kg7mdr1xawmgalsfr3nsazl4v9ykhn3jam4kczb"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base digits either-unwrap generic-trie haskeline parsec ]; @@ -41476,6 +41938,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "choice_0_2_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "choice"; + version = "0.2.2"; + sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mboes/choice#readme"; + description = "A solution to boolean blindness"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "choose" = callPackage ({ mkDerivation, base, MonadRandom }: mkDerivation { @@ -41509,8 +41984,8 @@ self: { }: mkDerivation { pname = "chorale"; - version = "0.1.7"; - sha256 = "0p8y4lg53gp4wbvb23l9bjy6hn1w1kpwwil02np9acjrxvifjyjw"; + version = "0.1.8"; + sha256 = "0k7xavjscl0xpjrz0w3nh473clkaw58126xch66qykm3l361zgc4"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers HUnit ieee754 QuickCheck safe test-framework @@ -41675,6 +42150,7 @@ self: { pname = "chu2"; version = "2012.11.20"; sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default hack2 hack2-handler-snap-server utf8-string @@ -41761,6 +42237,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "church-pair" = callPackage + ({ mkDerivation, base, bifunctors, semigroups, transformers }: + mkDerivation { + pname = "church-pair"; + version = "0.1.0.1"; + sha256 = "1vrbfmzsysfqdxfah54w9kw0j9qaa0f514yz7qzflp8qgah6rckk"; + libraryHaskellDepends = [ + base bifunctors semigroups transformers + ]; + description = "Church encoded pair"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cielo" = callPackage ({ mkDerivation, aeson, base, bytestring, convertible, data-default , hspec, http-client, http-types, lens, mtl, pretty-show @@ -42066,6 +42555,7 @@ self: { pname = "citation-resolve"; version = "0.4.3"; sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring citeproc-hs containers curl data-default directory download-curl either lens mtl process safe text @@ -42089,6 +42579,7 @@ self: { pname = "citeproc-hs"; version = "0.3.10"; sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory filepath hexpat hs-bibutils HTTP json mtl network network-uri old-locale pandoc-types parsec @@ -42169,6 +42660,7 @@ self: { pname = "cjk"; version = "0.1.0.1"; sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers text text-icu ]; @@ -42212,6 +42704,7 @@ self: { sha256 = "1llr7mnlh8msn9plgnnj73w3jqlcwn8v9k2m58520l9q2zfvf68b"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base bytestring cmdargs containers data-stringmap directory executable-path file-embed filepath HTTP json-builder @@ -42246,6 +42739,7 @@ self: { sha256 = "1jv1bl9fzbahhk0g64n611h9hipkr4zcasj2dw5w5v2nqlwrwdjj"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base clafer containers data-stringmap directory executable-path filepath haskeline HaXml json-builder mtl @@ -42275,6 +42769,7 @@ self: { pname = "claferwiki"; version = "0.4.5"; sha256 = "0rjppdxxzaf3898jklq4c0b7zjnkg6zcqr5nxbrabmvm2l53a4p0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network network-uri process SHA split time transformers transformers-compat @@ -42288,8 +42783,8 @@ self: { "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant - , inline-c, microlens, microlens-contra, singletons, stm - , template-haskell, vector + , hashable, inline-c, lens, microlens, microlens-contra, singletons + , stm, template-haskell, unordered-containers, vector }: mkDerivation { pname = "clang-pure"; @@ -42302,6 +42797,9 @@ self: { microlens-contra singletons stm template-haskell vector ]; librarySystemDepends = [ clang ]; + executableHaskellDepends = [ + base bytestring hashable lens unordered-containers + ]; description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -42391,7 +42889,6 @@ 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 @@ -42418,7 +42915,6 @@ 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 @@ -42434,7 +42930,6 @@ self: { ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage @@ -42463,7 +42958,6 @@ 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 @@ -42472,6 +42966,7 @@ self: { pname = "clash-prelude-quickcheck"; version = "0.1.2.1"; sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clash-prelude QuickCheck ]; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; @@ -42486,6 +42981,7 @@ self: { pname = "clash-systemverilog"; version = "0.7.2"; sha256 = "056m8ynwq3y11zkkx9nkkmvamnm2m3337vk8lkx90pk96nvdiaiy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -42493,7 +42989,6 @@ 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 @@ -42504,6 +42999,7 @@ self: { pname = "clash-verilog"; version = "0.7.2"; sha256 = "09bfrhhiml6m0qssvr18p38ypyxj1zp7vxgci974gd6k597ihi2k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -42511,7 +43007,6 @@ 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 @@ -42522,6 +43017,7 @@ self: { pname = "clash-vhdl"; version = "0.7.2"; sha256 = "1c63m2gcifak0v38rsmv4j521br84jaspdb193a66957qisvfsvs"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -42529,7 +43025,6 @@ 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 @@ -42605,7 +43100,6 @@ self: { 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 @@ -42627,7 +43121,6 @@ self: { 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 @@ -42647,7 +43140,6 @@ self: { 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 @@ -42672,7 +43164,6 @@ self: { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -42689,8 +43180,9 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.3"; - sha256 = "1c0y9aw48qq7zyg8958lk5kzmfaa8ndgw88ps92sx5aj4z0ggsmf"; + version = "0.24.0.4"; + sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -42763,6 +43255,7 @@ self: { pname = "clckwrks-plugin-bugs"; version = "0.7.5"; sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base cereal clckwrks clckwrks-plugin-page containers directory filepath happstack-authenticate happstack-hsp @@ -42786,8 +43279,9 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.17.2"; - sha256 = "0aqal0r72zbjximdkc9g3252f8iq1qz7sphp53s5z3w5cnwrsfv8"; + version = "0.6.17.3"; + sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -42801,6 +43295,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-plugin-mailinglist" = callPackage + ({ mkDerivation, acid-state, attoparsec, base, bytestring, clckwrks + , containers, directory, filepath, happstack-authenticate + , happstack-hsp, happstack-server, hsp, HStringTemplate, hsx2hs + , html-email-validate, ixset, lens, mime-mail, mtl, network-uri + , reform, reform-happstack, reform-hsp, safecopy, text, time, uuid + , uuid-orphans, web-plugins, web-routes, web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-mailinglist"; + version = "0.3.0.2"; + sha256 = "1zhcqkzas3pcnviwka0v174spq8wn457kvmxk6nafcxkwf27p52m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + acid-state attoparsec base bytestring clckwrks containers directory + filepath happstack-authenticate happstack-hsp happstack-server hsp + HStringTemplate hsx2hs html-email-validate ixset lens mime-mail mtl + network-uri reform reform-happstack reform-hsp safecopy text time + uuid uuid-orphans web-plugins web-routes web-routes-th + ]; + homepage = "http://www.clckwrks.com/"; + description = "mailing list plugin for clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-plugin-media" = callPackage ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal , clckwrks, containers, directory, filepath, gd, happstack-server @@ -42810,8 +43330,9 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.3"; - sha256 = "1kslj1yvw6kn68grcr7drhrybb1b5d1id5plcaa4570yz8vp7xr6"; + version = "0.6.16.4"; + sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -42835,8 +43356,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.9"; - sha256 = "1r239fmplhg787vimppax5nfs6asd8ssgakr8yvpqqlb3zqrac2f"; + version = "0.4.3.10"; + sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -42859,6 +43380,7 @@ self: { pname = "clckwrks-theme-bootstrap"; version = "0.4.2.1"; sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins @@ -42877,6 +43399,7 @@ self: { pname = "clckwrks-theme-clckwrks"; version = "0.5.2.1"; sha256 = "14pksv77afppp43dfba5f4brnycqhca2kylvb1bpjdb61lni9sk7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks containers happstack-authenticate hsp hsx2hs mtl text web-plugins @@ -42893,6 +43416,7 @@ self: { pname = "clckwrks-theme-geo-bootstrap"; version = "0.1.1"; sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks hsp text ]; homepage = "http://divshot.github.com/geo-bootstrap/"; description = "geo bootstrap based template for clckwrks"; @@ -42912,6 +43436,7 @@ self: { homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clean-home" = callPackage @@ -42923,13 +43448,13 @@ self: { sha256 = "1c6gn0rkb3c92hgc1blkbf21s62j1r7vqs2p8mmr6my5g52lvif1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs containers directory HSH IfElse ]; homepage = "https://github.com/ivanperez-keera/clean-home"; description = "Keep your home dir clean by finding old conf files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clean-unions" = callPackage @@ -43113,6 +43638,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clingo" = callPackage + ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions + , hashable, mtl, StateVar, text, transformers, wl-pprint-text + }: + mkDerivation { + pname = "clingo"; + version = "0.2.0.0"; + sha256 = "1swc0fkzfsrg29jcncaskj167j0bk4y21irna8p7v9b1wp4yhnc3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors deepseq exceptions hashable mtl StateVar text + transformers wl-pprint-text + ]; + librarySystemDepends = [ clingo ]; + homepage = "https://github.com/tsahyt/clingo-haskell#readme"; + description = "Haskell bindings to the Clingo ASP solver"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {clingo = null;}; + "clippard" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -43150,6 +43696,7 @@ self: { sha256 = "1nsvhb7lbkclhqpbvs3ccwclpr4g8p6zmsyn072bc0d0icf4hql5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default functor-infix old-locale parsec strptime time ]; @@ -43176,7 +43723,6 @@ self: { homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clit" = callPackage @@ -43200,6 +43746,7 @@ self: { homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Post tweets from stdin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloben" = callPackage @@ -43341,30 +43888,31 @@ self: { }) {}; "cloud-seeder" = callPackage - ({ mkDerivation, amazonka, amazonka-cloudformation, amazonka-core - , base, bytestring, deepseq, exceptions, fast-logger, hspec, lens - , monad-control, monad-logger, monad-time, mtl - , optparse-applicative, text, transformers, transformers-base + ({ mkDerivation, aeson, amazonka, amazonka-cloudformation + , amazonka-core, base, bytestring, containers, deepseq, exceptions + , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock + , mtl, optparse-applicative, text, transformers, transformers-base + , unordered-containers, uuid, yaml }: mkDerivation { pname = "cloud-seeder"; - version = "0.0.0.0"; - sha256 = "1nh0qmj1fdxkqa2db8xpv7anrlqyl7dcphjd25qgq86gjcdn27bb"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.0"; + sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f"; libraryHaskellDepends = [ - amazonka amazonka-cloudformation amazonka-core base deepseq - exceptions lens monad-control monad-logger monad-time mtl + aeson amazonka amazonka-cloudformation amazonka-core base + containers deepseq exceptions lens monad-control monad-logger mtl optparse-applicative text transformers transformers-base + unordered-containers uuid yaml ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - amazonka-cloudformation base bytestring deepseq fast-logger hspec - lens monad-logger mtl text transformers + amazonka-cloudformation base bytestring containers deepseq + fast-logger hspec lens monad-logger monad-mock mtl + optparse-applicative text transformers yaml ]; homepage = "https://github.com/cjdev/cloud-seeder#readme"; description = "A tool for interacting with AWS CloudFormation"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudfront-signer" = callPackage @@ -43429,8 +43977,8 @@ self: { }: mkDerivation { pname = "clr-bindings"; - version = "0.1.0.0"; - sha256 = "1rqj81bzqhfz32sf6yningzpd4xp32myknnv0c1vbzkz19cklma1"; + version = "0.2.0"; + sha256 = "1q2s4bg4lilcn9pfp14vj11m67l4f3lpqr5h1j17mklzp5cbhv85"; libraryHaskellDepends = [ base clr-host clr-marshal clr-typed pipes template-haskell text ]; @@ -43462,6 +44010,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + "clr-host_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory + , file-embed, filepath, glib, mono, text, transformers + }: + mkDerivation { + pname = "clr-host"; + version = "0.2.0"; + sha256 = "0x40zbdzj6zkb3k41z1ncdphnny4wyxlbw9n734h4qdqw093vcvv"; + setupHaskellDepends = [ + base Cabal directory filepath transformers + ]; + libraryHaskellDepends = [ + base bytestring clr-marshal file-embed text + ]; + 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; + 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 @@ -43471,6 +44041,8 @@ self: { 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 @@ -43484,6 +44056,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clr-inline_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , clr-host, clr-marshal, containers, criterion, directory, extra + , filepath, here, hspec, lens, parsec, process, split + , template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "clr-inline"; + version = "0.2.0"; + sha256 = "0s9f2y5ykfsq3sw52mxmvwih946ah9gv48pqma8nql9k0xx905ww"; + libraryHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers directory extra filepath here lens parsec process split + template-haskell temporary text transformers + ]; + testHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers directory extra filepath here hspec lens parsec process + split template-haskell temporary text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers criterion directory extra filepath here lens parsec + process split template-haskell temporary text transformers + ]; + 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-marshal" = callPackage ({ mkDerivation, base, clr-host, text }: mkDerivation { @@ -43496,16 +44099,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clr-marshal_0_2_0_0" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "clr-marshal"; + version = "0.2.0.0"; + sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1"; + libraryHaskellDepends = [ base text ]; + 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 - ({ mkDerivation, base, clr-marshal, ghc-prim, text, tuple }: + ({ mkDerivation, base, clr-marshal, ghc-prim, hspec, text, tuple }: mkDerivation { pname = "clr-typed"; - version = "0.1.0.0"; - sha256 = "07qi8g7lh8h9lph088p5zx4qjp6na1239pwjr5s8lgiq069gmn99"; - revision = "1"; - editedCabalFile = "02fsha9hir0yqnn9b9dgpg345313n660j9mhdmsya0r3k8fhmn2b"; + version = "0.2.0"; + sha256 = "1ay3970fccvr4hbmv5dah2qdxv51q09n1v3m9wkj62mbpsp3zk2y"; libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base clr-marshal hspec text ]; 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; @@ -43621,6 +44235,7 @@ self: { sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bio bytestring containers QuickCheck regex-compat simpleargs ]; @@ -43656,6 +44271,7 @@ self: { pname = "cmaes"; version = "0.2.2.1"; sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl process safe strict syb ]; testHaskellDepends = [ base doctest doctest-prop mtl process random syb vector @@ -43670,8 +44286,8 @@ self: { }: mkDerivation { pname = "cmark"; - version = "0.5.5.1"; - sha256 = "03asbd7vnjjnxppvaxz8jinkafh53kqrhp1ji051yq8amgr63d32"; + version = "0.5.6"; + sha256 = "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -43682,6 +44298,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.3"; + sha256 = "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + homepage = "https://github.com/kivikakk/cmark-gfm-hs"; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -43689,6 +44323,8 @@ self: { pname = "cmark-highlight"; version = "0.2.0.0"; sha256 = "0aw1y0bl7ddvm4ai66x7apdijw6mza272ir8jkbdbz6k0gbrqxny"; + revision = "1"; + editedCabalFile = "1zdxr3bfj9bn2yclm5m17aa7wid6zwhvg6mj245wd2y34p696znw"; libraryHaskellDepends = [ base blaze-html cmark highlighting-kate text ]; @@ -43703,12 +44339,26 @@ self: { pname = "cmark-lucid"; version = "0.1.0.0"; sha256 = "00rwiax7dd01259vrdkv574zi58agr17p7jkzixgwchfxngpp4nj"; + revision = "1"; + editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5"; libraryHaskellDepends = [ base cmark lucid ]; homepage = "http://github.com/aelve/cmark-lucid"; description = "Use cmark with Lucid"; license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-patterns" = callPackage + ({ mkDerivation, base, cmark }: + mkDerivation { + pname = "cmark-patterns"; + version = "0.1.0.0"; + sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f"; + libraryHaskellDepends = [ base cmark ]; + homepage = "http://github.com/aelve/cmark-patterns"; + description = "Pattern synonyms for cmark"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark-sections" = callPackage ({ mkDerivation, base, base-prelude, cmark, containers, hspec , microlens, QuickCheck, split, text @@ -43726,6 +44376,7 @@ self: { homepage = "http://github.com/aelve/cmark-sections"; description = "Represent cmark-parsed Markdown as a tree of sections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmath" = callPackage @@ -43792,6 +44443,9 @@ self: { libraryHaskellDepends = [ base filepath process template-haskell transformers ]; + executableHaskellDepends = [ + base filepath process template-haskell transformers + ]; homepage = "https://github.com/ndmitchell/cmdargs#readme"; description = "Command line argument processing"; license = stdenv.lib.licenses.bsd3; @@ -43807,6 +44461,7 @@ self: { sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cmdargs directory filepath http-types process text transformers wai wai-handler-launch @@ -43968,6 +44623,7 @@ self: { pname = "cndict"; version = "0.8.2"; sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; @@ -44020,7 +44676,6 @@ self: { homepage = "https://github.com/chpatrick/codec"; description = "Simple bidirectional serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codec-libevent" = callPackage @@ -44064,8 +44719,8 @@ self: { }: mkDerivation { pname = "codec-rpm"; - version = "0.1.1"; - sha256 = "0qn79jr1z382kf08r5v48lj1zpsi88sxsvi0vwkv3ijz7gfx2lni"; + version = "0.1.2"; + sha256 = "15rdraaqzgp7qga8075rfk1vg2w10vj47nnfb584acc66gsc0k8i"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring conduit conduit-combinators conduit-extra mtl parsec pretty resourcet text @@ -44076,6 +44731,7 @@ self: { homepage = "https://github.com/weldr/codec-rpm"; description = "A library for manipulating RPM files"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codecov-haskell" = callPackage @@ -44181,7 +44837,6 @@ 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 @@ -44250,6 +44905,7 @@ self: { sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base binary bytestring containers directory filepath glib gtk3 lens monad-control monad-logger mtl persistent @@ -44429,16 +45085,21 @@ self: { }) {}; "collection-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, text }: + ({ mkDerivation, aeson, base, network-uri, QuickCheck + , quickcheck-instances, test-invariant, text + }: mkDerivation { pname = "collection-json"; - version = "0.1.0.0"; - sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; - libraryHaskellDepends = [ aeson base bytestring text ]; - homepage = "https://github.com/danchoi/collection-json.hs"; - description = "Collection+JSON hypermedia type tools"; + version = "1.0.1.0"; + sha256 = "1vq21mjc0zfn1q1mwscq3m5j3dls8dsfcanc9n8kp3sz4lz2f3zw"; + libraryHaskellDepends = [ aeson base network-uri text ]; + testHaskellDepends = [ + aeson base network-uri QuickCheck quickcheck-instances + test-invariant text + ]; + homepage = "https://github.com/alunduil/collection-json.hs"; + description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -44500,14 +45161,14 @@ self: { "colonnade" = callPackage ({ mkDerivation, base, bytestring, contravariant, doctest - , profunctors, text, vector + , profunctors, semigroups, text, vector }: mkDerivation { pname = "colonnade"; - version = "1.1.0"; - sha256 = "1z7a4c4yim89yqsb1jnhml115lfri8j1nrdq2q4km64fxgi90vp8"; + version = "1.1.1"; + sha256 = "1qivzd143lk68k6dp8flj1265x8gw9zhs76bsvmhx6kq139qldhf"; libraryHaskellDepends = [ - base bytestring contravariant profunctors text vector + base bytestring contravariant profunctors semigroups text vector ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/andrewthad/colonnade#readme"; @@ -44527,6 +45188,7 @@ self: { sha256 = "0vyzjv5r9jww4n35yp9qmq5bb8h7k6gmr7iw6igm08cnlwx9pirr"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base colour containers data-default directory friday friday-devil split v4l2 vector vector-space yaml @@ -44601,6 +45263,7 @@ self: { pname = "colour"; version = "2.3.3"; sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; @@ -44613,11 +45276,12 @@ self: { pname = "colour-accelerate"; version = "0.1.0.0"; sha256 = "1clcn0ipcrifcxqqb72k1xnga005v1ih79q8164ycsh2hgkdm4ij"; + revision = "2"; + editedCabalFile = "0izp44hlzg267mi2hrf96mfzpyvk8jp0b0p6y9lb1vs624a1gy4c"; libraryHaskellDepends = [ accelerate base ]; 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 @@ -44656,6 +45320,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "columbia" = callPackage + ({ mkDerivation, array, base, bytestring, containers, contravariant + , data-endian, directory, filelock, invariant, mmap, mmorph + , monad-loops, mtl, parallel, pointless-haskell, syb-with-class + , transformers + }: + mkDerivation { + pname = "columbia"; + version = "0.1.0.2"; + sha256 = "152f43s2dm81amag28kav9a1gfyg97rxhd2dm3ivip98j8p1d6j0"; + libraryHaskellDepends = [ + array base bytestring containers contravariant data-endian + directory filelock invariant mmap mmorph monad-loops mtl parallel + pointless-haskell syb-with-class transformers + ]; + description = "Enhanced serialization for media that support seeking"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "com" = callPackage ({ mkDerivation }: mkDerivation { @@ -44686,7 +45370,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinat-diagrams" = callPackage @@ -44704,7 +45387,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Graphical representations for various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinator-interactive" = callPackage @@ -44793,7 +45475,6 @@ self: { homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comic" = callPackage @@ -44806,7 +45487,6 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comma" = callPackage @@ -44887,7 +45567,6 @@ self: { ]; description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "commsec" = callPackage @@ -44951,8 +45630,10 @@ self: { }: mkDerivation { pname = "comonad"; - version = "5.0.1"; - sha256 = "0ga67ynh1j4ylbn3awjh7iga09fypbh4fsa21mylcf4xgmlzs7sn"; + version = "5.0.2"; + sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; + revision = "1"; + editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -45032,8 +45713,8 @@ self: { homepage = "https://github.com/ezyang/compact"; description = "Non-GC'd, contiguous storage for immutable data structures"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghc-compact = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "compact-map" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers }: @@ -45067,8 +45748,8 @@ self: { homepage = "https://github.com/andrewthad/compact-mutable#readme"; description = "Mutable arrays living on the compact heap"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghc-compact = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "compact-socket" = callPackage ({ mkDerivation, base, binary, bytestring, compact, deepseq @@ -45123,15 +45804,14 @@ 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 ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { pname = "compactmap"; - version = "0.1.4.2"; - sha256 = "1v7ndhp36sx67r3f6sj5iiqs2sfqx4niidy3hfhvnillyb181z9n"; + version = "0.1.4.2.1"; + sha256 = "0x7ps0pnjnyfr2pyjk839z7dwidizkcqwi29zxy2pgvq5856w5i2"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A read-only memory-efficient key-value store"; @@ -45245,8 +45925,8 @@ self: { }: mkDerivation { pname = "compensated"; - version = "0.7.1"; - sha256 = "05vpx3jqb8m1naz1ka88kl2jfcf9snfhizb5mg6z2vf1w4axj7w6"; + version = "0.7.2"; + sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -45258,7 +45938,6 @@ self: { homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "competition" = callPackage @@ -45309,11 +45988,12 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; + revision = "1"; + editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "complex-integrate" = callPackage @@ -45345,6 +46025,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composable-associations" = callPackage + ({ mkDerivation, base, lens, tasty, tasty-hunit }: + mkDerivation { + pname = "composable-associations"; + version = "0.1.0.0"; + sha256 = "03l056yb6k8x5xrfdszsn4w2739zyiqzrl6q3ci19dg1gsy106lx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base lens tasty tasty-hunit ]; + homepage = "https://github.com/SamProtas/composable-associations#readme"; + description = "Types and helpers for composing types into a single larger key-value type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composable-associations-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, composable-associations + , doctest, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers + }: + mkDerivation { + pname = "composable-associations-aeson"; + version = "0.1.0.0"; + sha256 = "0kragi8wfd30yxrndxka5p3bivj1qi8svljcdkqnji32dpnm9myv"; + libraryHaskellDepends = [ + aeson base composable-associations text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/SamProtas/composable-associations#readme"; + description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compose-ltr" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -45379,8 +46092,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.4.2.0"; - sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; + version = "0.5.0.0"; + sha256 = "1h8kn3isnxx1qqd50h5af8rk9i88nfb7iiqjfy1kwszvjq6qap3p"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -45396,7 +46109,6 @@ 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 @@ -45405,15 +46117,14 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.4.2.0"; - sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5"; + version = "0.5.0.0"; + sha256 = "0s09qmr6rjkm28jz78cg9bz1zqhv0mlp7g5wpy9c7cblwz5wf4qd"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; 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 @@ -45423,8 +46134,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.4.2.0"; - sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; + version = "0.5.0.0"; + sha256 = "18fqmawlh5i4j04vj5kfqhb7cqlzfvv9326fqs3m4yzwh7zrmiqk"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -45436,7 +46147,6 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-ekg" = callPackage @@ -45445,34 +46155,37 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.4.2.0"; - sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; + version = "0.5.0.0"; + sha256 = "0q74j2jnzdj79srziz1ldpjs4xcysjr1dp9b8fsg4bghwfnkc7sc"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "EKG Metrics for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-opaleye" = callPackage - ({ mkDerivation, base, bytestring, composite-base, lens, opaleye - , postgresql-simple, product-profunctors, profunctors - , template-haskell, text, vinyl + ({ mkDerivation, base, bytestring, composite-base, hspec, lens + , opaleye, postgresql-simple, product-profunctors, profunctors + , QuickCheck, template-haskell, text, vinyl }: mkDerivation { pname = "composite-opaleye"; - version = "0.4.2.0"; - sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; + version = "0.5.0.0"; + sha256 = "0s9nf2nyz7knpcx0x1y0ck8x1cjxdmsdrc1nvqyb1264lkd863cj"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl ]; + testHaskellDepends = [ + base bytestring composite-base hspec lens opaleye postgresql-simple + product-profunctors profunctors QuickCheck template-haskell text + vinyl + ]; 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 @@ -45496,6 +46209,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "0.1.0.4"; + sha256 = "1246cp3b8rg923qd9nvar5h9ph2zlbgsxn08xl408fj0cp1l2l3p"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/composition-prelude#readme"; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -45597,12 +46322,12 @@ self: { , constraints, containers, control-monad-loop, convertible , criterion, deepseq, dlist, entropy, equational-reasoning , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit - , hybrid-vectors, 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 + , 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 }: mkDerivation { pname = "computational-algebra"; @@ -45619,12 +46344,18 @@ self: { sized tagged template-haskell text type-natural unamb unordered-containers vector ]; + executableHaskellDepends = [ + algebra algebraic-prelude base constraints convertible criterion + deepseq equational-reasoning hmatrix lens matrix MonadRandom + parallel random reflection semigroups singletons sized type-natural + vector + ]; testHaskellDepends = [ algebra base constraints containers convertible deepseq - equational-reasoning hspec HUnit lens matrix MonadRandom - monomorphic process QuickCheck quickcheck-instances reflection - singletons sized smallcheck tagged test-framework - test-framework-hunit text type-natural vector + equational-reasoning hspec HUnit lazysmallcheck lens matrix + MonadRandom monomorphic process QuickCheck quickcheck-instances + reflection singletons sized smallcheck tagged test-framework + test-framework-hunit text transformers type-natural vector ]; benchmarkHaskellDepends = [ algebra base constraints containers criterion deepseq @@ -45742,6 +46473,7 @@ self: { sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring concraft containers double-conversion lazy-io moan network sgd split tagset-positional text @@ -45764,6 +46496,7 @@ self: { sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring concraft containers lazy-io mtl network process sgd split tagset-positional text transformers @@ -45776,25 +46509,36 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, filepath, hashable, megaparsec, mtl - , optparse-applicative, process, QuickCheck, scientific, tar, text - , thrift, time, unordered-containers, uuid, vector, zlib + ({ mkDerivation, 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 }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.8"; - sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm"; + version = "0.1.0.15"; + sha256 = "1g6nqr82gr5937irjs2h6ybp024k6gzpmpx1lsri8yw70kxgryjl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers directory filepath hashable - megaparsec mtl process QuickCheck scientific tar text thrift time - unordered-containers uuid vector zlib + 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 ]; executableHaskellDepends = [ - base bytestring containers directory filepath optparse-applicative - process text vector zlib + 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 + ]; + 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 ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -45802,6 +46546,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concrete-haskell-autogen" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck + , text, thrift, unordered-containers, vector + }: + mkDerivation { + pname = "concrete-haskell-autogen"; + version = "0.0.0.1"; + sha256 = "09y6jj0f7kaibn9imnk6wrhkn1yq1dpjxr8pqdizqqm5dwrwy94m"; + libraryHaskellDepends = [ + base bytestring containers hashable QuickCheck text thrift + unordered-containers vector + ]; + homepage = "https://github.com/hltcoe"; + description = "Automatically generated Thrift definitions for the Concrete data format"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concrete-relaxng-parser" = callPackage ({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties , hxt-curl, hxt-relaxng, hxt-tagsoup @@ -45812,6 +46574,7 @@ self: { sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs containers hxt hxt-charproperties hxt-curl hxt-relaxng hxt-tagsoup @@ -45841,25 +46604,6 @@ self: { }) {}; "concurrency" = callPackage - ({ mkDerivation, array, atomic-primops, base, exceptions - , monad-control, mtl, stm, transformers - }: - mkDerivation { - pname = "concurrency"; - version = "1.0.0.0"; - sha256 = "17giki6hz7ilyddlk8xs37izqb5nbxx0j54j7744wihq1irrw7sl"; - revision = "1"; - editedCabalFile = "140wmmhg9gxlw15h92jnqiq19wpdkj7dii16613bllc40kmzmq1x"; - libraryHaskellDepends = [ - array atomic-primops base exceptions monad-control mtl stm - transformers - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Typeclasses, functions, and data types for concurrency and STM"; - license = stdenv.lib.licenses.mit; - }) {}; - - "concurrency_1_1_2_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: @@ -45874,7 +46618,6 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Typeclasses, functions, and data types for concurrency and STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-barrier" = callPackage @@ -45891,21 +46634,22 @@ self: { "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns - , hashable, hspec, iproute, network, stm, time + , hspec, iproute, lifted-base, monad-control, network, psqueues + , stm, time, transformers }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.0.1"; - sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2"; + version = "0.1.0"; + sha256 = "0bi3mlv2gi8adgh8zmh51idrnbsap15f2kybligccf9b6pcvpljr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; executableHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; @@ -45957,8 +46701,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.7.9"; - sha256 = "1m8h9qp0k3dacawf1r8hsk3dnrswvw03cp0zfqwbp5a7sa2rcg1l"; + version = "1.9.2"; + sha256 = "1wyrna3j4zg0qiyx8w5kfk6j3k33acrv2677g11f3njwvcx45hiv"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -46200,6 +46944,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, containers, deepseq + , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans + , stm-conduit, test-framework, test-framework-hunit + , test-framework-th, transformers, unix + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.2.0"; + sha256 = "17b2j4pm6d2r80q0f33sa1iyfxszmk5lgf94qdw9hbwhs6g7rfjb"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory filepath mtl resourcet + stm stm-chans stm-conduit transformers unix + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory filepath HUnit mtl + resourcet stm stm-chans stm-conduit test-framework + test-framework-hunit test-framework-th transformers unix + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -46396,8 +47167,8 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.1"; - sha256 = "01dcnvs82mvp7wv5vbkwhq2sary87mss71mc6mmhlngkyis558jl"; + version = "0.1.1.2"; + sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -46560,13 +47331,14 @@ self: { }: mkDerivation { pname = "config-ini"; - version = "0.1.2.0"; - sha256 = "05gfqyrqnvnn0hy145vf9g7iiyariqj7gqacckdib8zv8msvg8nk"; + version = "0.1.2.1"; + sha256 = "14yq2yssk13ip0iz7q7wl3gp9k575wcj3h7c603halkdqf17iibi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base megaparsec text transformers unordered-containers ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ base directory doctest ini microlens QuickCheck text unordered-containers @@ -46586,6 +47358,7 @@ self: { pname = "config-manager"; version = "0.3.0.1"; sha256 = "1qrj0x2s0vsxnqkkmchwqvsmziqchrffaxkda9hx0s0ahyw5w0lb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath parsec text time unordered-containers ]; @@ -46661,7 +47434,7 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, directory, either, functor-infix , hspec, hspec-discover, mtl, pretty-show, QuickCheck, safe - , scientific, string-conversions, template-haskell + , scientific, string-conversions, template-haskell, text , unordered-containers, vector, yaml }: mkDerivation { @@ -46675,6 +47448,9 @@ self: { functor-infix mtl safe string-conversions template-haskell unordered-containers vector yaml ]; + executableHaskellDepends = [ + base bytestring mtl pretty-show string-conversions text yaml + ]; testHaskellDepends = [ aeson aeson-pretty base case-insensitive hspec hspec-discover mtl pretty-show QuickCheck scientific string-conversions @@ -46729,6 +47505,40 @@ self: { 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 + , 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.3.0"; + sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -46738,6 +47548,7 @@ self: { pname = "configurator"; version = "0.3.0.0"; sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring directory hashable text unix-compat unordered-containers @@ -46779,6 +47590,7 @@ self: { pname = "configurator-ng"; version = "0.0.0.1"; sha256 = "0aq1iyvd3b2d26myp0scwi9vp97grfcrp2802s4xpg84vpapldis"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring critbit data-ordlist directory dlist fail hashable scientific text unix-compat unordered-containers @@ -46798,8 +47610,8 @@ self: { }: mkDerivation { pname = "confsolve"; - version = "0.5.5"; - sha256 = "0wwrjrjp3biai2sg8aylqbw7nv2sd41xnqy6826i2knmjj3inqrg"; + version = "0.5.6"; + sha256 = "0bsribar35vrq1q22nijxgnymkbrfa49vyvfa60ink8wj7q47jzp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46845,6 +47657,7 @@ self: { sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers filepath html HTTP mtl network old-time parsec pretty random stm unix @@ -46990,7 +47803,6 @@ self: { homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-dynamic" = callPackage @@ -47094,7 +47906,6 @@ 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 @@ -47138,18 +47949,16 @@ self: { "consumers" = callPackage ({ mkDerivation, base, containers, exceptions, hpqtypes - , lifted-base, lifted-threads, log, monad-control, mtl, stm, time - , transformers-base + , lifted-base, lifted-threads, log-base, monad-control, mtl, stm + , time, transformers-base }: mkDerivation { pname = "consumers"; - version = "2.0"; - sha256 = "15ar527x015hxbqwf49xfacg1w975zir61kaq5054pyfshgg0yj6"; - revision = "1"; - editedCabalFile = "1j4034gsibz22cwh3vqjb0lyvdibn2y3nkmj2bmzwdjw5s110x2z"; + version = "2.0.0.1"; + sha256 = "1hpqn3bd4d08is0lczn1cgr9kl0s5rz719p8a2n1qyjriibrh7k1"; libraryHaskellDepends = [ - base containers exceptions hpqtypes lifted-base lifted-threads log - monad-control mtl stm time transformers-base + base containers exceptions hpqtypes lifted-base lifted-threads + log-base monad-control mtl stm time transformers-base ]; homepage = "https://github.com/scrive/consumers"; description = "Concurrent PostgreSQL data consumers"; @@ -47348,8 +48157,10 @@ self: { }) {}; "continuum" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb - , mtl, nanomsg-haskell, time + ({ mkDerivation, base, bytestring, cereal, containers, data-default + , foldl, hyperleveldb, leveldb-haskell-fork, mtl, nanomsg-haskell + , parallel-io, resourcet, stm, suspend, time, timers, transformers + , transformers-base }: mkDerivation { pname = "continuum"; @@ -47360,6 +48171,11 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; + executableHaskellDepends = [ + base bytestring cereal containers data-default foldl + leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm + suspend time timers transformers transformers-base + ]; executableSystemDepends = [ hyperleveldb ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -47424,6 +48240,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "control-dotdotdot" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "control-dotdotdot"; + version = "0.1.0.0"; + sha256 = "0wacfs0s0dy2vzj8yxm3zqsjc93fm8m4iiw5x92wpiz2z2lm3k8d"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/erisco/control-dotdotdot"; + description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-event" = callPackage ({ mkDerivation, base, containers, stm, time }: mkDerivation { @@ -47869,10 +48697,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "2.2.0"; - sha256 = "0ls81h1akdvpzgmicv55qi2w1zjxjsz264wkzdgl6qzvpd465djs"; - revision = "3"; - editedCabalFile = "0v3dmjz234kfjggrk7m2zwh03q6sgnmb3y4mizqc4qd9acnlhrjm"; + version = "2.2.1"; + sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47895,8 +48721,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "2.2.0"; - sha256 = "173ydqyr2y4plhk1a8vlkvagk13yjrk65jd9h0hd08fv899gbfg9"; + version = "2.2.1"; + sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47917,8 +48743,8 @@ self: { }: mkDerivation { pname = "copilot-cbmc"; - version = "2.2.0"; - sha256 = "03mf7kr808ww39a6g1brih8in7q8v4j9gz649kl4p1i8kk4fd7xc"; + version = "2.2.1"; + sha256 = "0xcm6qgylhvnjaih1jbl4dripik10nqm6536rdspj6kzg81qifd9"; libraryHaskellDepends = [ base bytestring copilot-c99 copilot-core copilot-sbv directory pretty process @@ -47934,8 +48760,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "2.2.0"; - sha256 = "18b0y28c40hbx2wpc7xim5dh3ph0g0lh9ksl6sq7jqfnaiwnr6ia"; + version = "2.2.1"; + sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105"; libraryHaskellDepends = [ base containers dlist mtl pretty pretty-ncols random ]; @@ -47949,10 +48775,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "2.2.0"; - sha256 = "0z0jpwq5zx6f6fp6xk58n2s66d7r2ngd3xbkiabhd7w1a22wkfrm"; - revision = "1"; - editedCabalFile = "1bshf179n6l1svv86n46rk7pxdlas8nx6haj1fni9xg45ggipdks"; + version = "2.2.1"; + sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -47968,12 +48792,12 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "2.2.0"; - sha256 = "0aqbyms7d33vklm702j36a4vw1m674h7zbqkzbkn6yzxnz76gbm6"; + version = "2.2.1"; + sha256 = "0ashnay40kkbysnbz8ay0r7ljzwkx07m4z960kfjnh3y6s5qk6ww"; libraryHaskellDepends = [ array base containers copilot-language mtl parsec ]; - homepage = "https://github.com/leepike/copilot-libraries"; + homepage = "https://github.com/Copilot-Language/copilot-libraries"; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47985,8 +48809,8 @@ self: { }: mkDerivation { pname = "copilot-sbv"; - version = "2.2.0"; - sha256 = "1blxhpv9ipamd2p40cdpbsx6dp27rrzqaj2rn0a6p11wz8378rcd"; + version = "2.2.1"; + sha256 = "00gym2xadw7zi5mrkfrnvxi6cr7c5rgmbwiflrif63j2q7v0z25l"; libraryHaskellDepends = [ base containers copilot-core directory filepath pretty sbv ]; @@ -48001,8 +48825,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "2.2.0"; - sha256 = "037kbhl86h6yrfjr3fyvrbxy1mkm5akic4gnxgsrbing5yylhjf2"; + version = "2.2.1"; + sha256 = "1qw46k26f6cisyjmjn0d9g7sjkx67vpydiqm7l9f1hib4dygcznx"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default directory mtl parsec pretty process random smtlib2 transformers xml @@ -48051,8 +48875,8 @@ self: { }: mkDerivation { pname = "core-compiler"; - version = "0.1.0.1"; - sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns"; + version = "0.1.0.2"; + sha256 = "1bz7lxklbsw12y0v89nvrcyy7m35zb0cldn0wzyxz4h5szx5cji6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48063,7 +48887,6 @@ self: { homepage = "https://github.com/aneksteind/Core#readme"; description = "compile your own mini functional language with Core"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -48094,6 +48917,7 @@ self: { sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers directory filepath filestore http-types monads-tf pandoc template-haskell text time @@ -48313,16 +49137,16 @@ self: { }) {}; "country" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive - , text, unordered-containers + ({ mkDerivation, aeson, attoparsec, base, bytestring, ghc-prim + , hashable, primitive, scientific, text, unordered-containers }: mkDerivation { pname = "country"; - version = "0.1.1"; - sha256 = "00fmbljb9s1nfhgcv52ka9mavfqp6ljx6nzw5jmy8f1j8rvx49l6"; + version = "0.1.3"; + sha256 = "0gn73gkfqn4iy9zjbkzf5x65pljg82hm6dvi7fb81hxswwm50qbs"; libraryHaskellDepends = [ - base bytestring ghc-prim hashable primitive text - unordered-containers + aeson attoparsec base bytestring ghc-prim hashable primitive + scientific text unordered-containers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/andrewthad/country#readme"; @@ -48331,7 +49155,9 @@ self: { }) {}; "country-codes" = callPackage - ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }: + ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup + , text + }: mkDerivation { pname = "country-codes"; version = "0.1.3"; @@ -48339,6 +49165,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base shakespeare text ]; + executableHaskellDepends = [ base tagsoup text ]; testHaskellDepends = [ aeson base HTF HUnit ]; homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; @@ -48380,6 +49207,7 @@ self: { sha256 = "1yv3lj86fkaf9mfxb97ic5v8hm4xx0vv3q4qj0c9n0ki21ymsa5z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring directory filepath old-locale optparse-applicative process stm text time unix @@ -48490,6 +49318,7 @@ self: { pname = "cprng-aes"; version = "0.6.1"; sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring cipher-aes crypto-random ]; @@ -48529,6 +49358,7 @@ self: { sha256 = "079v1k1m61n3hrmz6lkdg400r3nn9fq8bwmy477vjjnyjvm1j38f"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers parallel ]; description = "Symbolic cryptographic protocol analyzer"; license = stdenv.lib.licenses.bsd3; @@ -48542,6 +49372,7 @@ self: { sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://github.com/vincenthz/hs-cpu"; description = "Cpu information and properties helpers"; @@ -48623,7 +49454,6 @@ self: { homepage = "https://gitlab.com/twittner/cql/"; description = "Cassandra CQL binary protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cql-io" = callPackage @@ -48646,7 +49476,6 @@ self: { homepage = "https://gitlab.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs" = callPackage @@ -48819,6 +49648,7 @@ self: { sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs directory process shelly text transformers unix ]; @@ -48944,13 +49774,16 @@ self: { }: mkDerivation { pname = "crawlchain"; - version = "0.1.2.0"; - sha256 = "17rvn7yxcaz7zya358rnvw9imf0b660s4hnk8ds81c8pvshc65hh"; + version = "0.2.0.0"; + sha256 = "0fs8996lzwibnqcaq3j5zgw7alnq8y1k3xqylpdgcp06p7na744q"; libraryHaskellDepends = [ base bytestring directory http-streams network-uri split tagsoup text time ]; - testHaskellDepends = [ base split tagsoup ]; + testHaskellDepends = [ + base bytestring directory http-streams network-uri split tagsoup + text time + ]; description = "Simulation user crawl paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -49056,14 +49889,12 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.16"; - sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx"; - revision = "1"; - editedCabalFile = "0vna37j7y2bzvhizizi69gghqqpz32w0aasy9xdaxpwq4y8wc83c"; + version = "5.9.20"; + sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1"; libraryHaskellDepends = [ - array base bytestring cereal cond directory exceptions filepath - gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process - random split time transformers unix zlib + array base binary bytestring cereal cond directory exceptions + filepath gray-extended hdaemonize hsyslog MonadRandom mtl + old-locale process random split time transformers unix zlib ]; testHaskellDepends = [ array base binary cereal directory filepath hsyslog HUnit @@ -49263,6 +50094,7 @@ self: { 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 @@ -49278,7 +50110,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_1_0" = callPackage + "criterion_1_2_2_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 @@ -49289,10 +50121,11 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.1.0"; - sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r"; + version = "1.2.2.0"; + sha256 = "0cc95hp5l7srjs5471lpdvx9hihvvi5rabrqqpy6blnrhpf9jwfz"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat binary bytestring cassava code-page containers deepseq directory exceptions filepath Glob @@ -49350,6 +50183,7 @@ self: { sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers filepath ]; @@ -49405,6 +50239,7 @@ self: { homepage = "https://github.com/amarpotghan/crjdt-haskell#readme"; description = "A Conflict-Free Replicated JSON Datatype for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crockford" = callPackage @@ -49462,6 +50297,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_6_0" = 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.6.0"; + sha256 = "0s40b0dlkrwhx3sqbca0a883wd54xbkgqfz4w0ncmsb06x3sdx04"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cron-compat" = callPackage ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -49563,6 +50423,7 @@ self: { pname = "crypto-api-tests"; version = "0.3"; sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal crypto-api directory filepath HUnit QuickCheck test-framework test-framework-hunit @@ -49620,6 +50481,7 @@ self: { pname = "crypto-cipher-types"; version = "0.0.9"; sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring securemem ]; homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Generic cryptography cipher types"; @@ -49677,8 +50539,23 @@ self: { pname = "crypto-enigma"; version = "0.0.2.8"; sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q"; - revision = "1"; - editedCabalFile = "0zm90nv4asr28pbwl2x96hbr50v0d4y3zjsmlz80gsm7cqj6hz3s"; + revision = "4"; + editedCabalFile = "1rvcphwavb3ns46fankpdlkz8rwl3rn591zlkmx0zdy3vygpwsfg"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/orome/crypto-enigma-hs"; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "crypto-enigma_0_0_2_9" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.9"; + sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -49706,7 +50583,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 @@ -49927,6 +50803,7 @@ self: { homepage = "https://github.com/libscott/cryptoconditions-hs"; description = "Interledger Crypto-Conditions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptohash" = callPackage @@ -49976,6 +50853,7 @@ self: { pname = "cryptohash-cryptoapi"; version = "0.1.4"; sha256 = "13h5f9pmcd0swa4asl7wzpf5lskpgjdqrmy1mqdc78gsxdj8cyki"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal crypto-api cryptonite memory tagged ]; @@ -50072,25 +50950,24 @@ self: { ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, criterion, deepseq , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc - , monad-control, monadLib, old-time, presburger, pretty, process - , QuickCheck, random, sbv, simple-smt, smtLib, syb - , template-haskell, text, tf-random, transformers + , monad-control, monadLib, mtl, old-time, presburger, pretty + , process, QuickCheck, random, sbv, simple-smt, smtLib, syb + , template-haskell, text, tf-random, time, transformers , transformers-base, utf8-string }: mkDerivation { pname = "cryptol"; - version = "2.4.0"; - sha256 = "0k814z5y7aypbpvggsiy86l5fcgcf0rfc7575jsjb7226kvp2i6k"; - revision = "1"; - editedCabalFile = "1waln79xzki1l2r1xziy2dd007q8yfsbihhp9qsxxpcpl6qmzvib"; + version = "2.5.0"; + sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base base-compat bytestring containers deepseq directory filepath gitrev GraphSCC heredoc monad-control monadLib - old-time presburger pretty process QuickCheck random sbv simple-smt - smtLib syb template-haskell text tf-random transformers - transformers-base utf8-string + mtl old-time presburger pretty process QuickCheck random sbv + simple-smt smtLib syb template-haskell text tf-random time + transformers transformers-base utf8-string ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -50098,34 +50975,15 @@ self: { filepath haskeline monad-control monadLib process random sbv tf-random transformers ]; - benchmarkHaskellDepends = [ base criterion deepseq text ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory filepath sbv text + ]; homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim - , integer-gmp, memory, tasty, tasty-hunit, tasty-kat - , tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.21"; - sha256 = "1vk209rylnn3zmvf9p8sflpyk31bc4cx71hq3cb69yn3w6p6d6k3"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base byteable bytestring memory tasty tasty-hunit tasty-kat - tasty-quickcheck - ]; - homepage = "https://github.com/haskell-crypto/cryptonite"; - description = "Cryptography Primitives sink"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cryptonite_0_23" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, foundation , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck @@ -50146,6 +51004,29 @@ self: { 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 + }: + mkDerivation { + pname = "cryptonite"; + version = "0.24"; + sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -50172,25 +51053,6 @@ self: { }) {}; "cryptonite-openssl" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, memory, openssl - , tasty, tasty-hunit, tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite-openssl"; - version = "0.5"; - sha256 = "0p72kkf2cxb90mndqjlvmgjz2brr9iwkm1b20lcnqsfk1c1w42x1"; - libraryHaskellDepends = [ base bytestring cryptonite memory ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ - base bytestring cryptonite tasty tasty-hunit tasty-kat - tasty-quickcheck - ]; - homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; - description = "Crypto stuff using OpenSSL cryptographic library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openssl;}; - - "cryptonite-openssl_0_6" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, openssl , tasty, tasty-hunit, tasty-kat, tasty-quickcheck }: @@ -50207,7 +51069,6 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; description = "Crypto stuff using OpenSSL cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "cryptsy-api" = callPackage @@ -50261,15 +51122,14 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.0"; - sha256 = "1fxmfwc8ksyzjxjj64zbzgqgs0kk74a6rx6xqlyqg331drdrh00y"; + version = "0.7.1"; + sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; 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 @@ -50280,8 +51140,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.2.1"; - sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq"; + version = "5.2.2"; + sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -50298,8 +51158,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.0"; - sha256 = "1x16h3zfxmmbkjc6l2w4q5j5q4v9b7x7p9dn8b8f113z73zc8djq"; + version = "0.3.2"; + sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -50326,17 +51186,19 @@ self: { "csound-expression-typed" = callPackage ({ mkDerivation, base, Boolean, colour, containers - , csound-expression-dynamic, data-default, deepseq, ghc-prim - , hashable, NumInstances, temporal-media, transformers, wl-pprint + , csound-expression-dynamic, data-default, deepseq, directory + , filepath, ghc-prim, hashable, NumInstances, temporal-media + , transformers, wl-pprint }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.0.1"; - sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af"; + version = "0.2.0.2"; + sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic - data-default deepseq ghc-prim hashable NumInstances temporal-media - transformers wl-pprint + data-default deepseq directory filepath ghc-prim hashable + NumInstances temporal-media transformers wl-pprint ]; homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; @@ -50347,8 +51209,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.8.0"; - sha256 = "18igbiwn8rc6q5w2fddhqp2m823fagcx6d2d5ma05l8milci2j1r"; + version = "0.0.8.1"; + sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -50367,7 +51229,6 @@ self: { testHaskellDepends = [ base nondeterminism tasty tasty-hunit ]; description = "Discrete constraint satisfaction problem (CSP) solver"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cspmchecker" = callPackage @@ -50420,6 +51281,8 @@ self: { pname = "css-syntax"; version = "0.0.5"; sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r"; + revision = "1"; + editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap"; libraryHaskellDepends = [ attoparsec base bytestring scientific text ]; @@ -50473,6 +51336,10 @@ self: { mtl primitive resourcet text transformers unordered-containers vector ]; + executableHaskellDepends = [ + base bytestring containers directory mtl primitive text + transformers vector + ]; testHaskellDepends = [ base bytestring containers directory HUnit mtl primitive test-framework test-framework-hunit text transformers vector @@ -50480,7 +51347,6 @@ self: { homepage = "http://github.com/ozataman/csv-conduit"; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csv-enumerator" = callPackage @@ -50625,6 +51491,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers STL ]; + executableHaskellDepends = [ + base bytestring cereal containers hspec STL + ]; testHaskellDepends = [ base bytestring cereal containers hspec STL ]; @@ -50652,33 +51521,14 @@ self: { }) {}; "cubicbezier" = callPackage - ({ mkDerivation, base, containers, integration, matrices, microlens - , microlens-mtl, microlens-th, mtl, parsec, tasty, tasty-hunit - , vector - }: - mkDerivation { - pname = "cubicbezier"; - version = "0.5.0.0"; - sha256 = "0275g74bmmv0z89vx84v5r555ixlq6bsz1l889da905w0wkpkhln"; - libraryHaskellDepends = [ - base containers integration matrices microlens microlens-mtl - microlens-th mtl vector - ]; - testHaskellDepends = [ base parsec tasty tasty-hunit ]; - description = "Efficient manipulating of 2D cubic bezier curves"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cubicbezier_0_6_0_3" = callPackage ({ mkDerivation, base, containers, fast-math, integration, matrices , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty , tasty-hunit, vector, vector-space }: mkDerivation { pname = "cubicbezier"; - version = "0.6.0.3"; - sha256 = "05bkjjfbmmfc4mwvcpsnr3wrwf07bv9xdv3v6n7gwblnx5ywapjn"; + version = "0.6.0.4"; + sha256 = "1bdrl26fm09vmmwdlg09ihq3b42qbz7dphzq03b983zlzrj1064f"; libraryHaskellDepends = [ base containers fast-math integration matrices microlens microlens-mtl microlens-th mtl vector vector-space @@ -50732,7 +51582,6 @@ self: { executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cuda" = callPackage @@ -50776,8 +51625,9 @@ self: { }: mkDerivation { pname = "cue-sheet"; - version = "0.1.0"; - sha256 = "1w85vl2nkw3qy7sjpl3hafvsz79vbasgkr6w0s89p1dk7sdkckfb"; + version = "0.1.1"; + sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec mtl QuickCheck text @@ -50788,24 +51638,25 @@ 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; }) {}; - "cue-sheet_0_1_1" = callPackage + "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 = "0.1.1"; - sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd"; + version = "1.0.0"; + sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec mtl QuickCheck text ]; testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec QuickCheck text + base bytestring exceptions hspec hspec-megaparsec megaparsec + QuickCheck text ]; homepage = "https://github.com/mrkkrp/cue-sheet"; description = "Support for construction, rendering, and parsing of CUE sheets"; @@ -50871,6 +51722,19 @@ self: { license = "unknown"; }) {}; + "currencies" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "currencies"; + version = "0.1.1.0"; + sha256 = "07mkzn12rwlgfv7l0b507sqhl2hw56clmj6sfj0cmdyq9i75lj55"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/alx741/currencies#readme"; + description = "Currencies representation, pretty printing and conversion"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "currency" = callPackage ({ mkDerivation, base, containers, hashable, iso3166-country-codes }: @@ -50942,6 +51806,7 @@ self: { sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ filepath ]; executableHaskellDepends = [ base containers curry-base mtl old-time pretty syb @@ -51013,6 +51878,7 @@ self: { pname = "curves"; version = "1.1.0.2"; sha256 = "074gc55yf09949yqgal830plz2408zk86mdfx4n864xxdksklfda"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers filepath HaXml JuicyPixels QuickCheck ]; @@ -51079,7 +51945,6 @@ self: { libraryHaskellDepends = [ arithmoi base containers ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -51108,6 +51973,8 @@ self: { pname = "czipwith"; version = "1.0.0.0"; sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5"; + revision = "1"; + editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; homepage = "https://github.com/lspitzner/czipwith/"; @@ -51187,6 +52054,7 @@ self: { pname = "daemonize-doublefork"; version = "0.1.1"; sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory unix ]; homepage = "https://github.com/scvalex/daemonize-doublefork"; description = "Start background daemons by double-forking"; @@ -51204,6 +52072,7 @@ self: { sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal data-default directory filepath ghc-prim network pipes transformers unix @@ -51461,6 +52330,7 @@ self: { sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory html HUnit mtl old-time parsec process QuickCheck regex-compat unix @@ -51521,6 +52391,7 @@ self: { sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory HaXml mtl process ]; @@ -51536,6 +52407,7 @@ self: { pname = "darcs-scripts"; version = "0.1.1"; sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of darcs workflow"; @@ -51601,6 +52473,7 @@ self: { sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cgi concurrentoutput containers Crypto directory filepath HTTP mime-string mtl nano-md5 network old-locale old-time @@ -51801,8 +52674,8 @@ self: { }: mkDerivation { pname = "data-accessor-template"; - version = "0.2.1.13"; - sha256 = "0n1rg8g1ln2kncbv16dr93sqj624bfyic4r253vfr731sf2p757a"; + version = "0.2.1.14"; + sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -51960,8 +52833,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.1.0"; - sha256 = "1dkd2qshc2srfafhbhqnq70hks74ngnqbmzdiiaccylx2cpbs2ms"; + version = "0.1.2.0"; + sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -52061,7 +52934,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "A class for types with a default value"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-generics" = callPackage @@ -52108,7 +52980,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-case-insensitive" = callPackage @@ -52123,7 +52994,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instance for CI type from case-insensitive package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-containers" = callPackage @@ -52158,7 +53028,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types in newer versions of base package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-old-locale" = callPackage @@ -52184,7 +53053,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) Text and Text Builder"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-unordered-containers" = callPackage @@ -52201,7 +53069,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for unordered-containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-vector" = callPackage @@ -52216,7 +53083,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types defined in vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-dispersal" = callPackage @@ -52243,18 +53109,55 @@ self: { }) {}; "data-diverse" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }: + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: mkDerivation { pname = "data-diverse"; - version = "0.5.0.0"; - sha256 = "0cr67dpfbzayw2hhg8zf4yqwgbkjn5dislh7r96fjz1mkif6m0zz"; - libraryHaskellDepends = [ base containers ghc-prim lens tagged ]; - testHaskellDepends = [ base hspec lens tagged ]; + version = "0.8.1.0"; + sha256 = "1lav14j4p01wym8s7j3haliiaj16lyglw5bbp7gn2xk3xg7z1k3p"; + 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; }) {}; + "data-diverse_0_9_0_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "0.9.0.1"; + sha256 = "155zq4pn68wxw096i7w6k68rpaxhcyjqjhhc89yvky22nvv67yq4"; + 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 { + pname = "data-diverse-lens"; + version = "0.1.1.0"; + sha256 = "0arwpab3a88jdpcg1pnj96dfdhfnnzf5za3l8cfwzbsjrc5ddl44"; + libraryHaskellDepends = [ base data-diverse 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; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell @@ -52478,8 +53381,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "data-flags"; - version = "0.0.3.3"; - sha256 = "1aps6v8kl168k211gm96mm7i07zkmm5j9j4kl7wwaicblpb91qx1"; + version = "0.0.3.4"; + sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/mvv/data-flags"; description = "A package for working with bit masks and flags in general"; @@ -52502,11 +53405,11 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "data-forest"; - version = "0.1.0.4"; - sha256 = "0nq0y7s4lciaghf0d3xcpy13na7cv3irvr07gq7k3f75lzjj4309"; + version = "0.1.0.5"; + sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/data-forest"; description = "A simple multi-way tree data structure"; license = stdenv.lib.licenses.asl20; }) {}; @@ -52559,6 +53462,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-has_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, transformers }: + mkDerivation { + pname = "data-has"; + version = "0.3.0.0"; + sha256 = "0ybkm9zvl0l60f44p80fislbdmwwhavqz31wymnikjsyc01x899w"; + libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion transformers ]; + homepage = "https://github.com/winterland1989/data-has"; + description = "Simple extensible product"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-hash" = callPackage ({ mkDerivation, array, base, containers, QuickCheck , test-framework, test-framework-quickcheck2 @@ -52693,6 +53610,7 @@ self: { homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-fd" = callPackage @@ -52707,6 +53625,7 @@ self: { homepage = "http://github.com/roconnor/data-lens-fd/"; description = "Lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-ixset" = callPackage @@ -52745,6 +53664,7 @@ self: { homepage = "http://github.com/roconnor/data-lens-template/"; description = "Utilities for Data.Lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-list-sequences" = callPackage @@ -52822,7 +53742,6 @@ self: { homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-msgpack-types" = callPackage @@ -52959,10 +53878,11 @@ self: { pname = "data-pprint"; version = "0.2.4.1"; sha256 = "10qg7sa64l7sjm6f9xx00nqddmxccj4h1apv4wwqhh8y7vlal1hc"; + revision = "1"; + editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-quotientref" = callPackage @@ -53019,6 +53939,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base ]; homepage = "http://ku-fpg.github.io/software/data-reify/"; description = "Reify a recursive data structure into an explicit graph"; license = stdenv.lib.licenses.bsd3; @@ -53209,6 +54130,7 @@ self: { homepage = "http://github.com/alistra/data-structure-inferrer"; description = "Program that infers the fastest data structure available for your program"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-sword" = callPackage @@ -53217,8 +54139,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.2.0.1"; - sha256 = "1l84ygal3zr9s8g8jshckgn922fjn06n9191v5k4hj2sa798wd6j"; + version = "0.2.0.2"; + sha256 = "1m14vxfx5raiy5b6w3602hkqywc0gj4yv38mjbwncbic86g6rgn2"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -53294,6 +54216,8 @@ self: { pname = "data-tree-print"; version = "0.1.0.0"; sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; + revision = "1"; + editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436"; libraryHaskellDepends = [ base pretty syb ]; homepage = "https://github.com/lspitzner/data-tree-print"; description = "Print Data instances as a nested tree"; @@ -53410,7 +54334,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataflow" = callPackage @@ -53483,41 +54406,44 @@ self: { license = "GPL"; }) {}; - "datasets" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, directory - , file-embed, filepath, hashable, HTTP, stringsearch, text, time - , vector + "datarobot" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, microlens + , network-uri, safe, scientific, string-conversions, text + , unordered-containers, vector, wreq }: mkDerivation { - pname = "datasets"; - version = "0.2.1"; - sha256 = "0xqjxgpdmbdmi28d5wr3sxz9n3km3i0s0i8668d9p2rmjf89wgdg"; + pname = "datarobot"; + version = "0.1.1"; + sha256 = "1dcr0jnd7wgxplzfgbkbv79civ80iqzlz2nvp3s6hv5zyzbf2pm9"; libraryHaskellDepends = [ - aeson base bytestring cassava directory file-embed filepath - hashable HTTP stringsearch text time vector + aeson base bytestring exceptions microlens network-uri safe + scientific string-conversions text unordered-containers vector wreq ]; - homepage = "https://github.com/glutamate/datasets"; - description = "Classical data sets for statistics and machine learning"; - license = stdenv.lib.licenses.mit; + testHaskellDepends = [ + aeson base bytestring exceptions microlens network-uri safe + scientific string-conversions text unordered-containers vector wreq + ]; + homepage = "https://github.com/orbital/datarobot-haskell#readme"; + description = "Client for DataRobot API"; + license = stdenv.lib.licenses.bsd3; }) {}; - "datasets_0_2_4" = callPackage + "datasets" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava , directory, file-embed, filepath, hashable, microlens , stringsearch, text, time, vector, wreq }: mkDerivation { pname = "datasets"; - version = "0.2.4"; - sha256 = "1l5djdv1fvqymkc5q10zwzhjwphxpw1wpr5d8rqf3z2kym3k0h2r"; + version = "0.2.5"; + sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs"; libraryHaskellDepends = [ aeson attoparsec base bytestring cassava directory file-embed filepath hashable microlens stringsearch text time vector wreq ]; - homepage = "https://github.com/filopodia/open/datasets"; + homepage = "https://github.com/diffusionkinetics/open/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataurl" = callPackage @@ -53674,8 +54600,8 @@ self: { ({ mkDerivation, base, hspec, postgresql-simple, text }: mkDerivation { pname = "dbcleaner"; - version = "0.1.1"; - sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc"; + version = "0.1.3"; + sha256 = "0d8ghd4i7qq3zp1vmxvsx7s66ip3qqfzacfnb2n4i3cdd7hv05q8"; libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; description = "Clean database tables automatically around hspec tests"; @@ -53749,6 +54675,7 @@ self: { sha256 = "1zhvl6h32y9hd1drv0ipm13si0cqf83i9kxnyivp4j1l5h4b55dx"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring configurator containers directory fgl filepath HDBC HUnit mtl random split template-haskell text time yaml-light @@ -53761,7 +54688,6 @@ self: { ]; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-mysql" = callPackage @@ -53986,6 +54912,7 @@ self: { homepage = "https://github.com/anatolat/dcpu16#readme"; description = "DCPU-16 Emulator & Assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddate" = callPackage @@ -54043,6 +54970,7 @@ self: { pname = "ddc-code"; version = "0.4.3.2"; sha256 = "19ah5j1l84g06szyaf0qni89cqdnpygrlczppzx3qjl280q1qpzd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ]; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler base libraries"; @@ -54351,21 +55279,21 @@ self: { ({ mkDerivation, base, bytestring, bzlib, containers, directory , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl , network, network-uri, old-locale, parsec, pretty, process - , process-extras, pureMD5, regex-compat, regex-tdfa + , process-extras, pureMD5, regex-compat, regex-tdfa, SHA , template-haskell, text, time, unix, Unixutils, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.91.2"; - sha256 = "0mhd5q2lx8x6ldijfk1w8ghpgncism10yyar5d39an7gcbalmc8n"; + version = "3.93.2"; + sha256 = "1a1brh07lvrchdll0aabmzikv7inlbaspx0nv3xa94cmzkgvr30l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bzlib containers directory either exceptions filepath HaXml HUnit ListLike mtl network network-uri old-locale parsec pretty process process-extras pureMD5 regex-compat - regex-tdfa template-haskell text time unix Unixutils utf8-string - zlib + regex-tdfa SHA template-haskell text time unix Unixutils + utf8-string zlib ]; executableHaskellDepends = [ base directory filepath HaXml pretty process unix @@ -54387,7 +55315,6 @@ self: { libraryHaskellDepends = [ base directory filepath HSH ]; description = "Utilities to work with debian binary packages"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debian-build" = callPackage @@ -54431,8 +55358,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20170510"; - sha256 = "0lxzy58a1qyl3vwhn9faiibsfrkaqxylvsdxhfki1x03amwzwnyw"; + version = "1.20170810"; + sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -54475,19 +55402,37 @@ self: { }) {}; "decimal-arithmetic" = callPackage - ({ mkDerivation, base, doctest, mtl, QuickCheck }: + ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec + , mtl, QuickCheck + }: mkDerivation { pname = "decimal-arithmetic"; - version = "0.4.0.0"; - sha256 = "03sd7d8lq9k8laqxvlfablrzfxb0kjrb48gby3sbdf0qrhplccmn"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base doctest QuickCheck ]; + version = "0.5.0.0"; + sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j"; + libraryHaskellDepends = [ base binary binary-bits deepseq mtl ]; + testHaskellDepends = [ base binary doctest hspec QuickCheck ]; homepage = "https://github.com/verement/decimal-arithmetic#readme"; description = "An implementation of the General Decimal Arithmetic Specification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "decimal-literals" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "decimal-literals"; + version = "0.1.0.0"; + sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7"; + revision = "1"; + editedCabalFile = "14qc6k8bjsixk5bzqwir1lbs1kqnl0a1py7779a63civv2ph5g5v"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + 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 ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive @@ -54548,6 +55493,7 @@ self: { sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ time unix ]; executableHaskellDepends = [ base bytestring containers directory filepath haskell-src-exts @@ -54618,17 +55564,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deepseq_1_4_2_0" = callPackage - ({ mkDerivation, array, base, HUnit, test-framework + "deepseq_1_4_3_0" = callPackage + ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.2.0"; - sha256 = "0la9x4hvf1rbmxv8h9dk1qln21il3wydz6wbdviryh4h2wls22ny"; + version = "1.4.3.0"; + sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ - array base HUnit test-framework test-framework-hunit + array base ghc-prim HUnit test-framework test-framework-hunit ]; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; @@ -54871,16 +55817,16 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, deepseq, dpor - , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, mtl, random, ref-fd, semigroups, transformers , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.4.0.0"; - sha256 = "1m40vxsscrq6bwy80n9c6gxw5lifnisva6qac35p7rfcj32r4v47"; + version = "0.7.1.1"; + sha256 = "0mqi2jswdk9qid8h5q24ay2h0p3x48i8yz5m0hnwnvqv966lgq7v"; libraryHaskellDepends = [ - base concurrency containers deepseq dpor exceptions monad-loops mtl + base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; @@ -54888,15 +55834,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_0_7_0_2" = callPackage + "dejafu_0_7_1_2" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, mtl, random, ref-fd, semigroups, transformers , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.7.0.2"; - sha256 = "0l2as53zmsr94sf2kh1h5mj1ra1gpnzik2yqj0nj56cxys6sm6iy"; + version = "0.7.1.2"; + sha256 = "07ilcx6j4y587vda3y6maqjzn00zx9lz7mlgp2c1rhikbyk5dn03"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -55014,6 +55960,7 @@ self: { pname = "delimiter-separated"; version = "0.1.0.0"; sha256 = "17ff9ipsnqicjkwsfg7zfb5gm0k9scsb44dl82gmf8i0f0nnd0h6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base uhc-util uulib ]; homepage = "https://github.com/atzedijkstra/delimiter-separated"; description = "Library for dealing with tab and/or comma (or other) separated files"; @@ -55055,6 +56002,7 @@ self: { sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers monad-atom nlp-scores text ]; @@ -55217,6 +56165,7 @@ self: { sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bio bytestring cmdargs directory process regex-compat ]; @@ -55286,8 +56235,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.2"; - sha256 = "0chig7nl4d6j4asvkk9sd4pyg647ca09mwwzzg5bkh6y91aj161g"; + version = "2.6.3"; + sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55362,15 +56311,14 @@ self: { homepage = "https://github.com/sboosali/derive-monoid#readme"; description = "derive Semigroup/Monoid/IsList"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-storable" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.0.6"; - sha256 = "04mhv66rjbr4dg9din9frhwgv5cx5jxs0v4z2p9m36lmw0lhyak9"; + version = "0.1.1.0"; + sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -55671,27 +56619,25 @@ self: { "dhall" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive - , charset, containers, http-client, http-client-tls, lens - , neat-interpolation, optparse-generic, parsers, system-fileio - , system-filepath, tasty, tasty-hunit, text, text-format - , transformers, trifecta, unordered-containers, vector + , charset, containers, contravariant, http-client, http-client-tls + , lens, optparse-generic, parsers, system-fileio, system-filepath + , tasty, tasty-hunit, text, text-format, transformers, trifecta + , unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.4.2"; - sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d"; + version = "1.5.1"; + sha256 = "0hrxrchcs7853gys85niqmngvpd3fla59ca11npw5h0aznbj6ymk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring case-insensitive charset containers - http-client http-client-tls lens neat-interpolation parsers + contravariant http-client http-client-tls lens parsers system-fileio system-filepath text text-format transformers trifecta unordered-containers vector ]; executableHaskellDepends = [ base optparse-generic text trifecta ]; - testHaskellDepends = [ - base neat-interpolation tasty tasty-hunit text vector - ]; + testHaskellDepends = [ base tasty tasty-hunit text vector ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55703,8 +56649,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.2"; - sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2"; + version = "1.0.3"; + sha256 = "0hh0fvsvfqgq42yzmgr5ipyhf18iqqk54265pzsrfmanpbfwrycr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55716,6 +56662,7 @@ self: { ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-check" = callPackage @@ -55743,8 +56690,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.0.3"; - sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy"; + version = "1.0.5"; + sha256 = "00f57ah2s43x2n4f3ykl9bjkh3yik8h47br7s63061xl49m4q4k8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55755,6 +56702,7 @@ self: { ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -55763,8 +56711,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.0.4"; - sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf"; + version = "1.0.5"; + sha256 = "0cg85n90fjayxqmgxvb54i8xz6c3x4dp6sgnq4gw3al6fnja8vl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55775,19 +56723,21 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.0"; - sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd"; + version = "1.0.1"; + sha256 = "0w95diizcwdiass71gv61aim98vvy4648f038sk9sklxw95f0jfz"; isLibrary = false; isExecutable = true; 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 @@ -55833,6 +56783,8 @@ self: { pname = "dia-base"; version = "0.1.1.4"; sha256 = "09lyzl0ppgk7izmsb3hq86dfmyb31w866h582vazpphbyvrbpihz"; + revision = "1"; + editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w"; libraryHaskellDepends = [ base deepseq ]; description = "An EDSL for teaching Haskell with diagrams - data types"; license = stdenv.lib.licenses.bsd3; @@ -55846,12 +56798,13 @@ self: { pname = "dia-functions"; version = "0.2.1.5"; sha256 = "1q9jywy6rmh5wkd8z5rw9rkilbh9jxd4py2w4xxqz93rzz2gzy5g"; + revision = "1"; + editedCabalFile = "0zyg7mrnp8qp9v0hm1188n4xqp223g6wqdnz43dw3dchqs2qpwbx"; libraryHaskellDepends = [ base containers data-pprint deepseq dia-base mtl xhtml ]; description = "An EDSL for teaching Haskell with diagrams - functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams" = callPackage @@ -55869,6 +56822,7 @@ 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 @@ -55896,8 +56850,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.1"; sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf"; - revision = "1"; - editedCabalFile = "0r5w2n2y8w3ijzy5s603i8rcj8vl1ggzivw2nj2zbrginma27npc"; + revision = "2"; + editedCabalFile = "0hrpic80rh8xyld8fhblvwykkg82nlp7j9xmcf5403wnqgprna97"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -55914,7 +56868,6 @@ 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 @@ -55961,35 +56914,6 @@ self: { }) {}; "diagrams-contrib" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , cubicbezier, data-default, data-default-class, diagrams-core - , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens - , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat - , parsec, QuickCheck, random, semigroups, split, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.4.0.1"; - sha256 = "033mapl075nlp1pfjg8p3sskv5bqclx5phsn3kpn11iwn6dbx50i"; - revision = "4"; - editedCabalFile = "147khgcda2kxv9qd2l0866af43fxikb4nclv9c25gys888r1mc5k"; - libraryHaskellDepends = [ - base circle-packing colour containers cubicbezier data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout hashable lens linear mfsolve MonadRandom monoid-extras - mtl mtl-compat parsec random semigroups split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-contrib_1_4_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -56096,7 +57020,6 @@ 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 @@ -56233,7 +57156,6 @@ 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 @@ -56281,6 +57203,7 @@ self: { pname = "diagrams-rasterific"; version = "1.4"; sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -56324,22 +57247,9 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "diagrams-solve"; - version = "0.1.0.1"; - sha256 = "1piv8mi5182b2ggr28fnr4mda4vbk4mzasvy0nfp3517ii63mrbi"; - libraryHaskellDepends = [ base ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Pure Haskell solver routines used by diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-solve_0_1_1" = callPackage ({ mkDerivation, base, deepseq, tasty, tasty-hunit , tasty-quickcheck }: @@ -56354,7 +57264,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Pure Haskell solver routines used by diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-svg" = callPackage @@ -56421,6 +57330,7 @@ self: { pname = "dialog"; version = "0.3.0.0"; sha256 = "1lhsd48zb6d00jr7zdmpnhx8gkb3da8kr1qr09qpqais71mxhzz4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring filepath glib gtk3 open-browser text transformers webkitgtk3 @@ -56514,24 +57424,6 @@ self: { }) {}; "dictionaries" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , data-default, directory, exceptions, filepath, text, time - , transformers, zlib - }: - mkDerivation { - pname = "dictionaries"; - version = "0.1.0.1"; - sha256 = "0ddyffg41vq23d3liaqgaxjkirgirj2zg11p3xkj5y8j09q2lwc9"; - libraryHaskellDepends = [ - attoparsec base binary bytestring containers data-default directory - exceptions filepath text time transformers zlib - ]; - description = "Tools to handle StarDict dictionaries"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "dictionaries_0_2_0_2" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-default, deepseq, directory, exceptions, filepath , hspec, QuickCheck, random, random-shuffle, tagged, text, time @@ -56539,8 +57431,8 @@ self: { }: mkDerivation { pname = "dictionaries"; - version = "0.2.0.2"; - sha256 = "0zzzlk2479kk321f06aw5j5fkrza7nmg41f886b47bzd6mzmmnq8"; + version = "0.2.0.3"; + sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56557,7 +57449,6 @@ self: { ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dictionary-sharing" = callPackage @@ -56813,7 +57704,6 @@ 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 @@ -56823,8 +57713,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.21"; - sha256 = "0y2f60yyaj79a8y2bw1g6i6k0i9prj5ghk5q8ljqf3yjkgvlqa8z"; + version = "1.1.22"; + sha256 = "1gsvv8kgjjjq7nlpixq3gz6d1j90l83pmh2r3h18019369fcv3ip"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -56836,7 +57726,6 @@ 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 @@ -56870,7 +57759,6 @@ self: { 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 @@ -56909,13 +57797,12 @@ self: { ({ mkDerivation, base, digestive-functors, lucid, text }: mkDerivation { pname = "digestive-functors-lucid"; - version = "0.0.0.4"; - sha256 = "1q5h0zfz9x8zb08ayrxn0hd5cijrcqfgfihzg82vqiiaqygz9bi1"; + version = "0.0.0.5"; + sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5"; libraryHaskellDepends = [ base digestive-functors lucid text ]; 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 @@ -56935,7 +57822,6 @@ 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 @@ -56953,24 +57839,24 @@ 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 ({ mkDerivation, base, directory, doctest, filepath, lens, papa - , parsec, parsers, QuickCheck, semigroups, template-haskell + , parsec, parsers, QuickCheck, semigroupoids, semigroups + , template-haskell }: mkDerivation { pname = "digit"; - version = "0.2.9"; - sha256 = "1y8mhzzj4sxjxqrzprfckmppdmw4d61n4jgxy64w48qalmqsr8ig"; + version = "0.4.0"; + sha256 = "1c7d35134b8fj1fqmph9gbi5rhix23d8k3y99af0slk5nfkk5wl3"; libraryHaskellDepends = [ - base lens papa parsers semigroups template-haskell + base lens papa parsers semigroupoids semigroups template-haskell ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell ]; - homepage = "https://github.com/NICTA/digit"; + homepage = "https://github.com/qfpl/digit"; description = "A data-type representing digits 0-9 and other combinations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -57015,6 +57901,7 @@ self: { sha256 = "1ii93jmrqs8rlx27rhykq4gqybm92908hg7kzin9ln7fg5ldvmlk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base FontyFruity JuicyPixels Rasterific vector ]; @@ -57077,6 +57964,7 @@ 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 @@ -57286,23 +58174,6 @@ self: { }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.19"; - sha256 = "0g7bwv1496qb1lgz15q83zjg8ddw1icpb98i70zrxpcdi2crnzpl"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - homepage = "https://github.com/IreneKnapp/direct-sqlite"; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_20" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, temporary, text }: @@ -57317,7 +58188,6 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -57399,7 +58269,6 @@ self: { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dirfiles" = callPackage @@ -57564,7 +58433,6 @@ self: { homepage = "http://github.com/lightquake/discount"; description = "Haskell bindings to the discount Markdown library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {markdown = null;}; "discrete-space-map" = callPackage @@ -57593,8 +58461,8 @@ self: { pname = "discrimination"; version = "0.2.1"; sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl"; - revision = "1"; - editedCabalFile = "1wshnljdvzj4ka4h571a187b0fks7b0izic4yk29l187ipdi7pva"; + revision = "2"; + editedCabalFile = "0byjk3k7f7jvx8kd2y2mi8fl93p85rbn2ycmg0yhb7wlyi7hzyfp"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -57638,7 +58506,6 @@ 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 @@ -57778,10 +58645,8 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.6.6"; - sha256 = "1l5png3jwsqa5m63szz4x669nz6qmjiwhhh26z9wql7amdfpg0g8"; - revision = "1"; - editedCabalFile = "1rx1igg8rf0qgdnkfx2az011308winjji67bx4w8zcff9cg6cn2r"; + version = "0.7.1"; + sha256 = "1syr86zahnj3mcz06nqb7im8yxwwx700wdz18hpiz6a4mlph4f17"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -57793,6 +58658,7 @@ 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 @@ -57893,6 +58759,7 @@ self: { ]; description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -57997,6 +58864,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-fsm"; description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-lifted" = callPackage @@ -58041,6 +58909,7 @@ 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 @@ -58058,9 +58927,11 @@ self: { base binary bytestring containers distributed-process mtl network network-transport network-transport-tcp ]; + executableHaskellDepends = [ base distributed-process mtl ]; homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/"; description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-platform" = callPackage @@ -58136,10 +59007,8 @@ self: { }: mkDerivation { pname = "distributed-process-simplelocalnet"; - version = "0.2.3.3"; - sha256 = "05j3n8gizfx0bbbv4wkqxk8ipbd9jxgg6pw51ap8bqbc5n7lk63v"; - revision = "1"; - editedCabalFile = "0w4gz945pv45hkvc73z62xgj2zkm5w73gdhi4lr1w50i4shh7ksc"; + version = "0.2.4"; + sha256 = "0ayz2l48ykbsb7wmyf5cl6anmrrr3bxspbadv7nwa1lg74rqpsif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58205,6 +59074,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-systest"; description = "Cloud Haskell Test Support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task" = callPackage @@ -58253,8 +59123,8 @@ self: { }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.7"; - sha256 = "1c8pd7288978fjym4cw0f47xkwr0myss2pvh4mwralspyynx3rwb"; + version = "0.4.10"; + sha256 = "08fmyqiwxi0r8v1qndgjnj6gd74982sdailkxv4471kbskhr9dnp"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch @@ -58286,6 +59156,7 @@ self: { base binary bytestring containers deepseq distributed-process hzk mtl network network-transport network-transport-tcp transformers ]; + executableHaskellDepends = [ base distributed-process ]; testHaskellDepends = [ base bytestring deepseq distributed-process distributed-process-monad-control enclosed-exceptions hspec hzk @@ -58314,6 +59185,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-static_0_3_7" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , rank1dynamic + }: + mkDerivation { + pname = "distributed-static"; + version = "0.3.7"; + sha256 = "0aalqhk4d2qbkcxnjn5jnp8m2kbvvl6dm49psfgzpmaixbd6wr45"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq rank1dynamic + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Compositional, type-safe, polymorphic static values and closures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distribution" = callPackage ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { @@ -58372,10 +59260,10 @@ self: { }: mkDerivation { pname = "distributive"; - version = "0.5.2"; - sha256 = "1nbcyysnrkliy7xwx6f39p80kkp0vlvq14wdj6r0m5c1brmbxqmd"; - revision = "2"; - editedCabalFile = "1wp2wqhsshiyxxwil3q0az35vijn8cyd2g6866i32j3p9g01mkr9"; + version = "0.5.3"; + sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; + revision = "1"; + editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -58523,19 +59411,6 @@ self: { }) {}; "dlist" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; - version = "0.8.0.2"; - sha256 = "1ca1hvl5kd4api4gjyhwwavdx8snq6gf1jr6ab0zmjx7p77pwfbp"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist_0_8_0_3" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck , quickcheck-instances }: @@ -58550,7 +59425,6 @@ self: { homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -58572,8 +59446,8 @@ self: { }: mkDerivation { pname = "dlist-nonempty"; - version = "0.1"; - sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8"; + version = "0.1.1"; + sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -58680,11 +59554,11 @@ self: { }: mkDerivation { pname = "dns"; - version = "2.0.10"; - sha256 = "18x6ka23khkjr9f2s7hqk2q5q93sf2srwml8cl3gsn2vwa7vq0xs"; + version = "2.0.12"; + sha256 = "0c5w2s8cvid9nk9ldd759k0p54pnb10ld3iin1w1b4lqi08cnnwk"; libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe + attoparsec base binary bytestring conduit conduit-extra containers + iproute mtl network random resourcet safe ]; testHaskellDepends = [ attoparsec base binary bytestring bytestring-builder conduit @@ -58721,6 +59595,7 @@ self: { pname = "dnsrbl"; version = "0.0.3"; sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers hsdns HUnit network ]; homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/"; description = "Asynchronous DNS RBL lookup"; @@ -58769,6 +59644,7 @@ self: { sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base64-bytestring binary bytestring containers directory feed filepath haskell98 heist hexpat json MonadCatchIO-transformers @@ -58857,6 +59733,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "docker-build-cacher" = callPackage + ({ mkDerivation, base, containers, foldl, language-dockerfile + , system-filepath, text, turtle + }: + mkDerivation { + pname = "docker-build-cacher"; + version = "1.1"; + sha256 = "0rc6i4s8iw1qbz9nicbcqjv2b0pr0vzkld8srs4ns41nq4brcdbn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers foldl language-dockerfile system-filepath text + turtle + ]; + description = "Builds a services with docker and caches all of its intermediate stages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dockercook" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base16-bytestring, bytestring, conduit, conduit-combinators @@ -58912,6 +59806,7 @@ self: { pname = "docopt"; version = "0.7.0.5"; sha256 = "1vh5kn13z0c6k2ir6nyr453flyn0cfmz7h61903vysw9lh40hy8m"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell th-lift ]; @@ -58933,6 +59828,7 @@ self: { 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 @@ -58951,8 +59847,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.11.3"; - sha256 = "0j3qbcvsc389g2y5k5xyln3cik7wfy8ii9c3jp665fywp28r1iys"; + version = "0.11.4"; + sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58970,6 +59866,34 @@ self: { 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 + , with-location + }: + mkDerivation { + pname = "doctest"; + version = "0.13.0"; + sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -58991,7 +59915,6 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -59174,7 +60097,6 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "domplate" = callPackage @@ -59276,6 +60198,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dotenv_0_4_0_0" = callPackage + ({ mkDerivation, base, base-compat, exceptions, hspec + , hspec-megaparsec, megaparsec, optparse-applicative, process, text + , transformers + }: + mkDerivation { + pname = "dotenv"; + version = "0.4.0.0"; + sha256 = "0f9c5p1nm7zdwz55wlgm56fb2xvyra0f4i37rfj7bb5kdhncqphg"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -59318,6 +60268,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; @@ -59415,6 +60366,7 @@ self: { sha256 = "0capas1h8d8y8j5sd0zbzayf18jknh1w6q8jcwrx3dqgfd316dqp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory elerea GLFW mersenne-random OpenGL ]; @@ -59433,7 +60385,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 @@ -59448,7 +60399,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-media-content" = callPackage @@ -59672,6 +60622,7 @@ self: { pname = "dpkg"; version = "0.0.3"; sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring monad-loops ]; @@ -59773,8 +60724,8 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2.2"; - sha256 = "1q8i6f6y0wzvn4nawzc47h90qbq5ycd6m73ih7336kpzyzphqzp4"; + version = "0.2.3"; + sha256 = "0f16v4v0ff27qk71a6fsrcwy02nc53g9q1qrfscn8q3swi3rslyz"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text @@ -59950,6 +60901,7 @@ self: { sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger mtl repa strict transformers vector @@ -60113,20 +61065,10 @@ self: { ]; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage - ({ mkDerivation, base, monoid-extras, newtype, semigroups }: - mkDerivation { - pname = "dual-tree"; - version = "0.2.0.9"; - sha256 = "193ncl8l186gxrfj5pszbmlwjw4gljlkziddql0dyqhr8yxhlzay"; - libraryHaskellDepends = [ base monoid-extras newtype semigroups ]; - description = "Rose trees with cached and accumulating monoidal annotations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dual-tree_0_2_1" = callPackage ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck , semigroups, testing-feat }: @@ -60142,7 +61084,6 @@ self: { ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "duckling" = callPackage @@ -60154,8 +61095,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.1.0"; - sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6"; + version = "0.1.2.0"; + sha256 = "1sqkygqx28srbpvnq05fyzqs9c9ixsfdfgivvzqr8yqkwvbxajxr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60164,9 +61105,9 @@ self: { time timezone-series unordered-containers ]; executableHaskellDepends = [ - aeson base bytestring directory extra filepath haskell-src-exts - snap-core snap-server text text-show time timezone-olson - timezone-series unordered-containers + aeson base bytestring dependent-sum directory extra filepath + haskell-src-exts snap-core snap-server text text-show time + timezone-olson timezone-series unordered-containers ]; testHaskellDepends = [ aeson base tasty tasty-hunit text time unordered-containers @@ -60174,6 +61115,27 @@ self: { homepage = "https://github.com/facebookincubator/duckling#readme"; description = "A Haskell library for parsing text into structured data"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dumb-cas" = callPackage + ({ mkDerivation, base, containers, decimal-literals, hashable + , tasty, tasty-hunit, template-haskell, unordered-containers + }: + mkDerivation { + pname = "dumb-cas"; + version = "0.1.0.0"; + sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz"; + revision = "1"; + editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq"; + libraryHaskellDepends = [ + base containers decimal-literals hashable template-haskell + unordered-containers + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + 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 @@ -60203,8 +61165,9 @@ self: { }: mkDerivation { pname = "dump-core"; - version = "0.1.3"; - sha256 = "1innidrmxaqs093pb8g9q7hfmm3kv3przhi34py4sjl256gdwgq0"; + version = "0.1.3.1"; + sha256 = "1n0x8p4zzc73ysf18zyrkhwiyz6j4kgwwiml64zm7pyyhskvrh3p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc monadLib text @@ -60352,6 +61315,7 @@ self: { pname = "dwarf"; version = "0.23"; sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for DWARF debug format"; license = stdenv.lib.licenses.bsd3; @@ -60396,8 +61360,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.0"; - sha256 = "02yp4z20sw1dm7dzi8gsp0qiziyaw1wqr9zgx47sr4cz071ibg8q"; + version = "0.2.0.1"; + sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xngns/dwergaz"; @@ -60489,6 +61453,7 @@ self: { pname = "dynamic-graph"; version = "0.1.0.9"; sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers @@ -60509,7 +61474,6 @@ self: { homepage = "http://github.com/hsyl20/dynamic-linker-template"; description = "Automatically derive dynamic linking methods from a data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-loader" = callPackage @@ -60520,6 +61484,7 @@ self: { pname = "dynamic-loader"; version = "0.0.1"; sha256 = "1ci7fcpgwf3v8rakypxi0l3l3aazwnf004ggpdr6vqqj5iav3a15"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory ghc-prim hashable hashtables time transformers ]; @@ -60538,7 +61503,6 @@ self: { homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-object" = callPackage @@ -60623,6 +61587,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dynamic-state_0_3" = callPackage + ({ mkDerivation, base, binary, bytestring, hashable + , unordered-containers + }: + mkDerivation { + pname = "dynamic-state"; + version = "0.3"; + sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv"; + libraryHaskellDepends = [ + base binary bytestring hashable unordered-containers + ]; + description = "Optionally serializable dynamic state keyed by type"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion @@ -60653,13 +61633,15 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, aeson, base, binary, casadi-bindings - , casadi-bindings-core, cereal, containers, data-default-class - , directory, distributive, doctest, generic-accessors, hmatrix - , hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl, mwc-random - , Plot-ho-matic, process, QuickCheck, reflection, spatial-math + ({ mkDerivation, aeson, base, binary, bytestring, casadi-bindings + , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour + , containers, data-default-class, directory, distributive, doctest + , generic-accessors, hmatrix, hmatrix-gsl, HUnit, jacobi-roots + , lens, linear, mtl, mwc-random, not-gloss, Plot-ho-matic, process + , QuickCheck, reflection, semigroups, spatial-math, stm , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, vector, vector-binary-instances + , time, unordered-containers, vector, vector-binary-instances + , zeromq4-haskell }: mkDerivation { pname = "dynobud"; @@ -60674,6 +61656,12 @@ self: { mwc-random Plot-ho-matic process reflection spatial-math time vector vector-binary-instances ]; + executableHaskellDepends = [ + base bytestring casadi-bindings casadi-bindings-core cereal Chart + Chart-gtk cmdargs colour containers data-default-class + generic-accessors lens linear mtl not-gloss Plot-ho-matic + semigroups stm time unordered-containers vector zeromq4-haskell + ]; testHaskellDepends = [ base binary casadi-bindings cereal containers doctest hmatrix hmatrix-gsl HUnit linear QuickCheck test-framework @@ -60769,6 +61757,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ease" = callPackage + ({ mkDerivation, base, data-default }: + mkDerivation { + pname = "ease"; + version = "0.1.0.0"; + sha256 = "17zj7s0qq3y4w6qd06hi4fc54m4j1f07wxm7yfnc47lsg5n9f4g0"; + libraryHaskellDepends = [ base data-default ]; + description = "Robert Penner's easing equations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "easy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl , resourcet, text @@ -60879,7 +61878,7 @@ self: { homepage = "https://github.com/achirkin/easytensor#readme"; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ebeats" = callPackage @@ -60961,11 +61960,13 @@ self: { pname = "eccrypto"; version = "0.0.1"; sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal crypto-api SHA vector ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ecdsa" = callPackage @@ -60996,6 +61997,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; license = stdenv.lib.licenses.bsd3; @@ -61102,6 +62104,7 @@ self: { pname = "ede"; version = "0.2.8.7"; sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory double-conversion filepath free lens mtl parsers scientific @@ -61152,6 +62155,7 @@ self: { sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring cairo containers directory filepath ghc-events-parallel gtk mtl text zip-archive @@ -61172,6 +62176,7 @@ self: { sha256 = "0zvwkk7sdgi4h1gld4h4c0lznkp5nd9p3cxpfj2yq393x27jamc0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ALUT base cmdtheline containers gloss OpenAL random wraparound ]; @@ -61294,6 +62299,7 @@ self: { sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring conduit conduit-extra directory process resourcet temporary transformers unix @@ -61351,7 +62357,6 @@ self: { libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems into Haskell using graded monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effective-aspects" = callPackage @@ -61426,13 +62431,12 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "effin"; - version = "0.3.0.2"; - sha256 = "057hhpbxzhyinknbacbs12k3aq7jixg3pzyqcl49k1vrqm9y82fx"; + version = "0.3.0.3"; + sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "egison" = callPackage @@ -61448,6 +62452,7 @@ self: { sha256 = "1fdlpk51y9ddwj5nky0k7shxm1z2nv0l3xfbfgmjcq44xc5wpzsn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths haskeline mtl parallel parsec process random regex-tdfa text transformers @@ -61528,7 +62533,7 @@ self: { "ehs" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta, parsec - , template-haskell, text, transformers + , template-haskell, text, time, transformers }: mkDerivation { pname = "ehs"; @@ -61542,6 +62547,7 @@ self: { base bytestring haskell-src-meta parsec template-haskell text transformers ]; + executableHaskellDepends = [ base bytestring text time ]; homepage = "http://github.com/minpou/ehs/"; description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; @@ -61584,6 +62590,7 @@ 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 @@ -61637,8 +62644,11 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.13"; - sha256 = "13xlggjcfmp8hr8sz74r0xms36rrfa86znazy2m6304dgscdbca4"; + version = "0.4.0.14"; + sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + revision = "1"; + editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers @@ -61646,7 +62656,6 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-bosun" = callPackage @@ -61656,8 +62665,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.8"; - sha256 = "0y0vfxlzsblb5vppxi5bda9z32y485rlhqsr6h78ww1f8ppb84la"; + version = "1.0.10"; + sha256 = "18108haj2gpgbn3lbsgzb1ixbycijjns1h780hllsb3nbcmqv0gw"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -61673,8 +62682,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.7"; - sha256 = "18shnh4synsnr2xl0ycnafg52k8zwkwa989g2l0sc1b3zb33vijd"; + version = "1.0.8"; + sha256 = "0n65c6yv43gckxlckl9bmmf0ags3pp055lvxpi5rbq1d95b29xqd"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -61682,7 +62691,6 @@ self: { homepage = "http://github.com/ocharles/ekg-carbon"; description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-cloudwatch" = callPackage @@ -61712,8 +62720,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.1"; - sha256 = "1mir54l783pwy4fbz5bdbckz6d41iim4zdk06wpsl9xhn7s3vpjl"; + version = "0.1.1.2"; + sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -61746,8 +62754,8 @@ self: { }: mkDerivation { pname = "ekg-elasticsearch"; - version = "0.3.0.0"; - sha256 = "0xv32kzsvl2g4vs9ygga3xn0x9dqm9vn8zg7hbj8agxrfnvprqvw"; + version = "0.3.1.1"; + sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q"; libraryHaskellDepends = [ aeson base bytestring ekg-core hostname http-client lens text time unordered-containers wreq @@ -61779,8 +62787,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.0.5"; - sha256 = "0ml5pqp918k2zgpw10sjn0nca0ivzb871zxcg73samm1aypfrm8c"; + version = "0.1.0.6"; + sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -61838,6 +62846,7 @@ self: { libraryHaskellDepends = [ base bytestring ekg-core text time unordered-containers ]; + executableHaskellDepends = [ base ekg-core ]; homepage = "https://github.com/adarqui/ekg-push"; description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; license = stdenv.lib.licenses.bsd3; @@ -61872,8 +62881,8 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.1.0"; - sha256 = "04bpdmk3ma4fnylipg4hkq3jfkrw5f009vbns6vah0znawkpjhnh"; + version = "0.2.1.1"; + sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -61889,8 +62898,9 @@ self: { }: mkDerivation { pname = "ekg-wai"; - version = "0.1.0.1"; - sha256 = "14vl5k7jq7p7fiwj9rbw3ng7j8cagydpw7zvf8qxbwxdz9xr655q"; + version = "0.1.0.2"; + sha256 = "1ridcn930lf8gjj7lqdbhzzmz0i6r668bhid72anbq3v1h6fnhnw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath http-types network text time transformers unordered-containers wai wai-app-static warp @@ -61910,7 +62920,19 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "elenco-albero" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "elenco-albero"; + version = "1.0.0"; + sha256 = "1plqdvyy4ln1cg2195bx6wpylnscj8b7zvks24qmq6sqskhckspr"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://bitbucket.org/ciezbit/elenco-albero"; + description = "make tree from a list"; + license = stdenv.lib.licenses.publicDomain; }) {}; "elerea" = callPackage @@ -61971,6 +62993,7 @@ self: { pname = "elf"; version = "0.28"; sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; homepage = "https://github.com/wangbj/elf"; description = "Parser for ELF object format"; @@ -61978,16 +63001,21 @@ self: { }) {}; "eliminators" = callPackage - ({ mkDerivation, base, hspec, singletons }: + ({ mkDerivation, base, extra, hspec, singletons, template-haskell + , th-abstraction, th-desugar + }: mkDerivation { pname = "eliminators"; - version = "0.1"; - sha256 = "0amd3gwnxhdbpg9afv2zs4c3lhc9s7ri66cpdp4x7vmp5xx6yi3n"; - libraryHaskellDepends = [ base singletons ]; + version = "0.2"; + sha256 = "1flv7bmsx38wgb88kdvwncn55fkahfsi2gghc5jwy0j9036pr3h9"; + libraryHaskellDepends = [ + base extra singletons template-haskell th-abstraction th-desugar + ]; testHaskellDepends = [ base hspec singletons ]; 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 @@ -62189,6 +63217,7 @@ self: { sha256 = "0w0jn7qvxsfcqdr0r147qs6s2711m1xwp28ddzd60n9yn0gdpfi9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aeson-pretty base base-unicode-symbols bytestring containers directory file-embed filepath process text time @@ -62261,6 +63290,7 @@ self: { sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-html blaze-markup bytestring cmdargs containers directory elm-compiler filepath fsnotify HTTP mtl process snap-core @@ -62468,31 +63498,13 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "email-validate"; - version = "2.2.1.1"; - sha256 = "18q1n0x79mii4d3hdm671ziswh1283mwl1xj47vcvizz4mi6vhh7"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/Porges/email-validate-hs"; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: mkDerivation { pname = "email-validate"; - version = "2.3"; - sha256 = "1zm6sqvaa3r412cz5ga7hcjl3b26hi4l8fc8z5im476rsjib8jf1"; + version = "2.3.1"; + sha256 = "0fzbaxshhlg97pm66yjhz7fxxq9j1m3k0sqslzngh36r8aw9l66j"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -62500,7 +63512,6 @@ self: { homepage = "https://github.com/Porges/email-validate-hs"; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -62730,17 +63741,22 @@ self: { }) {}; "encoding" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , extensible-exceptions, filepath, ghc-prim, HaXml, HUnit, mtl + , QuickCheck, regex-compat }: mkDerivation { pname = "encoding"; - version = "0.8.1"; - sha256 = "1fddj2m3xv8zfz6bmgks3ynib6hk7bzq2j3bsazr71m769a9hvyr"; + version = "0.8.2"; + sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353"; + setupHaskellDepends = [ + base Cabal containers filepath ghc-prim HaXml + ]; libraryHaskellDepends = [ array base binary bytestring containers extensible-exceptions - ghc-prim HaXml mtl regex-compat + ghc-prim mtl regex-compat ]; + testHaskellDepends = [ base bytestring HUnit QuickCheck ]; homepage = "http://code.haskell.org/encoding/"; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; @@ -62786,8 +63802,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.16"; - sha256 = "1h359zlxqz7px72lnl83pg6pqr0dpk8fqw4vw4hhpfvvqd35lw6y"; + version = "1.2.17"; + sha256 = "0m5nr1qk15p332dhmiyrpfdm91cf3al2nah6rja55y6gpc2vvvbv"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -62796,7 +63812,6 @@ 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 @@ -62826,15 +63841,14 @@ self: { }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.4"; - sha256 = "1w3r8w1rwik3v5m8lrfll6izymf0c49sralhaxn1kcgc1bq26wv8"; + version = "1.0.5"; + sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa"; libraryHaskellDepends = [ base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-wai" = callPackage @@ -62853,7 +63867,6 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -62945,7 +63958,6 @@ self: { homepage = "https://github.com/sboosali/enumerate"; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enumerate-function" = callPackage @@ -63181,7 +64193,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -63218,6 +64229,7 @@ self: { sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base Cabal directory mtl process ]; executableHaskellDepends = [ array base Cabal directory mtl process @@ -63248,6 +64260,7 @@ self: { pname = "eprocess"; version = "1.7.2"; sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions mtl ]; description = "Basic Erlang-like process support for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -63292,7 +64305,6 @@ self: { homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epub-tools" = callPackage @@ -63315,7 +64327,6 @@ self: { homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epubname" = callPackage @@ -63365,7 +64376,6 @@ self: { homepage = "http://code.haskell.org/~thielema/equal-files/"; description = "Shell command for finding equal files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equational-reasoning" = callPackage @@ -63472,6 +64482,7 @@ self: { pname = "eros"; version = "0.6.0.0"; sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers text ]; description = "A text censorship library"; license = stdenv.lib.licenses.bsd3; @@ -63488,6 +64499,7 @@ self: { sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aeson-pretty base bytestring containers eros text ]; @@ -63506,6 +64518,7 @@ self: { sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base blaze-html bytestring eros http-types markdown text wai warp @@ -63610,8 +64623,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "error-util"; - version = "0.0.1.1"; - sha256 = "14z1yffg0lxyjqf5zpfcz493zh8y4p9d2abmdzvf56qx47r37lb8"; + version = "0.0.1.2"; + sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; @@ -63632,21 +64645,6 @@ self: { }) {}; "errors" = callPackage - ({ mkDerivation, base, safe, transformers, transformers-compat - , unexceptionalio - }: - mkDerivation { - pname = "errors"; - version = "2.1.3"; - sha256 = "1wadhhl3hx7f1k7lda50ymifs6472dzy0ygb6kvxy5ms5yfis6i0"; - libraryHaskellDepends = [ - base safe transformers transformers-compat unexceptionalio - ]; - description = "Simplified error-handling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "errors_2_2_1" = callPackage ({ mkDerivation, base, exceptions, safe, text, transformers , transformers-compat, unexceptionalio }: @@ -63660,7 +64658,6 @@ self: { ]; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersaconcat" = callPackage @@ -63688,30 +64685,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, base, bytestring, containers, data-default - , directory, doctest, filepath, lens, mtl, parsec, process - , temporary, transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.3.1"; - sha256 = "1h58g9lfhmww433z24vmi6wkaii5ik0hrmjprvypgw4bgibls0g9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers data-default lens mtl process - temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers lens mtl parsec - ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "http://github.com/ekmett/ersatz"; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ersatz_0_4" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, data-default, directory, doctest , filepath, lens, mtl, parsec, process, temporary, transformers @@ -63719,10 +64692,11 @@ self: { }: mkDerivation { pname = "ersatz"; - version = "0.4"; - sha256 = "173k73dvbv528q6072b8k7xy9q6558rlmz7llkiym4g1j2xi37cf"; + version = "0.4.1"; + sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array attoparsec base bytestring containers data-default lens mtl @@ -63848,7 +64822,6 @@ self: { homepage = "https://github.com/bitemyapp/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -63904,6 +64877,7 @@ self: { sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bio bytestring containers random ]; @@ -63914,28 +64888,6 @@ self: { }) {}; "etc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun - , text, unordered-containers, vector - }: - mkDerivation { - pname = "etc"; - version = "0.0.0.2"; - sha256 = "1cbxanxm7qpbsj3q5f6q4sn2krvfi3bm5yxi2qcxrqpjrhq31j8i"; - libraryHaskellDepends = [ - aeson base bytestring containers directory exceptions hashable - protolude text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers protolude tasty tasty-hunit - tasty-rerun text unordered-containers vector - ]; - homepage = "https://github.com/roman/Haskell-etc"; - description = "Declarative configuration spec for Haskell projects"; - license = stdenv.lib.licenses.mit; - }) {}; - - "etc_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun , text, unordered-containers, vector @@ -63944,6 +64896,7 @@ self: { pname = "etc"; version = "0.2.0.0"; sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions hashable protolude text unordered-containers vector @@ -63955,7 +64908,6 @@ 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 @@ -63994,27 +64946,6 @@ self: { }) {}; "ether" = callPackage - ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl - , QuickCheck, tasty, tasty-quickcheck, template-haskell - , transformers, transformers-base, transformers-lift - }: - mkDerivation { - pname = "ether"; - version = "0.4.2.0"; - sha256 = "0pkr0sh6qd5in806gm8k2cgr8j4aaq4p4zk52b8g82kqjzwb20rf"; - libraryHaskellDepends = [ - base exceptions mmorph monad-control mtl template-haskell - transformers transformers-base transformers-lift - ]; - testHaskellDepends = [ - base mtl QuickCheck tasty tasty-quickcheck transformers - ]; - homepage = "https://int-index.github.io/ether/"; - description = "Monad transformers and classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ether_0_5_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged , tasty, tasty-quickcheck, template-haskell, transformers @@ -64039,7 +64970,6 @@ self: { homepage = "https://int-index.github.io/ether/"; description = "Monad transformers and classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ethereum-analyzer" = callPackage @@ -64300,6 +65230,7 @@ self: { pname = "eurofxref"; version = "0.2.1"; sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring conduit containers failure hexpat http-conduit http-types monad-control mtl time @@ -64441,6 +65372,30 @@ self: { 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 + }: + mkDerivation { + pname = "eventful-core"; + version = "0.2.0"; + sha256 = "06chbjrxfxk0fr9lgdic6bmylnv3kz398l9drqr85r6qk1s5xxg0"; + libraryHaskellDepends = [ + aeson base containers contravariant http-api-data path-pieces + sum-type-boilerplate template-haskell text transformers uuid + ]; + testHaskellDepends = [ + aeson base containers contravariant 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base , bytestring, conduit, eventful-core, eventful-test-helpers, hlint @@ -64467,6 +65422,31 @@ self: { 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 + , unordered-containers, vector + }: + mkDerivation { + pname = "eventful-dynamodb"; + version = "0.2.0"; + sha256 = "17ip1dr1jqrzy0hg5yjnv4a8qkgsab02jcbswlxfd3q7xx3d473b"; + 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 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-memory" = callPackage ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm @@ -64487,6 +65467,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-memory_0_2_0" = callPackage + ({ mkDerivation, base, containers, eventful-core + , eventful-test-helpers, hspec, HUnit, mtl, safe, stm + }: + mkDerivation { + pname = "eventful-memory"; + version = "0.2.0"; + sha256 = "1fdd2z13lnk1zxhylriwblz96x90v4504abrj9rfbi732853wz3a"; + libraryHaskellDepends = [ + base containers eventful-core mtl safe stm + ]; + testHaskellDepends = [ + base containers eventful-core eventful-test-helpers hspec HUnit mtl + safe stm + ]; + 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 @@ -64511,6 +65512,30 @@ self: { 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 + }: + mkDerivation { + pname = "eventful-postgresql"; + version = "0.2.0"; + sha256 = "05syf8ychcnyl4q1q3afn4nqp4sw38y4c3p97b1h5gdanbsnis3b"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers 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-sql-common" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl , persistent, persistent-template, text, uuid @@ -64528,6 +65553,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-sql-common_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl + , persistent, persistent-template, text, uuid + }: + mkDerivation { + pname = "eventful-sql-common"; + version = "0.2.0"; + sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit @@ -64551,6 +65594,30 @@ self: { 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 + }: + mkDerivation { + pname = "eventful-sqlite"; + version = "0.2.0"; + sha256 = "1vyz8401n63gqwgl1fa9dw1ar1dgki4hy6ably8lh2hzpl7fmfy0"; + 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 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-test-helpers" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra , hspec, monad-logger, text @@ -64567,6 +65634,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-test-helpers_0_2_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra + , hspec, monad-logger, text + }: + mkDerivation { + pname = "eventful-test-helpers"; + version = "0.2.0"; + sha256 = "1q5z9rf5hxwpsyvm28hfnkr72zfsg7h5kz648bass9irvq69v7x9"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventloop" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-utilities , deepseq, network, stm, suspend, text, timers, websockets @@ -64591,13 +65675,13 @@ self: { }: mkDerivation { pname = "eventsource-api"; - version = "1.1.0"; - sha256 = "0khdp8z2lbp9337wxsqfb3dlnmjw8shwjaldx0xqikwyh6rrmix9"; + version = "1.1.1"; + sha256 = "0zy59m7iwxwy5c4l15kvj98fk7vrjwhxp0scc3r3v37cxkakg01h"; libraryHaskellDepends = [ aeson base containers mtl protolude unordered-containers uuid ]; homepage = "https://github.com/YoEight/eventsource-api#readme"; - description = "Provides a eventsourcing high level API"; + description = "Provides an eventsourcing high level API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64608,8 +65692,8 @@ self: { }: mkDerivation { pname = "eventsource-geteventstore-store"; - version = "1.0.1"; - sha256 = "19h7vvd2b52915i61lpaa0k3hgvhdz55y5rsp0aznv1m2f613nnh"; + version = "1.0.4"; + sha256 = "0fn75hwarhjnrjalv7i16ry1wnr2z2gqvpj3ls2faappz1drhxmp"; libraryHaskellDepends = [ aeson base eventsource-api eventstore mtl protolude ]; @@ -64629,8 +65713,8 @@ self: { }: mkDerivation { pname = "eventsource-store-specs"; - version = "1.0.0"; - sha256 = "0iwh779mv4wvdfgdgd4rizvpmpj19qppndn7wqx56wa5119k9ahi"; + version = "1.0.1"; + sha256 = "0fg6rma02vp3iij93xgccqivqfx3h9675203jlmk6073mhg2i5id"; libraryHaskellDepends = [ aeson base eventsource-api mtl protolude tasty tasty-hspec uuid ]; @@ -64640,18 +65724,19 @@ self: { }) {}; "eventsource-stub-store" = callPackage - ({ mkDerivation, base, containers, eventsource-api + ({ mkDerivation, aeson, base, containers, eventsource-api , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec }: mkDerivation { pname = "eventsource-stub-store"; - version = "1.0.1"; - sha256 = "0knmyykgxs6fy4xpmn7zcm8h1psirgizfrk6iaisfncjw9xy387k"; + version = "1.0.2"; + sha256 = "10c853i9k91gc42jbqzxx3scip2hr1ahwkhzvcryhiw3745qsidr"; libraryHaskellDepends = [ base containers eventsource-api mtl protolude stm ]; testHaskellDepends = [ - base eventsource-store-specs protolude tasty tasty-hspec + 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"; @@ -64681,25 +65766,35 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, array, base, cereal, classy-prelude - , connection, containers, dns, dotnet-timespan, http-client, mtl - , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time + ({ 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 = "0.14.0.2"; - sha256 = "1wvnwxn358vlcvxsiph1cm3iwsmggi348ljv8kknwv4vk43zm0b6"; + version = "0.15.0.2"; + sha256 = "00mamlf121c3dsigpxvshj1mbm2b4hdbil02zyhz7jc6kccgbjwx"; libraryHaskellDepends = [ - aeson array base cereal classy-prelude connection containers dns - dotnet-timespan http-client mtl protobuf random semigroups stm time - unordered-containers uuid + 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 base classy-prelude connection dotnet-timespan stm tasty - tasty-hunit text time uuid + 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 = "http://github.com/YoEight/eventstore"; + homepage = "https://github.com/YoEight/eventstore#readme"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; @@ -64781,7 +65876,9 @@ self: { }) {}; "exact-cover" = callPackage - ({ mkDerivation, base, containers, tasty, tasty-hunit }: + ({ mkDerivation, base, boxes, containers, safe, tasty, tasty-hunit + , vector + }: mkDerivation { pname = "exact-cover"; version = "0.1.0.0"; @@ -64789,6 +65886,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base boxes containers safe vector ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; homepage = "https://github.com/arthurl/exact-cover"; description = "Efficient exact cover solver"; @@ -64828,6 +65926,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exact-real-positional" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "exact-real-positional"; + version = "0.0.0"; + sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351"; + libraryHaskellDepends = [ base ]; + description = "Framework for Exact Real Arithmetic in the Positional Number System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exception-hierarchy" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -64883,7 +65992,6 @@ self: { ]; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mtl" = callPackage @@ -65006,6 +66114,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "executor" = callPackage + ({ mkDerivation, async, base, process }: + mkDerivation { + pname = "executor"; + version = "0.0.3"; + sha256 = "01whn23ycgm59zim6knna43p2dafh0bjwrmfwg3xq169im79n1zq"; + libraryHaskellDepends = [ async base process ]; + testHaskellDepends = [ async base process ]; + homepage = "https://github.com/GianlucaGuarini/executor"; + description = "Shell helpers"; + license = stdenv.lib.licenses.mit; + }) {}; + "exference" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers , data-pprint, deepseq, deepseq-generics, directory, either @@ -65017,10 +66138,11 @@ self: { pname = "exference"; version = "1.6.0.0"; sha256 = "1lnalnsn3zjcwhl8p1035ckjgp4kpjv6kfai4dqqji2rpbm1sgrh"; - revision = "3"; - editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3"; + revision = "4"; + editedCabalFile = "1yrc2p8p48cx8qjpyvfqpbvs8dcv2m5k5x89s04jk9ic26wdwk9k"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-orphans bifunctors containers deepseq deepseq-generics directory either hashable haskell-src-exts hood lens mmorph mtl @@ -65042,15 +66164,14 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.4"; - sha256 = "02w75q9k2w5ggribz4ifbh23smznmdp1698d2mip0c2f8p4klskl"; + version = "1.1.5"; + sha256 = "1qkv6ibdp0a7hi57dhxy3yfbwbs1asmjvqs5nh1p34awz7npvrh9"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; homepage = "http://github.com/ocharles/exhaustive"; description = "Compile time checks that a computation considers producing data through all possible constructors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exherbo-cabal" = callPackage @@ -65112,7 +66233,6 @@ 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 @@ -65191,7 +66311,6 @@ self: { ]; description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -65220,17 +66339,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exitcode" = callPackage + ({ mkDerivation, base, checkers, lens, mtl, QuickCheck + , semigroupoids, semigroups, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "exitcode"; + version = "0.1.0.0"; + sha256 = "0nkb1mbgmb67qc57s2ypcpg8ky905bqy8ns9y7zq6hmizmyn34f3"; + revision = "1"; + editedCabalFile = "077gibwagbkr07lgj8gy2bziam9zb320ry6z889zkqpg74fskbi1"; + libraryHaskellDepends = [ + base lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck + transformers + ]; + homepage = "https://github.com/qfpl/exitcode"; + description = "Monad transformer for exit codes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exp-extended" = callPackage ({ mkDerivation, base, compensated, log-domain }: mkDerivation { pname = "exp-extended"; version = "0.1.1.2"; sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r"; + revision = "1"; + editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr"; libraryHaskellDepends = [ base compensated log-domain ]; - homepage = "http://code.mathr.co.uk/exp-extended"; + 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 @@ -65468,6 +66611,7 @@ self: { pname = "extcore"; version = "1.0.2"; sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory filepath mtl parsec pretty syb @@ -65537,44 +66681,47 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, constraints, monad-skeleton, profunctors + ({ mkDerivation, base, comonad, constraints, criterion, deepseq + , effin, extensible-effects, freer-effects, ghc-prim, lens + , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar , tagged, template-haskell, transformers }: mkDerivation { pname = "extensible"; - version = "0.3.7"; - sha256 = "13p369xfr09y7sdpvaci065j1mcz8c9ks0a4am2ppzk1jwr25bh5"; - libraryHaskellDepends = [ - base constraints monad-skeleton profunctors tagged template-haskell - transformers - ]; - homepage = "https://github.com/fumieval/extensible"; - description = "Extensible, efficient, optics-friendly data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_2" = callPackage - ({ mkDerivation, base, comonad, constraints, criterion, deepseq - , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton - , mtl, primitive, profunctors, semigroups, tagged, template-haskell - , transformers - }: - mkDerivation { - pname = "extensible"; - version = "0.4.2"; - sha256 = "1djsc3g3kvrm8n5sl5hbjv40fmclrdss9m9fdyl5cski1j94dhhk"; + version = "0.4.3"; + sha256 = "0ix1dran0s17jpdzcwai79snfmls8al7a34b0sysgkp75g8lrgca"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors semigroups tagged template-haskell + primitive profunctors semigroups StateVar tagged template-haskell transformers ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ - base criterion effin extensible-effects freer lens mtl + base criterion effin extensible-effects freer-effects lens mtl ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "extensible_0_4_4" = callPackage + ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim + , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar + , tagged, template-haskell, transformers + }: + mkDerivation { + pname = "extensible"; + version = "0.4.4"; + sha256 = "17ggw3znbx0mh29nqg1g1jp571vsbndswgs28zql32s6nkcd1rby"; + libraryHaskellDepends = [ + base comonad constraints deepseq ghc-prim monad-skeleton mtl + primitive profunctors semigroups StateVar tagged template-haskell + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/extensible"; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -65602,8 +66749,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "1.11.0.4"; - sha256 = "04vr4bwm7vz0r5i0j3rk80qz3m08d3gv99s1adhlyhflk6lgp4mg"; + version = "1.11.1.0"; + sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b"; libraryHaskellDepends = [ base transformers transformers-base type-aligned void ]; @@ -65759,6 +66906,23 @@ self: { homepage = "https://github.com/wuest/haskell-extralife-api"; description = "API Client for ExtraLife team and user data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "extrapolate" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.2.3"; + sha256 = "10zzsikammd770pwa3h9cj8ha2dyrcp9111qv9bskvr2bcx8axgq"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate ]; + 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 @@ -65823,7 +66987,6 @@ self: { homepage = "http://functionalley.eu/Factory/factory.html"; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "factual-api" = callPackage @@ -65949,6 +67112,7 @@ self: { pname = "fair-predicates"; version = "0.1.1"; sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://sebfisch.github.com/fair-predicates"; description = "Fair Predicates"; @@ -65975,6 +67139,7 @@ self: { pname = "faker"; version = "0.0.0.2"; sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base gimlh random split ]; homepage = "https://github.com/gazay/faker"; description = "Pure Haskell library for generating fake data"; @@ -65991,6 +67156,7 @@ self: { sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base gloss gloss-raster JuicyPixels-repa QuickCheck random repa repa-algorithms vector @@ -66011,6 +67177,7 @@ self: { sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers haskell98 SDL SDL-mixer SDL-ttf ]; @@ -66121,6 +67288,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-mult" = callPackage + ({ mkDerivation, base, ghc-prim, integer-gmp, strict-base }: + mkDerivation { + pname = "fast-mult"; + version = "0.1.0.0"; + sha256 = "19ra4sl10qawn2ig97ls0ib2sfy2b891gkjl4k7nia5lqp69smjh"; + libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ]; + homepage = "https://github.com/clintonmead/fast-mult#readme"; + description = "Numeric type with asymptotically faster multiplications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-nats" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -66143,6 +67322,7 @@ self: { sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base bytestring containers cpphs deepseq directory filepath mtl text utf8-string @@ -66158,7 +67338,6 @@ self: { homepage = "https://github.com/elaforge/fast-tags"; description = "Fast incremental vi and emacs tags"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tagsoup" = callPackage @@ -66275,18 +67454,18 @@ self: { "fastparser" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, containers - , microlens, thyme, vector-space + , criterion, kan-extensions, microlens, thyme, transformers + , vector-space }: mkDerivation { pname = "fastparser"; - version = "0.3.0"; - sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4"; - revision = "1"; - editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi"; + version = "0.3.0.1"; + sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15"; libraryHaskellDepends = [ - base bytestring bytestring-lexing containers microlens thyme - vector-space + base bytestring bytestring-lexing containers kan-extensions + microlens thyme transformers vector-space ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/bartavelle/fastparser#readme"; description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; @@ -66355,10 +67534,11 @@ self: { pname = "fay"; version = "0.23.1.16"; sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4"; - revision = "7"; - editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358"; + revision = "8"; + editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat bytestring containers data-default data-lens-light directory filepath ghc-paths haskell-src-exts @@ -66371,18 +67551,21 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.20.0.1"; - sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr"; + version = "0.21.0.0"; + sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -66400,6 +67583,7 @@ self: { ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -66408,10 +67592,12 @@ self: { pname = "fay-dom"; version = "0.5.0.1"; sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-geoposition" = callPackage @@ -66420,10 +67606,12 @@ self: { pname = "fay-geoposition"; version = "0.1.0.1"; sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-text ]; homepage = "https://github.com/victoredwardocallaghan/fay-geoposition"; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -66432,6 +67620,7 @@ self: { pname = "fay-hsx"; version = "0.2.0"; sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-jquery ]; homepage = "http://www.happstack.com/"; description = "Clientside HTML generation for fay"; @@ -66445,10 +67634,12 @@ self: { pname = "fay-jquery"; version = "0.6.1.0"; sha256 = "04vg018zynb5ckj7ca9a9a3lbs8kjx8a5k0l3k73yp2y27w7xx8g"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-text ]; homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -66457,10 +67648,12 @@ self: { pname = "fay-ref"; version = "0.1.0.0"; sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-simplejson" = callPackage @@ -66469,6 +67662,7 @@ self: { pname = "fay-simplejson"; version = "0.1.3.0"; sha256 = "0cw06vl39p7mflf8wfl8ql1h8bryv2d1kvvf4swqgda05jk13mxq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/Lupino/fay-simplejson"; description = "SimpleJSON library for Fay"; @@ -66482,10 +67676,12 @@ self: { pname = "fay-text"; version = "0.3.2.2"; sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay fay-base text ]; homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -66494,10 +67690,12 @@ self: { pname = "fay-uri"; version = "0.2.0.0"; sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -66529,7 +67727,6 @@ self: { homepage = "https://github.com/psibi/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -66558,6 +67755,7 @@ self: { sha256 = "0dvjhgv3w13ygi4rfdvmc2m6f99v8d9dmjqp98vxrygcqskhgy4x"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-media http-types mime-types servant servant-client string-conversions @@ -66721,13 +67919,19 @@ self: { }) {}; "feature-flipper" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, text }: + ({ mkDerivation, base, bytestring, containers, digest, hspec, mtl + , text + }: mkDerivation { pname = "feature-flipper"; - version = "0.2.0.1"; - sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ base containers hspec mtl ]; + version = "0.2.1.2"; + sha256 = "18g90xvbgxzj2in8v3y7s6p305h0rg5p5163262vi9cdi7lrvvc8"; + libraryHaskellDepends = [ + base bytestring containers digest mtl text + ]; + testHaskellDepends = [ + base bytestring containers digest hspec mtl text + ]; homepage = "https://github.com/toddmohney/flipper#readme"; description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; @@ -66740,8 +67944,8 @@ self: { }: mkDerivation { pname = "feature-flipper-postgres"; - version = "0.1.0.1"; - sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95"; + version = "0.1.1.1"; + sha256 = "186khsn3gqxqhxlah6m8fgl4qlwf3pgmqagvr8rnfv44vzynw8by"; libraryHaskellDepends = [ base bytestring containers feature-flipper monad-logger mtl persistent persistent-postgresql persistent-template text time @@ -66802,6 +68006,7 @@ self: { sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc"; revision = "2"; editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -66824,6 +68029,7 @@ self: { sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory feed old-locale old-time time xml ]; @@ -67087,6 +68293,7 @@ self: { sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo gtk harp HaXml mtl template-haskell unix ]; @@ -67161,6 +68368,7 @@ self: { pname = "fficxx"; version = "0.3.1"; sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl process pureMD5 @@ -67186,7 +68394,7 @@ self: { "ffmpeg-light" = callPackage ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale - , mtl, transformers, vector + , monad-loops, mtl, text, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; @@ -67201,6 +68409,10 @@ self: { libraryPkgconfigDepends = [ ffmpeg libavcodec libavdevice libavformat libswscale ]; + executableHaskellDepends = [ + base bytestring JuicyPixels monad-loops mtl text transformers + vector + ]; homepage = "http://github.com/acowley/ffmpeg-light"; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; @@ -67261,8 +68473,8 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.5.3.1"; - sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; + version = "5.5.4.0"; + sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -67272,6 +68484,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fgl_5_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.6.0.0"; + sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { @@ -67294,6 +68524,7 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Graph decomposition algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-visualize" = callPackage @@ -67594,12 +68825,13 @@ self: { }) {}; "filelock" = callPackage - ({ mkDerivation, base, unix }: + ({ mkDerivation, async, base, process, unix }: mkDerivation { pname = "filelock"; - version = "0.1.0.1"; - sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d"; + version = "0.1.1.2"; + sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g"; libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; homepage = "http://github.com/takano-akio/filelock"; description = "Portable interface to file locking (flock / LockFileEx)"; license = stdenv.lib.licenses.publicDomain; @@ -67673,6 +68905,7 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -67701,6 +68934,7 @@ self: { pname = "filestore"; version = "0.6.3.1"; sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -67770,6 +69004,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filter-logger" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, data-default, fast-logger, http-types, HUnit, scotty + , semigroups, time, wai, wai-extra, wai-logger + }: + mkDerivation { + pname = "filter-logger"; + version = "0.6.0.0"; + sha256 = "089gcirir6dwp2p61349dyvgk596cb8vgswkydzpy2lmar01513q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring data-default + fast-logger http-types semigroups time wai wai-extra wai-logger + ]; + executableHaskellDepends = [ aeson base bytestring scotty ]; + testHaskellDepends = [ base bytestring HUnit ]; + homepage = "https://github.com/caneroj1/filter-logger#readme"; + description = "Filterable request logging wai middleware. Change how data is logged and when."; + license = stdenv.lib.licenses.mit; + }) {}; + "filtrable" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -67812,18 +69068,18 @@ self: { "find-clumpiness" = callPackage ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness - , containers, listsafe, optparse-applicative, text, text-show + , containers, listsafe, mtl, optparse-applicative, text, text-show , tree-fun, unordered-containers, vector }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.1.2"; - sha256 = "06gzzbqkkn6xjc0x0vky082g9s3hgmx0ihkwpggna8svfs7dikz9"; + version = "0.2.2.0"; + sha256 = "174i1yhd7z884xfci8ml9kbcm0qpnsbryj8vchrd7rwi63ya0rbw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base BiobaseNewick bytestring clumpiness containers listsafe - text text-show tree-fun unordered-containers vector + mtl text text-show tree-fun unordered-containers vector ]; executableHaskellDepends = [ aeson base BiobaseNewick bytestring clumpiness containers @@ -67832,7 +69088,6 @@ self: { homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-conduit" = callPackage @@ -68020,7 +69275,6 @@ self: { homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fit" = callPackage @@ -68062,8 +69316,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.1"; - sha256 = "0smv851kg4p4qfp29h85zm87x5y3qmqd3hxmznnf7cdp7arxgc74"; + version = "0.4.3"; + sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -68074,6 +69328,7 @@ self: { 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 @@ -68086,13 +69341,13 @@ self: { sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers cpphs directory filepath haskell-src-exts process split text uniplate ]; description = "Program to manage the imports of a haskell module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fix-parser-simple" = callPackage @@ -68270,8 +69525,8 @@ self: { }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.3.1.1"; - sha256 = "1byy8md3da7brf452d69fkwykip5jkn5j1837vf2c0r7x9j76k49"; + version = "0.3.1.2"; + sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; libraryHaskellDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -68439,7 +69694,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fizzbuzz" = callPackage @@ -68459,14 +69713,14 @@ self: { }: mkDerivation { pname = "fizzbuzz-as-a-service"; - version = "0.1.0.0"; - sha256 = "1h7spka2igi1yz1dwl1192i4g74wlxp3m011mi6s6j35xpvll99l"; + version = "0.1.0.1"; + sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring network-simple optparse-applicative ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service"; description = "FizzBuzz as a service"; license = stdenv.lib.licenses.asl20; }) {}; @@ -68480,6 +69734,7 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions filepath mtl text transformers vector wave @@ -68503,6 +69758,7 @@ self: { pname = "flac-picture"; version = "0.1.1"; sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ base bytestring data-default-class directory flac hspec JuicyPixels @@ -68868,8 +70124,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.7"; - sha256 = "0qhz3cplnpdj6c4hr576adcv4l4pmakncbqcc541gn5vql9lk5pi"; + version = "1.0.8"; + sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -69056,8 +70312,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.4"; - sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; + version = "0.5.3.9"; + sha256 = "1cvrknfg6h9w6njyx7w87qw19nd3n5615qxaf25fygd5yggydb19"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -69195,6 +70451,7 @@ self: { sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath mtl process Unixutils ]; @@ -69242,6 +70499,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt_0_5_0_0" = 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 + }: + mkDerivation { + pname = "fmt"; + version = "0.5.0.0"; + sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf"; + 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"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai @@ -69288,8 +70572,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "focus"; - version = "0.1.5"; - sha256 = "1cg7mkhv3ip87952k8kcjl1gx1nvcbhbq71czhxlnzi00qg68jzg"; + version = "0.1.5.2"; + sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; @@ -69302,8 +70586,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.5"; - sha256 = "0karz81fj5gzjspdznlsb856qmji0fifgv4qsbxr74d6v1hgzh3q"; + version = "0.2.0.6"; + sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -69416,7 +70700,6 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "foldl-transduce" = callPackage @@ -69475,8 +70758,8 @@ self: { }: mkDerivation { pname = "folds"; - version = "0.7.3"; - sha256 = "028akichhx88kyvl05c4yl4y89wwird76gjh8nmghzcdbylcpig7"; + version = "0.7.4"; + sha256 = "0wj5fd3icj05w3lziv4rmqahsh42kzckxybjacyvwb45kiy6yvjw"; configureFlags = [ "-f-test-hlint" ]; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -69510,8 +70793,8 @@ self: { ({ mkDerivation, base, xml }: mkDerivation { pname = "folgerhs"; - version = "0.1.0.0"; - sha256 = "1gvsvy17n2dk7j9kd6k7h1q2a4sn8xz80sv9mcrvz9qhrsinvbzv"; + version = "0.1.0.1"; + sha256 = "0kn89abvbk7faynhsyg177rayxddvwnkgsjb5cng8044n9glw9sb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base xml ]; @@ -69786,10 +71069,8 @@ self: { }: mkDerivation { pname = "forma"; - version = "0.1.0"; - sha256 = "10aqvr12hn6knzx0byz56ash4c3ss4r2bb80szl0dj2brasfzsaa"; - revision = "2"; - editedCabalFile = "00xy3385aw4xic7xv5ysfsvcxcn4bsbg9hj7sss4d7gx77ci0lf2"; + version = "0.2.0"; + sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00"; libraryHaskellDepends = [ aeson base containers data-default-class mtl text unordered-containers @@ -69812,6 +71093,7 @@ self: { sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal base bytestring containers directory file-embed HTTP indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc @@ -69847,7 +71129,6 @@ self: { homepage = "https://github.com/agrafix/format-numbers#readme"; description = "Various number formatting functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "format-status" = callPackage @@ -69918,6 +71199,7 @@ self: { sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal base bytestring cereal containers directory file-embed ghc-prim GraphSCC hslogger HTTP indents @@ -70001,42 +71283,14 @@ self: { }) {}; "fortran-src" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, fgl, filepath, GenericPretty, happy, hspec, mtl - , pretty, text, uniplate - }: - mkDerivation { - pname = "fortran-src"; - version = "0.1.0.4"; - sha256 = "022pmk129zwqr5xlr3ymh85m3lqlcpv6z8g2nf6ajj24zzkzl82f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers fgl GenericPretty mtl pretty text - uniplate - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base bytestring containers fgl GenericPretty mtl pretty text - uniplate - ]; - testHaskellDepends = [ - array base bytestring containers directory fgl filepath - GenericPretty hspec mtl pretty text uniplate - ]; - description = "Parser and anlyses for Fortran standards 66, 77, 90"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "fortran-src_0_1_0_6" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, fgl, filepath, GenericPretty, happy, hspec, mtl , pretty, text, uniplate }: mkDerivation { pname = "fortran-src"; - version = "0.1.0.6"; - sha256 = "1rmjcbhfh0j67ffrqg0qp4qsz7bv49k3iw40qy0kmwiivhkgbaxl"; + version = "0.2.0.0"; + sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70054,7 +71308,18 @@ self: { ]; description = "Parser and anlyses for Fortran standards 66, 77, 90"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "forward-chan" = callPackage + ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: + mkDerivation { + pname = "forward-chan"; + version = "0.0.0.0"; + sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f"; + libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ]; + homepage = "http://github.com/mmirman/forward-chan"; + description = "Concurrent channels with a forwarding primitive"; + license = stdenv.lib.licenses.asl20; }) {}; "foscam-directory" = callPackage @@ -70133,8 +71398,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.12"; - sha256 = "1dlrknx0rhi1vjiw8pb25n5ml5rfahhhvwj64svdg51zm3m3aiyr"; + version = "0.0.13"; + sha256 = "0pvmq3lkbdzj861l7jkf5xsib77j756y0vml8kgr2rckpz5qashh"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -70143,7 +71408,6 @@ self: { homepage = "https://github.com/haskell-foundation/foundation"; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -70269,6 +71533,7 @@ self: { sha256 = "0gbws8q7k2bv4i4v7km5nfjv8j42kmfjw4vhn1n6dr8xysrmbn3h"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base HUnit parsec parsec3-numbers QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -70347,6 +71612,7 @@ self: { sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base GLUT OpenGL random ]; homepage = "http://haskell.org/haskellwiki/Frag"; description = "A 3-D First Person Shooter Game"; @@ -70441,7 +71707,6 @@ self: { homepage = "https://github.com/salemove/freddy-hs"; description = "RabbitMQ Messaging API supporting request-response"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free" = callPackage @@ -70484,8 +71749,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "0.7.2"; - sha256 = "08c1i6rm007382py0lkiivkaz4cd7s1mh7d0bh11nzp9ci0q76ny"; + version = "0.8"; + sha256 = "179q79l9pax6wqj5dn6i68fwskaf4kbrndpbnhp8d7ba5i3wywfy"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -70635,6 +71900,7 @@ self: { sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cgi csv dataenc directory filepath free-theorems process time xhtml @@ -70657,7 +71923,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 @@ -70689,6 +71954,7 @@ self: { sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring containers directory EdisonCore filepath FTGL haskell98 mtl OpenGL pngload random SDL @@ -70736,7 +72002,6 @@ self: { homepage = "https://gitlab.com/queertypes/freer"; description = "Implementation of the Freer Monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-converse" = callPackage @@ -70835,7 +72100,7 @@ self: { }) {}; "freetype2" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, array, base }: mkDerivation { pname = "freetype2"; version = "0.1.2"; @@ -70843,6 +72108,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ array base ]; description = "Haskell binding for FreeType 2 library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70909,7 +72175,6 @@ self: { homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -70945,7 +72210,6 @@ self: { homepage = "https://github.com/TomMD/friday-juicypixels"; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-scale-dct" = callPackage @@ -70969,8 +72233,10 @@ self: { ({ mkDerivation, base, hspec, old-locale, time }: mkDerivation { pname = "friendly-time"; - version = "0.4"; - sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5"; + version = "0.4.1"; + sha256 = "1j4k8fjmb10zmj9pvn42mgirv9bpbk0w7n0ys7sp3wn34wr49wws"; + revision = "1"; + editedCabalFile = "096nfaqxavi6xblqh4q5dxks824liz75b4rm2la2hlkkn5mhqdgs"; libraryHaskellDepends = [ base old-locale time ]; testHaskellDepends = [ base hspec old-locale time ]; description = "Print time information in friendly ways"; @@ -71053,6 +72319,7 @@ self: { pname = "frpnow"; version = "0.18"; sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -71066,6 +72333,7 @@ self: { pname = "frpnow-gloss"; version = "0.12"; sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers frpnow gloss mtl transformers ]; @@ -71082,6 +72350,7 @@ self: { pname = "frpnow-gtk"; version = "0.11"; sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers frpnow glib gtk mtl transformers ]; @@ -71173,19 +72442,18 @@ self: { "fsnotify" = callPackage ({ mkDerivation, async, base, containers, directory, filepath - , hinotify, tasty, tasty-hunit, temporary-rc, text, time - , unix-compat + , hinotify, tasty, tasty-hunit, temporary, text, time, unix-compat }: mkDerivation { pname = "fsnotify"; - version = "0.2.1"; - sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb"; + version = "0.2.1.1"; + sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp"; libraryHaskellDepends = [ async base containers directory filepath hinotify text time unix-compat ]; testHaskellDepends = [ - async base directory filepath tasty tasty-hunit temporary-rc + async base directory filepath tasty tasty-hunit temporary unix-compat ]; homepage = "https://github.com/haskell-fswatch/hfsnotify"; @@ -71264,7 +72532,27 @@ 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 + ({ mkDerivation, base, directory, fsnotify, haskeline + , optparse-applicative, process + }: + mkDerivation { + pname = "fswatch"; + version = "0.1.0.1"; + sha256 = "0vmgqcrn60dv02bqbwaypkypgbzjb2nzv56c81drpalqr21ppcry"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory fsnotify haskeline optparse-applicative process + ]; + executableHaskellDepends = [ + base directory fsnotify haskeline optparse-applicative process + ]; + homepage = "https://github.com/kelemzol/watch"; + description = "File System watching tool with cli and slave functionalities"; + license = stdenv.lib.licenses.bsd3; }) {}; "fswatcher" = callPackage @@ -71311,8 +72599,8 @@ self: { }: mkDerivation { pname = "ftp-client"; - version = "0.4.0.1"; - sha256 = "0k0vyyaqkpmz4znc6gvdjk3g5qfximgdac9qh252icz30fhr3bn4"; + version = "0.5.0.0"; + sha256 = "17i6jml4v88wy456p3gjzc93db1sr0p5q19vb3jw61648nmswvgb"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -71329,8 +72617,8 @@ self: { }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.4.0.1"; - sha256 = "17rrirya6bk17qprzrjl6ndsyszqvwz5bya7l68wyqr4715gbaxs"; + version = "0.5.0.0"; + sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06"; libraryHaskellDepends = [ base bytestring conduit-combinators connection exceptions ftp-client resourcet @@ -71400,6 +72688,7 @@ self: { sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers free-theorems mtl pretty Shellac Shellac-readline ]; @@ -71440,6 +72729,8 @@ self: { pname = "full-text-search"; version = "0.2.1.3"; sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk"; + revision = "2"; + editedCabalFile = "1y89g5crlnfxhmxxijhw4ij89bg08ygcipkxb8byjiqhhh8y0r1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; @@ -71562,6 +72853,7 @@ self: { pname = "funcmp"; version = "1.8"; sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath process ]; homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; @@ -71941,7 +73233,6 @@ self: { ]; description = "A 'ten past six' style clock"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fwgl" = callPackage @@ -72067,7 +73358,6 @@ self: { homepage = "http://github.com/marcusbuffett/game-of-life"; description = "Conway's Game of Life"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-probability" = callPackage @@ -72195,8 +73485,8 @@ self: { }: mkDerivation { pname = "gc"; - version = "0.0.1"; - sha256 = "15jz191njpd1jfx2x2xvqpvsz81mifspj37xhgqsxlk6vb2a3xb1"; + version = "0.0.2"; + sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ @@ -72259,6 +73549,7 @@ self: { pname = "gconf"; version = "0.13.1.0"; sha256 = "1b8xl9jayr7x77af7cq4av82lf1r0j49pmbp1mz3gkadxw3adksp"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib text ]; libraryPkgconfigDepends = [ GConf ]; @@ -72399,6 +73690,7 @@ self: { sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air base bytestring data-default geek hack2 hack2-handler-snap-server pandoc text @@ -72494,6 +73786,7 @@ self: { homepage = "https://github.com/anfelor/gen-passwd#readme"; description = "Create wordlist-based passwords easily"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gencheck" = callPackage @@ -72522,6 +73815,7 @@ self: { sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base text ]; executableHaskellDepends = [ attoparsec base text ]; homepage = "https://github.com/womfoo/gender"; @@ -72646,6 +73940,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.9"; sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; + revision = "1"; + editedCabalFile = "10dy6kdn48pfl6njdhv7zwfkb3qkwazl9238n2sz9gmw575gqnjn"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -72751,12 +74047,18 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors + , QuickCheck + }: mkDerivation { pname = "generic-lens"; - version = "0.2.0.0"; - sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl"; - libraryHaskellDepends = [ base ]; + version = "0.4.0.0"; + sha256 = "0gqw9wdz2kf0jsx42l49f16xkb6yh741sv3kzss4d5laznmyh2v2"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ base hspec QuickCheck ]; + 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; @@ -72817,29 +74119,32 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: - mkDerivation { - pname = "generic-random"; - version = "0.4.1.0"; - sha256 = "1qif0cv7kzwvcmlldavbqih1mlzj65wrv80vgcavb1338f46zlfa"; - libraryHaskellDepends = [ base boltzmann-samplers QuickCheck ]; - homepage = "http://github.com/lysxia/generic-random"; - description = "Generic random generators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-random_0_5_0_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; version = "0.5.0.0"; sha256 = "00v514nadzm1g7pni1jqmxyzxs03v4vqj9p1qrxa46grk8ya3zsf"; - revision = "1"; - editedCabalFile = "1570wshlwb3ikws578zmrpfd560lpnd1idfx2w8plcb1znw7z7fj"; + revision = "2"; + editedCabalFile = "0h2gyf92p8afgsprb9wnfswh53kgrnlvkdixncmm5vm2dsi45xg5"; libraryHaskellDepends = [ 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 + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-random"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -72925,8 +74230,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "1"; - editedCabalFile = "03rq9imjpwzxa9qibfz5dia6gprfqkmpagnrxjdkmwa263lma27b"; + revision = "2"; + editedCabalFile = "0knkxg05kasx08flzjzhkl1mb28wifsghz02812vwajxpp6rysm5"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -72955,18 +74260,6 @@ self: { }) {}; "generics-sop" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: - mkDerivation { - pname = "generics-sop"; - version = "0.2.5.0"; - sha256 = "1p2dsdjxl1ld40c890i4jagp48zxp3i2njr9jd9ma89ydkypr5zk"; - libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; - testHaskellDepends = [ base ]; - description = "Generic Programming using True Sums of Products"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generics-sop_0_3_1_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; @@ -72976,7 +74269,6 @@ self: { testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop-lens" = callPackage @@ -72999,6 +74291,7 @@ self: { pname = "genericserialize"; version = "0.1"; sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Serialization library using Data.Generics"; license = stdenv.lib.licenses.bsd3; @@ -73102,6 +74395,7 @@ self: { sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory filepath GenI geniserver HTTP http-streams io-streams json text @@ -73125,6 +74419,7 @@ self: { sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary containers GenI haskell98 HaXml HUnit mtl parsec QuickCheck utf8-string @@ -73146,7 +74441,6 @@ self: { homepage = "https://github.com/danr/genifunctors"; description = "Generate generalized fmap, foldMap and traverse"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geniplate" = callPackage @@ -73237,6 +74531,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-aeson" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, genvalidity-vector, hspec + , QuickCheck, validity, validity-aeson + }: + mkDerivation { + pname = "genvalidity-aeson"; + version = "0.0.0.0"; + sha256 = "0pb84fg17vwmy95naaw1bl77pjvs9rzwgqnp8p0abh04qr9bxgh2"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring @@ -73273,7 +74590,6 @@ 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 @@ -73293,7 +74609,6 @@ 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 @@ -73315,7 +74630,6 @@ 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 @@ -73350,7 +74664,6 @@ 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 @@ -73389,7 +74702,6 @@ 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 @@ -73409,6 +74721,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-scientific" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, scientific, validity, validity-scientific + }: + mkDerivation { + pname = "genvalidity-scientific"; + version = "0.0.0.0"; + sha256 = "1s4gca2nkfhs5yzp0xnjy0fbadg4bphfd533z8zachh2ycwi69kh"; + libraryHaskellDepends = [ + base genvalidity QuickCheck scientific validity validity-scientific + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck scientific + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text @@ -73426,7 +74757,6 @@ 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 @@ -73444,7 +74774,46 @@ 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 + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "1yvav983wq3rff5k9fpjw6m8hsn3jxymfqklw4vc5m0g5v4al8f9"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-vector" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.0.0.0"; + sha256 = "032dkx4wzla7aap31122f0cw31h8f5j36dq7xmvd2q9ssrcr39h7"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; }) {}; "geo-resolver" = callPackage @@ -73479,6 +74848,7 @@ self: { pname = "geo-uk"; version = "0.1.0.2"; sha256 = "1b97kzx4i0jjrmh6iyhxcs1ms4vbiyyywmhccx1a6q6ia82dgcpy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring bzlib template-haskell th-lift ]; @@ -73540,6 +74910,7 @@ self: { pname = "geodetics"; version = "0.0.4"; sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base dimensional ]; testHaskellDepends = [ array base dimensional HUnit QuickCheck test-framework @@ -73548,7 +74919,6 @@ self: { homepage = "https://github.com/PaulJohnson/geodetics"; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -73568,15 +74938,14 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.2.2.0"; - sha256 = "0gnh9gwgb9lkjdp8j5ajdd4qqnm92821q12z3jzxigrwkxr9z8h4"; + version = "0.3.0.0"; + sha256 = "1yazd4wgf4ivk2x3apymddcww24z7a4b0jxzph7l8273wd8dy8zg"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text ]; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geojson" = callPackage @@ -73714,16 +75083,17 @@ self: { "gf" = callPackage ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi , containers, directory, exceptions, filepath, happy, haskeline - , HTF, httpd-shed, HUnit, json, mtl, network, network-uri - , old-locale, parallel, pretty, process, random, terminfo, time - , time-compat, unix, utf8-string + , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network + , network-uri, old-locale, parallel, pretty, process, random + , terminfo, time, time-compat, unix, utf8-string }: mkDerivation { pname = "gf"; - version = "3.8"; - sha256 = "02ds6pm7lv5ijkjh1xikglibnnapk72rz78l5kv5ikzxahhgslbg"; + version = "3.9"; + sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cgi containers directory exceptions filepath haskeline httpd-shed json mtl network network-uri old-locale @@ -73731,7 +75101,7 @@ self: { utf8-string ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base containers lifted-base mtl ]; testHaskellDepends = [ base Cabal directory filepath HTF HUnit process ]; @@ -73754,6 +75124,7 @@ self: { sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers parsec ]; homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/"; description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)."; @@ -73781,14 +75152,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-boot_8_0_2" = callPackage + "ghc_8_2_1" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy + , hoopl, hpc, process, template-haskell, terminfo, time + , transformers, unix + }: + mkDerivation { + pname = "ghc"; + version = "8.2.1"; + sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell + terminfo time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + homepage = "http://www.haskell.org/ghc/"; + description = "The GHC API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-boot_8_2_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.0.2"; - sha256 = "0q446bcz38rql96k42yvfyhdg98lycijva1smw2izwv04hx200zp"; + version = "8.2.1"; + sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h"; + revision = "1"; + editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -73797,18 +75192,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_0_2" = callPackage + "ghc-boot-th_8_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.0.2"; - sha256 = "1w7qkgwpbp5h0hm8p2b5bbysyvnjrqbkqkfzd4ngz0yxy9qy402x"; + version = "8.2.1"; + sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4"; 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 + ({ mkDerivation, base, bytestring, ghc-prim }: + mkDerivation { + pname = "ghc-compact"; + version = "0.1.0.0"; + sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + description = "In memory storage of deeply evaluated data structure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-core" = callPackage ({ mkDerivation, base, colorize-haskell, directory, filepath , pcre-light, process @@ -73837,6 +75244,7 @@ self: { sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-html bytestring containers mtl parsec process ]; @@ -73896,30 +75304,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, mtl - }: - mkDerivation { - pname = "ghc-events"; - version = "0.4.4.0"; - sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb"; - revision = "1"; - editedCabalFile = "0rfwiy10mjl4vyv3gjsi6chz34ra4qicq3px2nm5vrzmlalla8d5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers mtl - ]; - executableHaskellDepends = [ - array base binary bytestring containers mtl - ]; - testHaskellDepends = [ - array base binary bytestring containers mtl - ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_6_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers }: mkDerivation { pname = "ghc-events"; @@ -73931,10 +75315,9 @@ self: { array base binary bytestring containers ]; executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; + 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 @@ -73991,8 +75374,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.3.1"; - sha256 = "0wip93rawhzvbza8km925v43f7h271lj7byzwia5dqj3hqxbiwjl"; + version = "0.5.5.0"; + sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74007,30 +75390,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_5_4_0" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.5.4.0"; - sha256 = "1kpfk81iir3dn4420lczwal9bhs787z24g05vdd0g44jcp07d6nk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -74066,6 +75425,7 @@ self: { pname = "ghc-heap-view"; version = "0.5.9"; sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ghc template-haskell transformers ]; @@ -74142,46 +75502,6 @@ self: { }) {}; "ghc-mod" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper - , containers, deepseq, directory, djinn-ghc, doctest, extra - , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl - , old-time, optparse-applicative, pipes, pretty, process, safe - , semigroups, split, syb, template-haskell, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.7.0.0"; - sha256 = "1jp5p6pjx3nzfx7xr3hgw9d4l9vlsijj0kpagj016rdbi4629ara"; - revision = "1"; - editedCabalFile = "1qyijh62wny3vxs72caqfphj10ld11zcf929gdaqs3ip5ixjb61a"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ - base Cabal containers filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths - ghc-syb-utils haskell-src-exts hlint monad-control monad-journal - mtl old-time optparse-applicative pipes pretty process safe split - syb template-haskell temporary text time transformers - transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc monad-control - mtl old-time optparse-applicative pretty process semigroups split - time - ]; - testHaskellDepends = [ base doctest hspec ]; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "ghc-mod_5_8_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper , containers, criterion, deepseq, directory, djinn-ghc, doctest , extra, fclabels, filepath, ghc, ghc-boot, ghc-paths @@ -74195,8 +75515,11 @@ self: { pname = "ghc-mod"; version = "5.8.0.0"; sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3"; + revision = "1"; + editedCabalFile = "11rccscsxv4x7xcdxaz83vjisyiadsiq48mn2v1hs8fylqx6dkdf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal containers directory filepath process template-haskell transformers @@ -74225,7 +75548,6 @@ 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 @@ -74297,8 +75619,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.8.0"; - sha256 = "0ljizdzrgn64s70li3yp273ib323jkpflcf305zfgia277vrskj9"; + version = "0.2.0.0"; + sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; @@ -74355,12 +75677,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_0_0" = callPackage + "ghc-prim_0_5_1_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.0.0"; - sha256 = "1cnn5gcwnc711ngx5hac3x2s4f6dkdl7li5pc3c02lcghpqf9fs4"; + version = "0.5.1.0"; + sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -74373,13 +75695,14 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.3.0.2"; - sha256 = "188gfhn8lisw2mi43g0bdx7kd8g4q68b01hj0w13r00jpxik98cr"; + version = "1.4.0.2"; + sha256 = "0qcz4283gm9hxnqx462rdn1r3q9jmad19b3y8n0z4lsrpfziynq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; + executableHaskellDepends = [ base containers scientific text ]; testHaskellDepends = [ attoparsec base containers directory filepath process tasty tasty-hunit temporary text @@ -74389,29 +75712,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prof_1_4_0_1" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; - version = "1.4.0.1"; - sha256 = "1q09v2b2nzddwwj76ig7d6ikxv8dnw7v3ngg781fsjvy14cljbmg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - homepage = "https://github.com/maoe/ghc-prof"; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -74513,15 +75813,14 @@ self: { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.2"; - sha256 = "0x3kd39jlhkgx3p2hm0a1wy571fis529jn2iz0jkw3mj6ikjnm7k"; + version = "0.2.1"; + sha256 = "04m8cblgxb3axjhsbwlb18jmlcfhcllm68c1d5pzv6av404ild4z"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; @@ -74539,6 +75838,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text time ]; + executableHaskellDepends = [ attoparsec base containers text ]; testHaskellDepends = [ attoparsec base directory filepath process tasty tasty-hunit temporary text @@ -74548,6 +75848,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-timers" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-timers"; + version = "0.1.0.0"; + sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/bitonic/ghc-timers#readme"; + description = "Provides bindings to functions starting and stopping the RTS timers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -74577,8 +75889,10 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.2.4"; - sha256 = "10iyngq3sqd01nrq5allc0q8s8zqvrp3j1yh02p3yyjijjnhm53n"; + version = "0.3"; + sha256 = "0dq419pd8mf8x48wcr3ciygrwy40kvcl5iq307836ss2r506nrqc"; + revision = "1"; + editedCabalFile = "17k7rarp56ljxz2j7p17jh1wgbqfcv9l1pj8vrffidb9r8sj448q"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons template-haskell transformers @@ -74592,15 +75906,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-knownnat_0_3" = callPackage + "ghc-typelits-knownnat_0_3_1" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.3"; - sha256 = "0dq419pd8mf8x48wcr3ciygrwy40kvcl5iq307836ss2r506nrqc"; + version = "0.3.1"; + sha256 = "1kprh0fahkbpf7rqbgi8l6883784a8n7k8g40nkdhii7gal9715g"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons template-haskell transformers @@ -74646,6 +75960,7 @@ self: { base equational-reasoning ghc ghc-tcplugins-extra presburger reflection ]; + executableHaskellDepends = [ base equational-reasoning ]; homepage = "https://github.com/konn/ghc-typelits-presburger#readme"; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -74675,6 +75990,7 @@ self: { pname = "ghc-vis"; version = "0.8"; sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot @@ -74685,17 +76001,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_0_2" = callPackage + "ghci_8_2_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, filepath, ghc-boot, template-haskell, transformers, unix + , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell + , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.0.2"; - sha256 = "0dg1vlv1qj003xm9klqkzhrdkdcwa1nbnhgl86dpq1z15a74svcq"; + version = "8.2.1"; + sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot - template-haskell transformers unix + ghc-boot-th template-haskell transformers unix ]; description = "The library supporting GHC's interactive interpreter"; license = stdenv.lib.licenses.bsd3; @@ -74859,6 +76176,7 @@ self: { pname = "ghcjs-codemirror"; version = "0.0.0.1"; sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ghcjs/CodeMirror"; description = "Installs CodeMirror JavaScript files"; @@ -74869,20 +76187,19 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.0.0"; - sha256 = "0z55qfvnyq5z22ynmnrxdymq6jgcs7ps04bznqna4fbcvlqy0zm9"; + version = "0.9.2.0"; + sha256 = "0yhvnxrh68rc33h3m6zg6vzc4byr1yg09zfxn7g39skzn1mrj0aa"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp - , jsaddle-webkit2gtk, mtl + , jsaddle-webkit2gtk, jsaddle-wkwebview, mtl }: mkDerivation { pname = "ghcjs-dom-hello"; @@ -74890,11 +76207,13 @@ self: { sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghcjs-dom jsaddle jsaddle-warp mtl ]; executableHaskellDepends = [ - base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl + base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk jsaddle-wkwebview + mtl ]; homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; @@ -74906,21 +76225,25 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.9.0.0"; - sha256 = "0ghk8nvfhwm5zwwiws2621gk08x73w11v0cab5nsdpyz1qn0dl5j"; + version = "0.9.2.0"; + sha256 = "05ings3n2zlgnwg9a17s21yzh4pnag1cz62yyddaxbqpxn4xkj6l"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-jsffi" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, ghc-prim, ghcjs-base, ghcjs-prim, text + , transformers + }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.9.0.0"; - sha256 = "1q04gibg5jlqs287vwig43bxyi9gpy951mfpmv17qky8b50sxkmc"; + version = "0.9.2.0"; + sha256 = "1xj94izrypxnb91lgsq0lfzqqs11sxbs24nkw8sn2wkmmh5pd8vd"; + libraryHaskellDepends = [ + base ghc-prim ghcjs-base ghcjs-prim text transformers + ]; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -74942,24 +76265,6 @@ self: { }) {}; "ghcjs-hplay" = callPackage - ({ mkDerivation, base, containers, ghcjs-perch, mtl, transformers - , transient, transient-universe - }: - mkDerivation { - pname = "ghcjs-hplay"; - version = "0.3.4.2"; - sha256 = "1ma9j7vxffnlac6mp3z6jl8s5sd6yjs9q1zgv5pzr4j7ic8fbnf3"; - libraryHaskellDepends = [ - base containers ghcjs-perch mtl transformers transient - transient-universe - ]; - homepage = "https://github.com/agocorona/ghcjs-hplay"; - description = "Client-side web EDSL for transient nodes running in the web browser"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ghcjs-hplay_0_4_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory , ghcjs-perch, mtl, transformers, transient, transient-universe }: @@ -75015,6 +76320,9 @@ self: { base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split template-haskell ]; + executableHaskellDepends = [ + base containers ghcjs-base ghcjs-ffiqq + ]; description = "Virtual-dom bindings for GHCJS"; license = stdenv.lib.licenses.mit; broken = true; @@ -75119,16 +76427,17 @@ self: { "gi-atk" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers }: mkDerivation { pname = "gi-atk"; - version = "2.0.12"; - sha256 = "1d15ylg9p46csmb8nicir1bg011gd4h123xfmvq8ksm7g85an9hk"; + version = "2.0.14"; + sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ atk ]; doHaddock = false; @@ -75139,16 +76448,17 @@ self: { "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, text, transformers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers }: mkDerivation { pname = "gi-cairo"; - version = "1.0.12"; - sha256 = "1q1bc1fqbk4cxqp99wyjhdp2wpgr9pakrr0pfsss9s9amb0kw98k"; + version = "1.0.14"; + sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo ]; doHaddock = false; @@ -75164,38 +76474,39 @@ self: { "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 - , haskell-gi, haskell-gi-base, text, transformers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers }: mkDerivation { pname = "gi-gdk"; - version = "3.0.12"; - sha256 = "1ridy0bj5s0zfawy7i1qf7n24d0wwbmyr04h1ss03zsx1jg5y66q"; + version = "3.0.14"; + sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi haskell-gi-base text transformers + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text - , transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.12"; - sha256 = "0kxqg74rxv5z3bd5sgx5rzm2hhc565nm4ab2vhfdy4lvmscwq9gr"; + version = "2.0.14"; + sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gdk_pixbuf ]; doHaddock = false; @@ -75204,18 +76515,41 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk_pixbuf;}; + "gi-ggit" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libgit2-glib, text, transformers + }: + mkDerivation { + pname = "gi-ggit"; + version = "1.0.1"; + sha256 = "08jfsfjvdbyd1m1si2r50frc4s3x5x9710r2np6wl1p0y3pk20cf"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libgit2-glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "libgit2-glib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) libgit2-glib;}; + "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.12"; - sha256 = "13ancpyxlzrqyz8jwjizs7nmys9wmmh1k90armmlah03xlsssjz6"; + version = "2.0.14"; + sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ glib ]; doHaddock = false; @@ -75226,38 +76560,38 @@ self: { "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , gobjectIntrospection, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.12"; - sha256 = "1fbyr65pc1i264f0cn43g1cbdzkvc5m0cdd997m2sx77nlc481m8"; + version = "1.0.14"; + sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base - text transformers + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib - , haskell-gi, haskell-gi-base, text, transformers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers }: mkDerivation { pname = "gi-glib"; - version = "2.0.12"; - sha256 = "0pbfr8jgavg3csxbmjq6rv7hqj9g2h8b02ji1d3pjcpdmnzhh3mx"; + version = "2.0.14"; + sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ glib ]; doHaddock = false; @@ -75268,16 +76602,17 @@ self: { "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, text, transformers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.12"; - sha256 = "19d9agggpldzifjgc7g84lqk4vp3jd9lbbnrw5k8h4f37hq0n4c2"; + version = "2.0.14"; + sha256 = "12w4fph341b6gxp6bd6xnrc4cs8bxhwkz33z4ndlkrb75a0289lg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base text - transformers + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ glib ]; doHaddock = false; @@ -75286,86 +76621,106 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-gst" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text + "gi-gobject_2_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.15"; + sha256 = "0h98lld62dhdbw7s0c833jw15wxajy6nmvr69604px3saf4mjrrl"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + + "gi-gst" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: mkDerivation { pname = "gi-gst"; - version = "1.0.12"; - sha256 = "08131f3smycwdpgpx2gkyb3aq3hi1g9gr4zx3isqi2pff7z2qrnb"; + version = "1.0.14"; + sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.12"; - sha256 = "1aidn8kc3i81hdh1xpiyv0nh4n0ncwdfyigv5n64jdf9j7faqp3z"; + version = "1.0.14"; + sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.13"; - sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b"; + version = "1.0.15"; + sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo - , gstreamer-pbutils, haskell-gi, haskell-gi-base, text - , transformers + , gstreamer-pbutils, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.12"; - sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3"; + version = "1.0.14"; + sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio - gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers + gi-gsttag gi-gstvideo haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; doHaddock = false; @@ -75378,16 +76733,16 @@ self: { "gi-gsttag" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.12"; - sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2"; + version = "1.0.14"; + sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-tag ]; doHaddock = false; @@ -75400,46 +76755,45 @@ self: { "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.12"; - sha256 = "0vi9c6bbqdl0x58nykmqyiffdvcs2mcgnd02kdpb2a7x2plfnvxs"; + version = "1.0.14"; + sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtk"; - version = "3.0.15"; - sha256 = "176hvvrl2w71dy096irazr83v07qd8nixl6gsihn2i9caaxn4scb"; + version = "3.0.17"; + sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text - transformers + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gtk-hs" = callPackage @@ -75449,8 +76803,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.4.3"; - sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda"; + version = "0.3.5.0"; + sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -75458,22 +76812,21 @@ 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 = stdenv.lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.12"; - sha256 = "0agqq13nc73c8m0cbk0c3gx5jdgmwv6kzpmiai33qyhyva7jn2jx"; + version = "2.0.14"; + sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; doHaddock = false; @@ -75487,60 +76840,60 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.13"; - sha256 = "0fg6pzrs1r43gfcsmah7rm3p03pry84nryjv1p0ckd5g083pln6z"; + version = "3.0.15"; + sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtksourceview3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, text, transformers, webkitgtk24x + , haskell-gi-base, haskell-gi-overloading, text, transformers , webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-javascriptcore"; - version = "3.0.12"; - sha256 = "1wfcl5b8kwngy433k74r0nfyx170wyyg9qx5axalvwxk7n3vjyz6"; + version = "3.0.14"; + sha256 = "1r2q176a38ylbawkrd17vdiqg0cnk5vzbp4rfgrlzfz6vp6gimi4"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ]; + 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; webkitgtk24x-gtk3 = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; - "gi-javascriptcore_4_0_12" = callPackage + "gi-javascriptcore_4_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, text, transformers, webkitgtk + , haskell-gi-base, haskell-gi-overloading, text, transformers + , webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.12"; - sha256 = "1wwpapn0w461njr13raws2i7aazkrsw1254aim0a2lc6h0xapbg3"; + version = "4.0.14"; + sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75552,17 +76905,17 @@ self: { "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libnotify, text, transformers }: mkDerivation { pname = "gi-notify"; - version = "0.7.12"; - sha256 = "0rc9frrg43blwsxpjyqjrrrjgq10p1hpnfrp1vd6jq3prbh0pp36"; + version = "0.7.14"; + sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libnotify ]; doHaddock = false; @@ -75574,17 +76927,17 @@ self: { "gi-ostree" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, ostree, text, transformers }: mkDerivation { pname = "gi-ostree"; - version = "1.0.3"; - sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj"; + version = "1.0.5"; + sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ ostree ]; doHaddock = false; @@ -75596,17 +76949,17 @@ self: { "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers }: mkDerivation { pname = "gi-pango"; - version = "1.0.13"; - sha256 = "0nrkaq135gb14zahd5805lkbi81vavbzs9cdxw5p33im62dihbzl"; + version = "1.0.15"; + sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; @@ -75617,22 +76970,22 @@ 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 ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, pango, text, transformers + , haskell-gi-base, haskell-gi-overloading, pango, text + , transformers }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.13"; - sha256 = "0gs9cpd1a8imkqcd995hp6kjk6v8ai6mlqc9rm5jv0hvicjr948g"; + version = "1.0.15"; + sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; @@ -75643,22 +76996,21 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler - , text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, poppler, text, transformers }: mkDerivation { pname = "gi-poppler"; - version = "0.18.12"; - sha256 = "04dza9hh8bbn5i6qhk5140ii5nxd9xpz6xfcfd8a08r0bsav35zp"; + version = "0.18.14"; + sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ poppler ]; doHaddock = false; @@ -75670,17 +77022,17 @@ self: { "gi-secret" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsecret, text, transformers }: mkDerivation { pname = "gi-secret"; - version = "0.0.2"; - sha256 = "18f2nyx79bk9mixmi5xbzmvylb4q1gxgqzynl2y77zhd3q3fcgzc"; + version = "0.0.4"; + sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsecret ]; doHaddock = false; @@ -75691,17 +77043,17 @@ self: { "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsoup, text, transformers }: mkDerivation { pname = "gi-soup"; - version = "2.4.12"; - sha256 = "04jzgcbacs3ynn7flg94a2vggf6npb9iv6nfvjbzkghrdw0ncp97"; + version = "2.4.14"; + sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsoup ]; doHaddock = false; @@ -75713,16 +77065,17 @@ self: { "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, text, transformers, vte + , haskell-gi-base, haskell-gi-overloading, text, transformers, vte }: mkDerivation { pname = "gi-vte"; - version = "2.91.14"; - sha256 = "1xvv91q99918rbbkk3q2vy8sg22dh835ih51mibmz994r4pgh82s"; + version = "2.91.16"; + sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base text transformers + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers ]; libraryPkgconfigDepends = [ vte ]; doHaddock = false; @@ -75736,41 +77089,41 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkitgtk24x, webkitgtk24x-gtk3 + , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-webkit"; - version = "3.0.12"; - sha256 = "0r195s3fx2nkks4mzv4zi7a9isd4qkwvxfb9v5fknz46virppm01"; + version = "3.0.14"; + sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk - , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkitgtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.12"; - sha256 = "1c392g4gk8mzrkr6d4rw6nbriyqc41nzl8svwpg0xa2bwpakz33z"; + version = "4.0.14"; + sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75783,16 +77136,18 @@ self: { "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkitgtk-web-extension + , haskell-gi-overloading, text, transformers + , webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.12"; - sha256 = "0xyaxm0b9kijzpxf3dn0x6s9k0shkj7la7nyc4f5a04nkndv0gsi"; + version = "4.0.14"; + sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi haskell-gi-base text transformers + gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text + transformers ]; libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; @@ -75843,10 +77198,11 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.9.1"; - sha256 = "0g1jq12dw868x0s6l28kk0m9713zhwwfbw0n2n2dvbidrlvnpwi8"; + 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 @@ -75864,10 +77220,9 @@ 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; }) {}; - "ginger_0_5_3_0" = callPackage + "ginger_0_6_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers @@ -75875,10 +77230,11 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.5.3.0"; - sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34"; + version = "0.6.0.1"; + sha256 = "0c843zx5jnw1z0gbiyq5asx5amz6bh87kn1f7359p4p1l4qg44sk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default filepath http-types mtl parsec safe scientific text time transformers unordered-containers @@ -75911,6 +77267,7 @@ self: { sha256 = "061mwhxgxqqvlqznldjgqvs2z739q452shd6h72lahj5nm3v5m41"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array async base binary bytestring containers directory hashable hashtables mtl network old-locale old-time parsec pretty process @@ -75930,6 +77287,7 @@ self: { pname = "gio"; version = "0.13.3.1"; sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring containers glib mtl @@ -75961,6 +77319,7 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "giphy-api" = callPackage @@ -75980,6 +77339,7 @@ self: { microlens microlens-th mtl network-uri servant servant-client text transformers ]; + executableHaskellDepends = [ base network-uri text ]; testHaskellDepends = [ aeson base basic-prelude bytestring containers directory hspec lens network-uri text @@ -75987,7 +77347,6 @@ self: { homepage = "http://github.com/passy/giphy-api#readme"; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -76019,6 +77378,7 @@ self: { pname = "git"; version = "0.2.0"; sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring containers cryptonite hourglass memory mtl patience random system-fileio system-filepath unix-compat @@ -76075,8 +77435,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170520"; - sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq"; + version = "6.20170818"; + sha256 = "0ybxixbqvy4rx6mq9s02rh349rbr04hb17z4bfayin0qwa5kzpvx"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -76138,6 +77498,7 @@ self: { sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath optparse-applicative parsec pretty process ]; @@ -76284,7 +77645,6 @@ self: { homepage = "https://github.com/Peaker/git-mediate"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-monitor" = callPackage @@ -76380,25 +77740,27 @@ self: { "git-vogue" = callPackage ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff - , directory, filepath, formatting, ghc-mod, git, haskell-src-exts - , hlint, hscolour, hspec, optparse-applicative, process, split - , strict, stylish-haskell, temporary, text, transformers, unix + , directory, extra, filepath, formatting, ghc-mod, git + , haskell-src-exts, hlint, hscolour, hspec, optparse-applicative + , process, split, strict, stylish-haskell, temporary, text + , transformers, unix }: mkDerivation { pname = "git-vogue"; - version = "0.2.1.1"; - sha256 = "1mah90zlpvg8lajvh530bkvak5zs8nirxlj9xx3wmvwxw862c6mh"; - revision = "1"; - editedCabalFile = "00pqgbjdzzqf10201yv934llaq2xflad9djix21f05nk7qq62g0r"; + version = "0.2.2.1"; + sha256 = "1gx96rh97gbbf2h64rpar00pdph4vdvhwpw7hmmi1vh5ynqp4zrs"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - base containers directory filepath formatting optparse-applicative - process split text transformers unix + base containers directory extra filepath formatting + optparse-applicative process split text transformers unix ]; executableHaskellDepends = [ base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts - hlint hscolour optparse-applicative strict stylish-haskell text + hlint hscolour optparse-applicative process strict stylish-haskell + text ]; testHaskellDepends = [ base containers directory filepath hspec process temporary @@ -76480,10 +77842,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.15.0"; - sha256 = "02fnxbz1in5fsacfsm39i7dgpk1waqqkhkdxa77bl6b68ifc74gh"; - revision = "3"; - editedCabalFile = "03x27qmqvs4xc9ic0219d69jhwpsk552nr7wdgzyi005l1jhs12h"; + version = "0.16.0"; + sha256 = "0cr5cw3057sk86flb3annjn0yndbw4xz059vsigk52xwydjgxyqw"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -76499,7 +77859,6 @@ self: { 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 @@ -76556,8 +77915,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.3"; - sha256 = "1jq69syllagq6g04wlsii2w2nqlck9g9dzs1dscwdbaal0907ck9"; + version = "1.0.5"; + sha256 = "1dmilm5mwgb975f6n34x3ylnkipqrvxcimkvj6pyfw97bdcclacb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76568,7 +77927,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -76589,7 +77947,6 @@ self: { homepage = "https://toktok.github.io/"; description = "Various Github helper utilities"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "github-types" = callPackage @@ -76631,6 +77988,8 @@ self: { pname = "github-webhook-handler"; version = "0.0.8"; sha256 = "1sjgnc1zl3xsv25nc71bw0dmj8z7iacf6b8cf8vc50v6c1a8i40x"; + revision = "1"; + editedCabalFile = "1nhwindcplcyyffvzw0cig1p0m8165laq3hv94s596rsi3b5pgqr"; libraryHaskellDepends = [ aeson base bytestring cryptohash github-types text transformers uuid vector @@ -76647,13 +78006,14 @@ self: { pname = "github-webhook-handler-snap"; version = "0.0.7"; sha256 = "149c40rp2r7ib6x256rpnfg56hhp1kxznmglppciq33s0bs2dxfl"; + revision = "1"; + editedCabalFile = "1l0c2xn41pylap7vw33r67pmmcafr1fdm04l9b8h206c270bsinm"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid ]; description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -76692,6 +78052,7 @@ self: { sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring ConfigFile containers directory feed filepath filestore ghc ghc-paths @@ -76887,22 +78248,6 @@ self: { }) {}; "gitrev" = callPackage - ({ mkDerivation, base, directory, filepath, process - , template-haskell - }: - mkDerivation { - pname = "gitrev"; - version = "1.2.0"; - sha256 = "00ii00j5bnxnhnmzcsbqfin8kdj6n9ll7akg3j8apajwvd7f74a3"; - libraryHaskellDepends = [ - base directory filepath process template-haskell - ]; - homepage = "https://github.com/acfoltzer/gitrev"; - description = "Compile git revision info into Haskell projects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gitrev_1_3_1" = callPackage ({ mkDerivation, base, base-compat, directory, filepath, process , template-haskell }: @@ -76916,7 +78261,6 @@ self: { homepage = "https://github.com/acfoltzer/gitrev"; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitson" = callPackage @@ -76988,7 +78332,6 @@ self: { homepage = "http://github.com/passy/givegif#readme"; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gjk" = callPackage @@ -77063,6 +78406,7 @@ self: { pname = "glade"; version = "0.13.1"; sha256 = "0idyx4d2jw1209j4wk7ay5jrs2r6bn3qj4qgh70q6p08a8hcgfbb"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; @@ -77141,18 +78485,6 @@ self: { }) {}; "glaze" = callPackage - ({ mkDerivation, base, lens }: - mkDerivation { - pname = "glaze"; - version = "0.2.0.2"; - sha256 = "0b698imawd2dyy5n8c67xg14hpc5qvywpnz6913wgnn2ss0p1chn"; - libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/louispan/glaze#readme"; - description = "Framework for rendering things with metadata/headers and values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glaze_0_3_0_1" = callPackage ({ mkDerivation, base, lens }: mkDerivation { pname = "glaze"; @@ -77162,26 +78494,9 @@ self: { homepage = "https://github.com/louispan/glaze#readme"; description = "Framework for rendering things with metadata/headers and values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier" = callPackage - ({ mkDerivation, base, lens, mmorph, mtl, profunctors - , semigroupoids, transformers - }: - mkDerivation { - pname = "glazier"; - version = "0.7.0.0"; - sha256 = "0a5lga72ja5gg5ki3c4hqhii4rsnyk2fh0qqcyi3wpchvyhqisqk"; - libraryHaskellDepends = [ - base lens mmorph mtl profunctors semigroupoids transformers - ]; - homepage = "https://github.com/louispan/glazier#readme"; - description = "Composable widgets framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glazier_0_11_0_1" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids , transformers }: @@ -77195,27 +78510,9 @@ self: { homepage = "https://github.com/louispan/glazier#readme"; description = "Composable widgets framework with enhanced with transformers and lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-pipes" = callPackage - ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes - , pipes-concurrency, pipes-misc, stm, stm-extras, transformers - }: - mkDerivation { - pname = "glazier-pipes"; - version = "0.1.4.0"; - sha256 = "1k46l388azr95njq008ibxk16fwvqxa2pswfdaxqrbckx018071m"; - libraryHaskellDepends = [ - base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm - stm-extras transformers - ]; - homepage = "https://github.com/louispan/glazier-pipes#readme"; - description = "Converts Glazier widgets into a Pipe"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glazier-pipes_0_1_5_1" = callPackage ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras , transformers }: @@ -77229,7 +78526,6 @@ self: { homepage = "https://github.com/louispan/glazier-pipes#readme"; description = "A threaded rendering framework using glaizer and pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react" = callPackage @@ -77251,7 +78547,6 @@ 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 @@ -77275,7 +78570,6 @@ 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 @@ -77295,7 +78589,6 @@ 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 @@ -77356,7 +78649,6 @@ 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 @@ -77370,7 +78662,6 @@ 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 @@ -77381,6 +78672,7 @@ self: { sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ppm split ]; description = "A simple ray tracer in an early stage of development"; license = stdenv.lib.licenses.bsd3; @@ -77389,24 +78681,26 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers - , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit - , irc-core, kan-extensions, lens, network, process, regex-tdfa - , semigroupoids, socks, split, stm, text, time, transformers, unix - , unordered-containers, vector, vty + , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL + , HUnit, irc-core, kan-extensions, lens, network, process + , regex-tdfa, semigroupoids, socks, split, stm, template-haskell + , text, time, transformers, unix, unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.22"; - sha256 = "02kfxarddlb7yjj17slvn28pz49m27l7ag06milxjg0k157dxkpi"; + version = "2.23"; + sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah"; + revision = "2"; + editedCabalFile = "14jk02g995qpa1amkngy7vqyxjfxmmwr0585sjg2d6jw2wrzydal"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema - config-value containers directory filepath gitrev hashable hookup - HsOpenSSL irc-core kan-extensions lens network process regex-tdfa - semigroupoids socks split stm text time transformers unix - unordered-containers vector vty + config-value containers directory filepath free gitrev hashable + hookup HsOpenSSL irc-core kan-extensions lens network process + regex-tdfa semigroupoids socks split stm template-haskell text time + transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -77559,22 +78853,6 @@ self: { }) {}; "gloss" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; - version = "1.10.2.5"; - sha256 = "1ia2vifilk72j9xprqi5qfhf6bvhk0xygbdmcqlzfa98i52w7iz5"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - homepage = "http://gloss.ouroborus.net"; - description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss_1_11_1_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -77582,13 +78860,14 @@ self: { pname = "gloss"; version = "1.11.1.1"; sha256 = "0lyns4jzh4najgbavlhalix6br1dc0smqrakj46ls30jp909bq0l"; + revision = "1"; + editedCabalFile = "1bxdf2kmdcqndg25jgh0l1bmr39795gxrcx0rgzcich4n8l88pvb"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -77597,10 +78876,11 @@ self: { pname = "gloss-accelerate"; version = "2.0.0.0"; sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if"; + revision = "1"; + editedCabalFile = "1arsf3j8b59qr5z5sy5sxx5mdddagjginrqs3jb9lpj1s3c3672b"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -77613,7 +78893,6 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-banana" = callPackage @@ -77652,6 +78931,8 @@ self: { pname = "gloss-examples"; version = "1.11.1.1"; sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1"; + revision = "2"; + editedCabalFile = "0ldnhqmxs03040m5ym0qw1ig217j893rm1sq7rnjsmvh15ziw4yh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77704,13 +78985,14 @@ self: { pname = "gloss-raster"; version = "1.11.1.1"; sha256 = "0ikwg3ckq82qysbc3jisvxylcq13x7cnwyci6gi6dys64vmrfy17"; + revision = "1"; + editedCabalFile = "1kx0n4kwy5xdg4b5b79a815y8yqcsld8s5p784qhgg92s0cmnsjf"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage @@ -77721,6 +79003,8 @@ self: { pname = "gloss-raster-accelerate"; version = "2.0.0.0"; sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; + revision = "1"; + editedCabalFile = "07c56r31akmq7hq0cyw4lc4h5370laand231wjd5ffwk369x2prg"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -77730,30 +79014,18 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.10.3.5"; - sha256 = "0wqdm3k63x62hqlmp6in75wslpq631506f3j4n3g0qpbn8c8bih0"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_11_1_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; version = "1.11.1.1"; sha256 = "1x2a8w49ik4w03wzf31icqbpr7fds9a1c7w263xwpm1445nrl2hz"; + revision = "1"; + editedCabalFile = "1z580vh4idsbndjjla6gniz8cacxwj9206llyafl83brrqjhm14b"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -77832,7 +79104,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-core" = callPackage @@ -77856,7 +79127,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-ekg" = callPackage @@ -77880,7 +79150,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-example" = callPackage @@ -77901,7 +79170,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gluturtle" = callPackage @@ -77915,7 +79183,6 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gmap" = callPackage @@ -77940,8 +79207,8 @@ self: { }: mkDerivation { pname = "gmndl"; - version = "0.4.0.2"; - sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8"; + version = "0.4.0.4"; + sha256 = "041g7mlgwk6yb3814cy93yvwfhk5gzdkms7d8dg312vnpykp2kl1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78006,30 +79273,29 @@ self: { }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, base, basic-prelude, binary, binary-conduit - , bytestring, conduit, conduit-extra, exceptions, extra - , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp - , tasty, tasty-hunit, text, time, transformers-base - , unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary + , binary-conduit, bytestring, conduit, conduit-extra, exceptions + , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty + , tasty-golden, tasty-hunit, text, time, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "gnss-converters"; - version = "0.2.9"; - sha256 = "083simwpm3d9jk1iaymb2sbkaa98yxg3ngg0rmvl8vk015p7hcxr"; + version = "0.3.11"; + sha256 = "0f6953pp35rgy2x51db3faawmnr7lsbrdihyi16kcqbffdwcni9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude conduit-extra exceptions extra lens - monad-control mtl resourcet rtcm sbp time transformers-base - unordered-containers + base basic-prelude conduit exceptions extra lens monad-control mtl + resourcet rtcm sbp time transformers-base vector ]; executableHaskellDepends = [ - base basic-prelude binary-conduit conduit conduit-extra resourcet + base basic-prelude binary-conduit conduit conduit-extra ]; testHaskellDepends = [ - base basic-prelude binary binary-conduit bytestring conduit - conduit-extra HUnit-approx lens resourcet rtcm sbp tasty - tasty-hunit text unordered-containers + aeson aeson-pretty base basic-prelude binary binary-conduit + bytestring conduit conduit-extra lens resourcet rtcm sbp tasty + tasty-golden tasty-hunit text unordered-containers ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -78068,10 +79334,11 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.4.1"; - sha256 = "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s"; + version = "0.5.4.2"; + sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers deepseq filepath process temporary time transformers utility-ht @@ -78104,6 +79371,7 @@ self: { sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk"; revision = "1"; editedCabalFile = "0dq1406z7mh4hca15abizrzlc4v80qkc3r9jz9q21qi99hgvvqjs"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process ]; description = "GHCi bindings to lambdabot"; license = stdenv.lib.licenses.bsd3; @@ -78215,6 +79483,7 @@ self: { pname = "goatee"; version = "0.3.1.2"; sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl parsec template-haskell ]; @@ -78235,6 +79504,7 @@ self: { sha256 = "0pgpdk1y140pcdsyry185k0bpdhyr87bqrzk24yv65kgvqs442zm"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers directory filepath glib goatee gtk mtl parsec ]; @@ -78292,8 +79562,8 @@ self: { }: mkDerivation { pname = "gogol"; - version = "0.1.1"; - sha256 = "1cjdhdsdrr1j8xbif9l293kfjx4n9vybsh12za59q8vckl36vvhx"; + version = "0.3.0"; + sha256 = "0cb4kbdw8gyd8h0wkw8h55jabd7i1q523ki9ssjn19inb5pgjwv2"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit conduit-extra cryptonite directory exceptions filepath gogol-core http-client @@ -78306,162 +79576,72 @@ self: { license = "unknown"; }) {}; - "gogol_0_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit - , conduit-extra, cryptonite, directory, exceptions, filepath - , gogol-core, http-client, http-conduit, http-media, http-types - , lens, memory, mime-types, monad-control, mtl, resourcet, text - , time, transformers, transformers-base, unordered-containers, x509 - , x509-store - }: - mkDerivation { - pname = "gogol"; - version = "0.2.0"; - sha256 = "13vci3bb7kh3mq4vb2b4zayl4cjvfxy64qsjwpaqjy563hbn5k2w"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive conduit conduit-extra - cryptonite directory exceptions filepath gogol-core http-client - http-conduit http-media http-types lens memory mime-types - monad-control mtl resourcet text time transformers - transformers-base unordered-containers x509 x509-store - ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Comprehensive Google Services SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-adexchange-buyer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; - version = "0.1.1"; - sha256 = "0ncsijxs97v3gg0nynhjbysq1nj3zmdph274phm4pjl8k4acxjfl"; + version = "0.3.0"; + sha256 = "1hn2cn3p7jkqvpy0qq3hakcnrns4j2j961zg4xbb8z4mjjj3fgm8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; }) {}; - "gogol-adexchange-buyer_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adexchange-buyer"; - version = "0.2.0"; - sha256 = "1x1wqy2bbiw0kyni2swr8mcwpbqjvin5j8vxnc7vl4qiw8rkz1rx"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Ad Exchange Buyer SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-adexchange-seller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; - version = "0.1.1"; - sha256 = "02wjqpc0bzp0jwa2rmzk2gp2fkq2gsd67xviyg549jzkgq1z5dj3"; + version = "0.3.0"; + sha256 = "1r8pvad01qjdv040agfisnj0183la74p44hvppa0zzbjsybv5n99"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; license = "unknown"; }) {}; - "gogol-adexchange-seller_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adexchange-seller"; - version = "0.2.0"; - sha256 = "1gpkksklsn0py5ih25gncrl988j4c06z6swqjx5v1mh297d35pj7"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Ad Exchange Seller SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-admin-datatransfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.1.1"; - sha256 = "1a9p2n7n0mq4c8xiwqdfvkrgywq8yla0y34qqj27q5zd2rqn142c"; + version = "0.3.0"; + sha256 = "1qjlhg4kgfy93rl2nzivvdhjpyaf4csm4nl097ny649dmxjjf1q9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; license = "unknown"; }) {}; - "gogol-admin-datatransfer_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-datatransfer"; - version = "0.2.0"; - sha256 = "0apglzdmcdivc2s2ig1msx6ymzras0ppznb0k0xpm384sc60p5jh"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Admin Data Transfer SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-admin-directory" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; - version = "0.1.1"; - sha256 = "1wkfrnh39s00n1raykajf8brvbqbsdkwwb3nflqvf6cnq7xcv63q"; + version = "0.3.0"; + sha256 = "0pb3ymvx6hw46i1iwrvc4zv7mkmjwjk8w4q6h91jph7kv98kpmpk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; license = "unknown"; }) {}; - "gogol-admin-directory_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-directory"; - version = "0.2.0"; - sha256 = "0wh7nb6w7qyljm4lp9d66wzy6aaf9q7wai5l1bjh62b5az9cw16z"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Admin Directory SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-admin-emailmigration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-emailmigration"; - version = "0.1.1"; - sha256 = "142rl4qrhppnpzv94fz14568liilqbbfjkvdvbwiyny976rcrsb1"; + version = "0.3.0"; + sha256 = "1d7w4fv4v54mja7yx8rf29ms1hbjnkjgly54fqx5h4xyfgypymca"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; license = "unknown"; }) {}; - "gogol-admin-emailmigration_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-emailmigration"; - version = "0.2.0"; - sha256 = "1ljq9f7z510y2jch4rd4dmic13smmz5jm5gh27lykryalvx6fwmk"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Email Migration API v2 SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-admin-reports" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-reports"; - version = "0.1.1"; - sha256 = "1kac74p7wk2inbb3qcg9l9np5dpmpd2ncmxvqp8dqr5qmsfyl8an"; + version = "0.3.0"; + sha256 = "0fms60bb7vyn3kkrg5j53x7f2r5111xy922w7a3i7xb04lsbxv3j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Reports SDK"; @@ -78472,95 +79652,44 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; - version = "0.1.1"; - sha256 = "1g6idm6csvz2xl311fha2brf3x7s4mmj75vzin1gani1lxvxlpvj"; + version = "0.3.0"; + sha256 = "0dispksc95m3ig409f44fl57jz4lqnhljhk6y957d520sf1arv53"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; license = "unknown"; }) {}; - "gogol-adsense_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adsense"; - version = "0.2.0"; - sha256 = "0k6vljav25pvdhhp7sab9f3qr398lx14mx9dqinp99lbkh9r7zcn"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google AdSense Management SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-adsense-host" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.1.1"; - sha256 = "04l1ay8xd6m42s6gdny74yr6y1lg2xagkfqfh4cwmg5kyrykypih"; + version = "0.3.0"; + sha256 = "1rvglzr4a2lilknrdjla0s47gdkp5n2z6kpwcl0gfgdr00fbrcrw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; license = "unknown"; }) {}; - "gogol-adsense-host_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adsense-host"; - version = "0.2.0"; - sha256 = "1cvk1i7c86c5hjbfylfi0l2r3samqbkpd12278czsyz0npwcfbzm"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google AdSense Host SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-affiliates" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.1.1"; - sha256 = "074s8rz6gky3sf7wqgkvba42l8rjkid5g1x31ycsrl7cc033c3dr"; + version = "0.3.0"; + sha256 = "1h7kx1ra0vz8pgvcjvj5ip44h077s9q5m7ixplq5vzrr4wdbrvvf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; license = "unknown"; }) {}; - "gogol-affiliates_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-affiliates"; - version = "0.2.0"; - sha256 = "11s3v77ap9p79cq1b4s1j3m8s9h1kbzqwygx65p2fpr935fdddw3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Affiliate Network SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; - version = "0.1.1"; - sha256 = "08hrilw0lb42fr8yvp01nwcqnhia9mbaxblpp8s78sdkmc7pnmbs"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Analytics SDK"; - license = "unknown"; - }) {}; - - "gogol-analytics_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-analytics"; - version = "0.2.0"; - sha256 = "1ni9yhd06g0ifqwlcxczd792vgrnd5hy4zsiqnyxqrvq2jdzqm1q"; + version = "0.3.0"; + sha256 = "0myggz1cxq88q3s1sbw5v5zhcmrybjkqj9zd0ap6x4sa7qrp7dys"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; @@ -78572,541 +79701,255 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; - version = "0.1.1"; - sha256 = "0971m9m5g3109igwv273cp1qh8l8rw0n37h9a8y8rqalwxqrlrmw"; + version = "0.3.0"; + sha256 = "0lnliq42ykmizlr8g43ic99lzk5rc7j1l3dl81xbymw0dq0frbcm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; license = "unknown"; }) {}; - "gogol-android-enterprise_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-android-enterprise"; - version = "0.2.0"; - sha256 = "1snm8npkvsk1jc2wyn0c6k39cfv606nwpil0j4hiwm57mv7iyxp1"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play EMM SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-android-publisher" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; - version = "0.1.1"; - sha256 = "1z0y7v0889q0hfqbgqqf3vyx4k3gq47s82pxhd0xcxk5nbzrs68f"; + version = "0.3.0"; + sha256 = "1cf449zz6ahnqa71fqa25brj5h11xhbq4chw4hn2vczjwz8s6vrv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; license = "unknown"; }) {}; - "gogol-android-publisher_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-android-publisher"; - version = "0.2.0"; - sha256 = "18qd7361hnps7i7fsjjm66civ28y2spwgynng5x0g7x2qmpv8zf2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Developer SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-appengine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; - version = "0.1.1"; - sha256 = "0qcmrlp8a8rmccwrymnm0n5936z0qdw0xjv0480j9fm99s2irwfb"; + version = "0.3.0"; + sha256 = "131m4hqf84j4r2xjdbpsp95iww4sbxyw3lvn80pnddrzmvaj52hr"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; license = "unknown"; }) {}; - "gogol-appengine_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-appengine"; - version = "0.2.0"; - sha256 = "1r9msaj6z0afiv7vkl19pah3px8zjp8wb9x1y6sc6f8bjhwad77m"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google App Engine Admin SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-apps-activity" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; - version = "0.1.1"; - sha256 = "04zbl08x9pr2vzaa9cgjdpy61hiph3272blshpg6wn6wd3nnm75v"; + version = "0.3.0"; + sha256 = "0ci85yml0sjjkwxcyfnb1xsw93zkvll0n6fb35kci1h07ywvl8d2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; license = "unknown"; }) {}; - "gogol-apps-activity_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-activity"; - version = "0.2.0"; - sha256 = "1229hkj6vpvra1cwci5kj83hpg4kpn2f4z52lg6knphnaid8vjxm"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Apps Activity SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-apps-calendar" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.1.1"; - sha256 = "0rxw2v523n97nz60zss9qki47paaidglh9qy6lv98ya5fdazgsyb"; + version = "0.3.0"; + sha256 = "0gjill8hdkhp385i0ay6isb8rm6zcxh6ymdb7389wv6nhzpf5p3x"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; license = "unknown"; }) {}; - "gogol-apps-calendar_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-calendar"; - version = "0.2.0"; - sha256 = "1bpw9zz6py1wyp6p9ipp5qv26y19papp2g2gxwdgskq8q72p45qv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Calendar SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-apps-licensing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; - version = "0.1.1"; - sha256 = "1jiv1hgw6dyn28d5xavs9hjnamkayhfarwfd76ihx68qz6z4ii6w"; + version = "0.3.0"; + sha256 = "0l7yknlp4c2qh0a86q504a6h0gnb0s8jd4glii30qsnim52pijhp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; license = "unknown"; }) {}; - "gogol-apps-licensing_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-licensing"; - version = "0.2.0"; - sha256 = "11kaqj55s70kdl1iaymhcrhvlzpixrf1k2m52i0kmmw1z6c8fmhx"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Enterprise License Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-apps-reseller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; - version = "0.1.1"; - sha256 = "0yzfrsvfli1s08w2w4c3n2gsqp6qpw8ddzb70yzi480n9xkq9pbh"; + version = "0.3.0"; + sha256 = "119mlxr6yxmym9pgcmhix9m2s1s9i5zgh2pa3zzayk0jnqjjdpn4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; }) {}; - "gogol-apps-reseller_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-reseller"; - version = "0.2.0"; - sha256 = "02zn3sjdm2v8q26a741n7v1zkl2iv81n5glddd60sk8304yxikwp"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Enterprise Apps Reseller SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-apps-tasks" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; - version = "0.1.1"; - sha256 = "1npyx72xpcd5xlsfczkd1ggslw2vz82hq8dg6m5lpwy97sryhs6w"; + version = "0.3.0"; + sha256 = "0mcnz2qiymjriqplypzl3gycn9cyc362a38962b4ci7g718wx74v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; license = "unknown"; }) {}; - "gogol-apps-tasks_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-tasks"; - version = "0.2.0"; - sha256 = "178phj5iml51qkih8k19vw2lzn3bfigkb5ikfb1kz547v1ixk42h"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Tasks SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-appstate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; - version = "0.1.1"; - sha256 = "1rgn57j9abfw89az9bjx8ffcv1h1hb0n962hf3sdnxh1ydppp728"; + version = "0.3.0"; + sha256 = "129f5gdiq5gbdi6dg6ddz1cq2m0jjp48q7vk5lkxrr82iig05jkw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; license = "unknown"; }) {}; - "gogol-appstate_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-appstate"; - version = "0.2.0"; - sha256 = "1bn4b2b87rccw5261hl0jfw16xkwms2j8akh56s6z3p76r09gkqg"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google App State SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-autoscaler" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-autoscaler"; - version = "0.1.1"; - sha256 = "1fb9mghck2fg2qxrrj0zhclw0hj2r6q58sh0kl0qlg9ankyqp7yb"; + version = "0.3.0"; + sha256 = "0insf84wrnn98yqfm6scfmzjnxdj9hikz7wy0cg0vk25dpc2mhp0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; license = "unknown"; }) {}; - "gogol-autoscaler_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-autoscaler"; - version = "0.2.0"; - sha256 = "173p6kmx38dvkzf9lz0xnd1h6zb7dc0ib5i58m3kpkcfqxfzbpcr"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Autoscaler SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-bigquery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; - version = "0.1.1"; - sha256 = "1lx2gllxwkhi3r3z9k3kvfvv834yyfz1fv0m2fw2p4ypqc63fhq9"; + version = "0.3.0"; + sha256 = "1zs497pxcpd87rhblg02bvi0wsqj16ym74v3kgm2mhwfw4spqv9z"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; license = "unknown"; }) {}; - "gogol-bigquery_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-bigquery"; - version = "0.2.0"; - sha256 = "1glqis8m21bhq0jxmviwvkh2xm7ikdca83yrb6nnwprpfxb3mkn3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google BigQuery SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-billing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.1.1"; - sha256 = "1s59i7rd77a782wsw6av3xssh7byzfhgq9js6izaihz6nxvki409"; + version = "0.3.0"; + sha256 = "12scf28cj2rr0r4z1g0y4ik22gd3yh5sy2wdllydi05qv1cffqbf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; license = "unknown"; }) {}; - "gogol-billing_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-billing"; - version = "0.2.0"; - sha256 = "1sgk3fx87p307m15iwrfn04ig0m9h2mpj4rqwjgvvb6jl36ngn2j"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Billing SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-blogger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; - version = "0.1.1"; - sha256 = "0vijvnxbqg66wfz6v2b728m3bqqsnygfyhjfhlq0kky7hygaq7an"; + version = "0.3.0"; + sha256 = "08p1hjm29xsmvbb9dj7krr7i1wapn32g9wh283ia2zajys6zscl7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; license = "unknown"; }) {}; - "gogol-blogger_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-blogger"; - version = "0.2.0"; - sha256 = "012zpc0b81pdjs3izq5v2h8dxxy0jjjpmjxxwzg5azsxpdcv2raa"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Blogger SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-books" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; - version = "0.1.1"; - sha256 = "09k96l9866ksvbvcayj9hbqm3qamzhpmiqgc0djvqxgkxhf9nvhd"; + version = "0.3.0"; + sha256 = "08g2ah36fk3a6val2p1wczd9b3h7zqp1a4ka7nrn3f9m04say5hs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; license = "unknown"; }) {}; - "gogol-books_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-books"; - version = "0.2.0"; - sha256 = "0373fv46mblw1c2mls8z2281n1j57df9wc57kf01ic5f8f4m42xx"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Books SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-civicinfo" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.1.1"; - sha256 = "0hnlspkcb7zq9cb52pb3m89lwg3pawv8i8lx9y3c51ww474m9hsk"; + version = "0.3.0"; + sha256 = "0sgw2jgwki4nmyg9igavf8g2myxr8qnf4nif00jn236rg26pfr2d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; license = "unknown"; }) {}; - "gogol-civicinfo_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-civicinfo"; - version = "0.2.0"; - sha256 = "1hskyvwqym6d4865pvgrxpcbngissxiyixn6aimn7nlfmxzg2cvc"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Civic Information SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-classroom" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.1.1"; - sha256 = "16knr6rf9j3w9cvs240kbmf031fqjjfdrahfw23dyr0qbmra2qby"; + version = "0.3.0"; + sha256 = "1bij8szdrxlcfz8xl5472k8rfl10ffnq7hlq38za2pmm9jfhn2dn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; license = "unknown"; }) {}; - "gogol-classroom_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-classroom"; - version = "0.2.0"; - sha256 = "0c5jyz0rhhg4ab05nzkj736iddgn975qpm21vhb16pnb7da03cdp"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Classroom SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-cloudmonitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudmonitoring"; - version = "0.1.1"; - sha256 = "1ajdqqshn2sbr3vs6r0gfc271ff7c542vkh6bwa9p39dfqicr46s"; + version = "0.3.0"; + sha256 = "01mfc8f6vl3n499p4f70inak68g83yxc5pci485sxgwvfx078glx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; license = "unknown"; }) {}; - "gogol-cloudmonitoring_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-cloudmonitoring"; - version = "0.2.0"; - sha256 = "1407agqnr99cifxbb31q8kf7cx5rl7z2rf0hxzmb82p5lwl7hmp2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Monitoring SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-cloudtrace" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; - version = "0.1.1"; - sha256 = "15ghx7r4l2k4ad0icw1rjsbdx5almg8z5x93mgd0kvdyc55ysxw9"; + version = "0.3.0"; + sha256 = "1r2whm4s5dwhg9davw9qpcabwhpasyfd7qkjw471xnpnwrq4vcb6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; license = "unknown"; }) {}; - "gogol-cloudtrace_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-cloudtrace"; - version = "0.2.0"; - sha256 = "0aslcpxmf8dwpgw20f62p53fsayjqrqfi9zd81qcwgz9pzza369p"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Trace SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-compute" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; - version = "0.1.1"; - sha256 = "1ajizav80rp1kr277bkc0c1ii8v2dznjiv11cbgy68w9lk7dg14b"; + version = "0.3.0"; + sha256 = "0v902dgjn0hzf42di0kr159p9scpnsha7wxap4fj933x5pv7c97s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; license = "unknown"; }) {}; - "gogol-compute_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-compute"; - version = "0.2.0"; - sha256 = "0qnzk9xvj39kkdy68iaab59q6qcivrhdbwi2qp2c3s3nbcy78r02"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-container" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.1.1"; - sha256 = "1c9337c8iq3vrzf17kcikr0n0h18hwazvrzn7v1a3wrqjcisl3lv"; + version = "0.3.0"; + sha256 = "1vxl3k48mdfn3rnlld5rmgkjv30pfvg9agz6k2v9pbci5i9kbl8i"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; license = "unknown"; }) {}; - "gogol-container_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-container"; - version = "0.2.0"; - sha256 = "1fxwyc121n8zl98wp1aj6007nja4vfx6w2b7m4mrrkf5dw44id1x"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Container Engine SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-containerbuilder" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.2.0"; - sha256 = "1xyizdpmgdqrfl4jwaya19rdzq75zwm0wiwq9ciq4a6nzzswhrjm"; + version = "0.3.0"; + sha256 = "15k8d8b58hggfw5izdmzkl44jkaiv1l0gfx237ciwmjjvaw5fdfy"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, dlist, exceptions, hashable - , http-api-data, http-client, http-media, http-types, lens, memory - , resourcet, scientific, servant, tasty, text, time - , unordered-containers - }: - mkDerivation { - pname = "gogol-core"; - version = "0.1.1"; - sha256 = "10ylycapx1a0w0vif56rqj4ljm35ar3lpv650v8cb0c2cpp7sv4g"; - revision = "1"; - editedCabalFile = "0dhldpvzdj8kcclzdyqg0b1p7df8jvxlwv244rkxgwd1fgqd7g2l"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit dlist exceptions hashable http-api-data http-client - http-media http-types lens memory resourcet scientific servant text - time unordered-containers - ]; - testHaskellDepends = [ base tasty ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Core data types and functionality for Gogol libraries"; - license = "unknown"; - }) {}; - - "gogol-core_0_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable , http-api-data, http-client, http-media, http-types, lens @@ -79115,8 +79958,8 @@ self: { }: mkDerivation { pname = "gogol-core"; - version = "0.2.0.1"; - sha256 = "03ig25l09jgmpyk705if6vdvacklkc7pzhj1jxcskg3lxhv5mrk2"; + version = "0.3.0"; + sha256 = "140chk0fb35zi7y0p908c7irwhqcgdw45iqpmrzzf2p238wlza7z"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -79127,1320 +79970,686 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Core data types and functionality for Gogol libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-customsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; - version = "0.1.1"; - sha256 = "0ybqq6s51bf0nlc2pir6jfjgp3wmccy0fvnz4gm5viv7bn38q3gr"; + version = "0.3.0"; + sha256 = "075r7j4z9i1jbw6hznrq3ndb23yrp9xpqmwq64laqmh4mw3c47zj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; license = "unknown"; }) {}; - "gogol-customsearch_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-customsearch"; - version = "0.2.0"; - sha256 = "0wjyy5m1hdxkai2g7mi8pva3jly0qgbcinyqyndqb9sjlvqdwv69"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google CustomSearch SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-dataflow" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; - version = "0.1.1"; - sha256 = "0p5pysgfk5aihzyc7nhr78h075ja5spad3c6imvkpl4hki3km45p"; + version = "0.3.0"; + sha256 = "1cvzhvfipjpvprhgw2rdw9xsrkyka7cdfdk9716x4admly221qcx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "gogol-dataflow_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dataflow"; - version = "0.2.0"; - sha256 = "1zqjpj0ry25hvj36m4i558k9rhh0xvabgkz60ms76cs550qhana5"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Dataflow SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataproc" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; - version = "0.1.1"; - sha256 = "12sbvvfghg10rwwc32jswynh7hdjfiwwyf42akqj46xrw7lfbyir"; + version = "0.3.0"; + sha256 = "1b1s148xslz23ibcrx0gifim6kc5f3fsgfdnwh2n4bp0djvp8zy0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; license = "unknown"; }) {}; - "gogol-dataproc_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dataproc"; - version = "0.2.0"; - sha256 = "0cq5x9ry0i5xlp1nxa4cg9564xblql6ar0v85sc4giikw3ga0ybv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Dataproc SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-datastore" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; - version = "0.1.1"; - sha256 = "0xa12gc2ksgzpkzvlzjzx3l62yjv0zmj08sznqbkr97lqmyi7xdv"; + version = "0.3.0"; + sha256 = "0wdxvslimfhfm0nw8qv88av14gxjpfif9rxxp3gv8png0qf1qs25"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; license = "unknown"; }) {}; - "gogol-datastore_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-datastore"; - version = "0.2.0"; - sha256 = "0mrqxi7syzpkc92ij6zn86p7301r86j01kma0vjcm8hfm69sdm2w"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Datastore SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-debugger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.1.1"; - sha256 = "18mwpx20can2ppa0pjgyydajwcsmwqd870wrfvl4nsppaxfyrvai"; + version = "0.3.0"; + sha256 = "05qjl7lg62xc5y6yycn98yk6d0qpk60caafw7q9drrgrdz5k7s7v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; license = "unknown"; }) {}; - "gogol-debugger_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-debugger"; - version = "0.2.0"; - sha256 = "1ql2m2b19vkqkc4gfl9j39izv1awnnifb1bvkl1jy7li5bvr6aql"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Stackdriver Debugger SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-deploymentmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; - version = "0.1.1"; - sha256 = "00wv8fifmx95z8p2hyl5xzlb9nkm6z3xbcyzyr5n55bkb6jh9nkk"; + version = "0.3.0"; + sha256 = "01lc27xp2gry9fws5ysq46hld30fxh4lfr7p9lw4985ir82llb9s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; }) {}; - "gogol-deploymentmanager_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-deploymentmanager"; - version = "0.2.0"; - sha256 = "00xccnjv5caj2fs358vqg8p5n7lgdiixi8ghmy85za0h9mc3injx"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Deployment Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-dfareporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; - version = "0.1.1"; - sha256 = "08nmg3r2cvwfkff9maggi4rp4jzsv0qwjbqljfdf4gm4hljgl6i4"; + version = "0.3.0"; + sha256 = "0dhayxwi4pjbj73gxflgk1gp3dvjw4vb07ai9nq22flac1xl1si7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; }) {}; - "gogol-dfareporting_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dfareporting"; - version = "0.2.0"; - sha256 = "091ca105psyxz0n2rbl2flsqkpfj3yzry2bzsx7q2vb9ijbab5cj"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google DCM/DFA Reporting And Trafficking SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-discovery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; - version = "0.1.1"; - sha256 = "1zhvvpr119giy88k4gh7215rfzcq6hism125nvwh284nxaqxd3jv"; + version = "0.3.0"; + sha256 = "1j2j3zxqq95cd50cdwsvyn633x61fwlghld8nhn1hy12g9l7xdf8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; license = "unknown"; }) {}; - "gogol-discovery_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-discovery"; - version = "0.2.0"; - sha256 = "1i4nm1rgc3fsfi1cmhd9annzvpzpzd3ani8q44375llavb094sam"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google APIs Discovery Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-dns" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; - version = "0.1.1"; - sha256 = "0dkiv4blk11vqvwxjzjnda2dlzl4lwjdphmxr6whlvl7bvk8ni3p"; + version = "0.3.0"; + sha256 = "18af36fx7w0ybcfiacfih7fyvri0rxlm4920yigmgsx551rgrm5l"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; license = "unknown"; }) {}; - "gogol-dns_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dns"; - version = "0.2.0"; - sha256 = "11xy0jr8d4z1dgw12fcz0151cjm9k96bl4xlnd4nlcbxgyjxa95z"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud DNS SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-doubleclick-bids" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.1.1"; - sha256 = "0any741rgz8qcsj7x0z04777wbpv863j3gk812c8kpw9qpn9ks50"; + version = "0.3.0"; + sha256 = "0gqlxdnxf2hqdaczvd0gi3ch3p23lk9mjd0xk03h6lhr8c2mx60c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; }) {}; - "gogol-doubleclick-bids_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-doubleclick-bids"; - version = "0.2.0"; - sha256 = "0g5pqihil93yi4yd0anvagzy560ims8jplnngbf6sx8aha1diwhr"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google DoubleClick Bid Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-doubleclick-search" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; - version = "0.1.1"; - sha256 = "0q5gd4vxiq9awp0k5m6g1jg29n84r9y9k9xdhzbr4mbzw6rm9a8m"; + version = "0.3.0"; + sha256 = "1wwsv0gbqcjd6xmz7pqjv9hyfg20hwwnxld46yjgiwsyadxrd54d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; license = "unknown"; }) {}; - "gogol-doubleclick-search_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-doubleclick-search"; - version = "0.2.0"; - sha256 = "1jw7k2b6zqqv5gn80jxfcfpjxhxxi6lc92cksgca421dgiaagkwf"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google DoubleClick Search SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-drive" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; - version = "0.1.1"; - sha256 = "0v6lwq2hhknqdkff9iizsrsz17qn0vq4xa5bvhgliy0fjsxbaikf"; + version = "0.3.0"; + sha256 = "1l353bwhkw1a3pv2ngjddgiilazq4qds3askkxxyajxzy5f19blz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; license = "unknown"; }) {}; - "gogol-drive_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-drive"; - version = "0.2.0"; - sha256 = "0v6chs7il6bh10s94w4cjz1mv5drcic9phpvi2a6n6s43qry0s6w"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Drive SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-firebase-dynamiclinks" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-dynamiclinks"; - version = "0.2.0"; - sha256 = "07hny6l80d8icv0mgzrxcrzv0pixrhss18iv951hqpkq4rniv8lb"; + version = "0.3.0"; + sha256 = "096rc42f6ajw7biys45zaz4wgwxyqh67js6ihj8aqi4w1b05j3zz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; - version = "0.1.1"; - sha256 = "1hjzw98pk34bgnm1prgckgl7wl3xgkbwdndk7wqfnd8xjanr27wq"; + version = "0.3.0"; + sha256 = "0mrq1gp3s770lybwlzy126g8fx1kasqfh1qjd8lczga186972pqq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; license = "unknown"; }) {}; - "gogol-firebase-rules_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-firebase-rules"; - version = "0.2.0"; - sha256 = "0hxxm3r9g7ms26bj277rjvlam73b0xvspxknldf9rs21fdh9gfln"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Firebase Rules SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-fitness" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; - version = "0.1.1"; - sha256 = "00anxkp5ck2d0j4my4pdhp8r2086ifwl9i1gsb00cwqqx90b29h8"; + version = "0.3.0"; + sha256 = "1awl1c1z4bcph8b6wgw34vyly7r6svs9h276h8h97z427006p1mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; license = "unknown"; }) {}; - "gogol-fitness_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-fitness"; - version = "0.2.0"; - sha256 = "131x8g52q1zbl64yswjyn5mrlznr38ms073kax0f7hyfscv433xz"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Fitness SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-fonts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; - version = "0.1.1"; - sha256 = "0rs1125sb4bfp3yassvkdznclngm7m7h3qav6ph7yp83rwvybwsp"; + version = "0.3.0"; + sha256 = "0p2ckncnrdgkjqp67l0mygqp80nkp7w3p7plhmraxw2wrjpy15mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; license = "unknown"; }) {}; - "gogol-fonts_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-fonts"; - version = "0.2.0"; - sha256 = "01lz60wsnjq6c8lyixj19mgkn8a81lin6156nzncl6m79qqsx9xl"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Fonts Developer SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-freebasesearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-freebasesearch"; - version = "0.1.1"; - sha256 = "073ma75h278zjgcw80kghl3mjqkn1ah71b8ip9606xlryj9kdhhb"; + version = "0.3.0"; + sha256 = "02m2cpf6jdvd2km3gjvhvhkq3cgy7ijy5abwkrpcwvjzl1hps2vc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; license = "unknown"; }) {}; - "gogol-freebasesearch_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-freebasesearch"; - version = "0.2.0"; - sha256 = "0py4k01i78lvmgis8gixsqxjniinccw4cfqs9khdc58njwqqczdk"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Freebase Search SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-fusiontables" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.1.1"; - sha256 = "052agk6abqn70qyipn4xk4yhvjxczv94dw5cx2zy14yxi0gsp9fx"; + version = "0.3.0"; + sha256 = "0icaa7zdblgs180gww0w4ffffim9fzb4qbl1pwjyvxa6b7vhrks7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; license = "unknown"; }) {}; - "gogol-fusiontables_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-fusiontables"; - version = "0.2.0"; - sha256 = "0nd1kjkymw0qwiygzzx7nr75vi07w42dliv0yys81skx1nlw1ad8"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Fusion Tables SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-games" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; - version = "0.1.1"; - sha256 = "1jp0562wjh2bw2lfgz37r0jdawigqlaabwgbc5g1579i32bvg4hj"; + version = "0.3.0"; + sha256 = "0r0x1g8wkq6vn4hk655wkl8fpfjlqppb0w9gscz99qsvv1gm16dz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; }) {}; - "gogol-games_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games"; - version = "0.2.0"; - sha256 = "1xbzdixlqbbimbc85fmdq0f2cj1w36drvbxxakipwir427pr7aya"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-games-configuration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; - version = "0.1.1"; - sha256 = "0pxkd0h6qka1sqb1b6dmil6rkwxymmj5nn553jsnc5k6xdlwbgis"; + version = "0.3.0"; + sha256 = "04g2kiyzhnyczxl6648gzl14wfszxiihyajvc7428whp54b3b4yg"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; license = "unknown"; }) {}; - "gogol-games-configuration_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games-configuration"; - version = "0.2.0"; - sha256 = "19f6w057a8rawka8zcdqxhbay2iigcvr6xzn57mawc8fc6wbiwjx"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services Publishing SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-games-management" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; - version = "0.1.1"; - sha256 = "0y2ys9nsz69zyv0hdj9222pl9402am0f5g3643sddrrn9qb4ilgb"; + version = "0.3.0"; + sha256 = "192phwrhnsnanq3gf7ss3dsflvnkzf058r1jnb9vqf5035mckb4p"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; license = "unknown"; }) {}; - "gogol-games-management_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games-management"; - version = "0.2.0"; - sha256 = "1ih03w6wx064553aq9d2qaxh5b972k8gnvrfr2bpjbrysdxv1rfz"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services Management SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-genomics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; - version = "0.1.1"; - sha256 = "104cayngl7fmdkhifn332kcs02y5kw4pgl8n7adsqkskv5di9pws"; + version = "0.3.0"; + sha256 = "0d9i4jlv09fc4ry6qsdypkmx3faj6i5m9c6xv3xys1d06v4mzxkf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; license = "unknown"; }) {}; - "gogol-genomics_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-genomics"; - version = "0.2.0"; - sha256 = "0mhvxq7d0g3hymkdwrxg3jgj6nnazm1b8rw5q6p3npj705b63vqh"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Genomics SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-gmail" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; - version = "0.1.1"; - sha256 = "1xc6g3gsxc036d60mh64rn9slaqcrwhniagx4wq2yn5yznmw8nbl"; + version = "0.3.0"; + sha256 = "0h9z55bcdyp0as0jzv5wj89v71fz2n75pg8dhwg90iw1pp3rrg83"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; license = "unknown"; }) {}; - "gogol-gmail_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-gmail"; - version = "0.2.0"; - sha256 = "1xgs58rvxx8mrz6z4451fng59ia2n0wb800jnzdmilv4p9h255xb"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Gmail SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-groups-migration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; - version = "0.1.1"; - sha256 = "1zc5wcvjghjanxih44zhg248gzabssh4z3wlzkb63b2c8a5ffw16"; + version = "0.3.0"; + sha256 = "0c676dk7x62bdv8nr8wsk1icd7v93060zjbzwzl2xi46q0j59dmk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; license = "unknown"; }) {}; - "gogol-groups-migration_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-groups-migration"; - version = "0.2.0"; - sha256 = "1qmbps5qbpd6k4d9a2rp9cl9idj8bgykn9mh727qgqq8x19p8glk"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Groups Migration SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-groups-settings" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.1.1"; - sha256 = "1vg1dkz0g5vx84blkyivw2fmhqpk5xx3y677xgjzns7rj7myzrf8"; + version = "0.3.0"; + sha256 = "1xy466x9xcbi7scf7fpnc5cy47hgsmdcg17hqzys4bp86sdc6738"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; license = "unknown"; }) {}; - "gogol-groups-settings_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-groups-settings"; - version = "0.2.0"; - sha256 = "1rky9vrcingnqq43g8bazhji2s7spf680v4xcg1ivh2b86xrn8x9"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Groups Settings SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-iam" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iam"; - version = "0.2.0"; - sha256 = "0n3g2gr77ss8r1758422a88h81nxhjdkj8mwkihby7zi1if6d4y7"; + version = "0.3.0"; + sha256 = "1fn8jx5hq4dxh2i1xf4cbmbsbjwxcplxxh7har1ai4z9ya1zghxs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-identity-toolkit" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; - version = "0.1.1"; - sha256 = "0nwiwy6zqr00kdamhnxdqf7gbgi1jg6jfly0jw1cfaanlvmwgr95"; + version = "0.3.0"; + sha256 = "1mdkzd5gb8nlaf5nj04fsl97ghyzpkmr4w93pcd5vsr8yxy3lkwz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; license = "unknown"; }) {}; - "gogol-identity-toolkit_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-identity-toolkit"; - version = "0.2.0"; - sha256 = "155w9hcwqg31njkjw6d8r2bnd8wfgxnvdnqc57ac6q1ajimr6pw3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Identity Toolkit SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-kgsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; - version = "0.1.1"; - sha256 = "0dzksn0ql6crsshw4ivabjsa7b7vlh1x2341vby18ff9ckkr24c5"; + version = "0.3.0"; + sha256 = "0kldw64ff2p8h8mfdfbplxfk3jinxc8ibr33wa1qzpfzixb72v2n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; license = "unknown"; }) {}; - "gogol-kgsearch_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-kgsearch"; - version = "0.2.0"; - sha256 = "08hsrwlnq9y4fj5h1asn2ilqvdaj2vjq9mm72k554qmid5jsk4z6"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Knowledge Graph Search SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-language" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-language"; - version = "0.2.0"; - sha256 = "1kwgq66njn73x1szhhmlh0jjcfl2m8qs4clkwfdk3xpiqickl8w8"; + version = "0.3.0"; + sha256 = "0ny2d5bv9dxn1w8rwzv5m7lr5g8akrxqvfhs15bwk87fxdainz5j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-latencytest" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-latencytest"; - version = "0.1.1"; - sha256 = "1kgkir9ql1s55wp3wh93skg3azc0ki2vl7d78m39l9sickjavjlh"; + version = "0.3.0"; + sha256 = "1gdllvcp6s7rf4093xl2fxq3bvqkrysnrs2s4abyppq54p4s6afk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; license = "unknown"; }) {}; - "gogol-latencytest_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-latencytest"; - version = "0.2.0"; - sha256 = "156qczrzyvryjkzjar0s12zhjpl7paa72bixfgc2nkw78l6nmsca"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Network Performance Monitoring SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-logging" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; - version = "0.1.1"; - sha256 = "0mj4hph5wyx6ljryjrhj0jcrkqi4fa8h5xrr1v5vvg9iw83ss813"; + version = "0.3.0"; + sha256 = "1i5q2qqr041qxn458a6300z07idbz17srix9kr2sm3mxbvc5h04g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; license = "unknown"; }) {}; - "gogol-logging_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-logging"; - version = "0.2.0"; - sha256 = "1bfzhmlwsmsq3zw5qsh3jx2xiymcp3fbn7limkc7zwkj5xnqqbfd"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Stackdriver Logging SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-manufacturers" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-manufacturers"; - version = "0.2.0"; - sha256 = "0dhgvy3vs4n05xx5kma039zk5wiw9s9iba09p0xa4r9kb7902w3x"; + version = "0.3.0"; + sha256 = "0211aq7gjmpkhvcqf7fyrwrhdfsn8k5g1qw9gjsisxq0m873i6w0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.1.1"; - sha256 = "12cbbvgmfz4zd942byzlzy2pk71z2l4sl94p55z36hg7c8014q2v"; + version = "0.3.0"; + sha256 = "1ajgf2g9yad6zwhap8b0qigf0nfsw5k3132ksnzkcrfflz74swvn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; license = "unknown"; }) {}; - "gogol-maps-coordinate_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-maps-coordinate"; - version = "0.2.0"; - sha256 = "1d1h7xb4wbisb0q3dwqpgsff4pzkxjlimmrxjafdyy9nkjyh6js1"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Maps Coordinate SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-maps-engine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-engine"; - version = "0.1.1"; - sha256 = "1x3fc5kaap9yf9ql19nqrc6ddil8hkr4ix42k1i1bnd2afs7w9pv"; + version = "0.3.0"; + sha256 = "15a6z7kxvad3ylr1pkwqlimzbwsk0p8qblfnwgnjbl3mr681xdvv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; license = "unknown"; }) {}; - "gogol-maps-engine_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-maps-engine"; - version = "0.2.0"; - sha256 = "07zv1fgjrdidj6d29nrhxbl6b5v136s763z8dzw2jwxgvhsl3zma"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Maps Engine SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-mirror" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; - version = "0.1.1"; - sha256 = "1vafyhl12h9fpl7p79pkf88s86i938kl9nfp0qvqs8qzsyw93f8g"; + version = "0.3.0"; + sha256 = "0ckh2bkjd8c7ybc2yc295wgn0z9kmp471kfkxkjl3swb9dab3fhm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; license = "unknown"; }) {}; - "gogol-mirror_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-mirror"; - version = "0.2.0"; - sha256 = "12s007vw1z3x7h6b902zf06kffwsar47l661dw4njw15cxzk6q0c"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Mirror SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-ml" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-ml"; - version = "0.2.0"; - sha256 = "0k5l59dbvsjxpl0j3rcxrfgpykyxkarc48r4a8x731xs53c2w848"; + version = "0.3.0"; + sha256 = "1qkk8v0yhdyphi5r18x4wawvhn0vwsfbz0gjvrf5mr0sdd80qhav"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-monitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; - version = "0.1.1"; - sha256 = "0q9yr8ca4c88kd6jm5ncm245sqlipxhwli80nlrck0kwq4x52slh"; + version = "0.3.0"; + sha256 = "03jslg15crnngarylydybb48vwq338hsb260mk4riahkg78kd7ga"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; license = "unknown"; }) {}; - "gogol-monitoring_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-monitoring"; - version = "0.2.0"; - sha256 = "08dzdj4a4vxb6sj9ns66ag1di2lj4yl15sz8hlyzmhcp3s40bxg0"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Stackdriver Monitoring SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-oauth2" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; - version = "0.1.1"; - sha256 = "01q2q4c9k8igngbmcff7cpi4bb1m8zjn0zfnh3wk4vbajz10vinj"; + version = "0.3.0"; + sha256 = "0fdjq6kvh04csi29g4nagmji5vqprvwra2gas42n79rq2qhxfx5n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; license = "unknown"; }) {}; - "gogol-oauth2_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-oauth2"; - version = "0.2.0"; - sha256 = "13sa51rh37cfa6qb4rxdirzyqyq7bpbbm1jgx2bsq2lfypmppnbv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google OAuth2 SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-pagespeed" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; - version = "0.1.1"; - sha256 = "1l9dgj0l45iziq57wvk6dwjklhyz45fr9lgnzmphzs01j7mis1x2"; + version = "0.3.0"; + sha256 = "1k6n60w4z77fyy5bnsab8bdgr490zfb753m3ljsc7vxwqqfiqhrx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; license = "unknown"; }) {}; - "gogol-pagespeed_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-pagespeed"; - version = "0.2.0"; - sha256 = "046waxwf53vacam6pvxx6n1r1c02aj74my9cs8hwi8j3i0b3w0z5"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google PageSpeed Insights SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-partners" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.1.1"; - sha256 = "1g6890q7gl6yyl10jqr694j4ha4v80aiapkmbz1h0zma91kkb4m2"; + version = "0.3.0"; + sha256 = "0xhhmsplvfmsi860skrgpzzz3lixa0qcx73w9cv6da679fh0ddfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; license = "unknown"; }) {}; - "gogol-partners_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-partners"; - version = "0.2.0"; - sha256 = "0b3j4if5vn98qg9d0j29fss4ww7zd5knlmhdv6q7hyvjzi1kmkiv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Partners SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-people" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; - version = "0.1.1"; - sha256 = "0xmwb871sklaavh53bmhp2mgpvlaa6izfsgj435dscgnkm5hzfxd"; + version = "0.3.0"; + sha256 = "0j2frq599kjrv0wl9bpmpglw51wcjid2ysmm50hhlpbv78z55sfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; license = "unknown"; }) {}; - "gogol-people_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-people"; - version = "0.2.0"; - sha256 = "1fyrkd03a5i75wj2yyhahh8d6vghwvvh13317kjxib0np7cc7c8q"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google People SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-play-moviespartner" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; - version = "0.1.1"; - sha256 = "08r6apl5gg1ylpszhdqrfj5bi3wd7jar0cmriibh3ssdvdm1jx6n"; + version = "0.3.0"; + sha256 = "0v1cs21y94m4ma414nann6k1mc0jfdyj5ariy9bm6hyqbd3c60zc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; license = "unknown"; }) {}; - "gogol-play-moviespartner_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-play-moviespartner"; - version = "0.2.0"; - sha256 = "0i4bdl1h1rlihcyzfvfzqqiqjihw2nc9n6qrjzfiq4w1av7hcwir"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Movies Partner SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-plus" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; - version = "0.1.1"; - sha256 = "1l966sf6wsdcx7nx7iy27yc3sbwpf9369dwj2m45aaqwicg7bwm8"; + version = "0.3.0"; + sha256 = "0qwswkjcv0i8m23y7dm9yrk343m3kdckg6srzi9q2jfip6h9hv8v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; license = "unknown"; }) {}; - "gogol-plus_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-plus"; - version = "0.2.0"; - sha256 = "1nnq935bsdrqfdld05wqzdv2rzick0mdz7pjgvz908ks5p94zxij"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google + SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-plus-domains" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.1.1"; - sha256 = "1smg96g30sdadyhlkx06vbc7jqifj7grj8csc92874vrximv9kvw"; + version = "0.3.0"; + sha256 = "0d0aijvdl2z9prv6qs6qriw54d6z9ljpl2nc5zwwk3647s62kvvi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; license = "unknown"; }) {}; - "gogol-plus-domains_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-plus-domains"; - version = "0.2.0"; - sha256 = "16qaviwhknw9ibgy10by80dkgph184z01wxvrxbyd99p0sg7yjf5"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google + Domains SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-prediction" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; - version = "0.1.1"; - sha256 = "0n3yldshhf4h51sspqs3r7yvl83jm2jccaxljcg9f5qlji6j85vk"; + version = "0.3.0"; + sha256 = "136jrwlwwygz4icl8c5c1bj1l7j9lypc5qxkygs6azc3x3l8ih6g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; license = "unknown"; }) {}; - "gogol-prediction_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-prediction"; - version = "0.2.0"; - sha256 = "19wb5qpk3faw49mgvmqail515mg7ni8z3g50wsq0jgiv8w04dhwi"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Prediction SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-proximitybeacon" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.1.1"; - sha256 = "1cjgsmwrad8bi4vyxgfsfjbw3ks0dh805vrcig8f156jg0l7zvwn"; + version = "0.3.0"; + sha256 = "1f54km4v9mgil6p12vvziwv5v00d23l5rvk66yl4h614mh402m2v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; license = "unknown"; }) {}; - "gogol-proximitybeacon_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-proximitybeacon"; - version = "0.2.0"; - sha256 = "0mhlxy6ybsm6qmn02r2qbv5hmxcy6f9aiy8rbajqzjjry3dmvzsv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Proximity Beacon SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-pubsub" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; - version = "0.1.1"; - sha256 = "060xssqkczhznl0lc1v9rg4pfpa03x857jgchz12qczdh33mkhgz"; + version = "0.3.0"; + sha256 = "1c2qwqmq3bjfcd322kpyyxfdhsbyxq3r2v614v14dm0kr4cxqnik"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; }) {}; - "gogol-pubsub_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-pubsub"; - version = "0.2.0"; - sha256 = "1lsy3ajp09gq4608mp22smmaizfmfr32fskfawfdhhg3wfznhf34"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Pub/Sub SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-qpxexpress" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; - version = "0.1.1"; - sha256 = "1gi4rad5ajhw758r7bmkplghzx9q7dx3qpv1zwazcrvxh3w66s23"; + version = "0.3.0"; + sha256 = "10v82f2bkn4i0w8gq79skagksi13p5i3280cb50x206a8cy9j350"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; license = "unknown"; }) {}; - "gogol-qpxexpress_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-qpxexpress"; - version = "0.2.0"; - sha256 = "04vqpgalh3nd9w2hgwr7r8n1xnv6yxfj69jxnlrjn0s1nrbbnbx6"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google QPX Express SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-replicapool" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; - version = "0.1.1"; - sha256 = "0xavhjrd4xq4c33p7bj4qrpld5v0pddxhcyjwkp9bz0zvahad872"; + version = "0.3.0"; + sha256 = "1kjkf7bykmz5wzndj7h0yzwfds56m34d0jvq7m1rkhp2qnn1v1jl"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; license = "unknown"; }) {}; - "gogol-replicapool_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-replicapool"; - version = "0.2.0"; - sha256 = "0if2vnlgv3gvw5czanjbdfkpxhd0ipyivapxhqfzwnnbz82i2cw2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Group Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-replicapool-updater" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; - version = "0.1.1"; - sha256 = "09qrqxvfcyb8sg20s4nc3wzbnfh0xz6lpj7rxgrfzj7jj67ngd1c"; + version = "0.3.0"; + sha256 = "14gm5wfay5d079hn39fcjwxfsz8pd02cc60id7jsxxc4jbyxjq42"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; }) {}; - "gogol-replicapool-updater_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-replicapool-updater"; - version = "0.2.0"; - sha256 = "1f1pj16c8l0pic72k0phy2g285mm4l91w2dx06ak2p3xvhpn8d8d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Group Updater SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-resourcemanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.1.1"; - sha256 = "0xw5c54s1p2dlww5102b7nir6iis938038hb5k9k25nia5xx64di"; + version = "0.3.0"; + sha256 = "0n2j9liwx5zd2flzmrq2z2hahbbgw2wx53d6nqykvaf5g3vc6l6b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; license = "unknown"; }) {}; - "gogol-resourcemanager_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-resourcemanager"; - version = "0.2.0"; - sha256 = "0i947wbnam2n0r9n5cxhljbcawkxq2gji9k73z4yhf4239xm7h9j"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Resource Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-resourceviews" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourceviews"; - version = "0.1.1"; - sha256 = "08xqb551fm797kdzb9vr8089ync4wcbichjymqrkc5vxb0b7hibn"; + version = "0.3.0"; + sha256 = "114gjdxzm4kq3ibk32dzy73zvmp9ls9bzb4k7szdkxr922861akp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; license = "unknown"; }) {}; - "gogol-resourceviews_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-resourceviews"; - version = "0.2.0"; - sha256 = "0wf1gg8d8v5jpzfdmzr6v01np3ad5lxxsgm9sjicgs2i59wj907v"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Groups SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-runtimeconfig" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.2.0"; - sha256 = "10d6b2pwicb49fzgmpph12rqy2m36xqr0ihwfjljsz80554jzffl"; + version = "0.3.0"; + sha256 = "004k1zy27gk98xh0h3c7ll3zxk2qif31znwnnyyxi30gmwlg19sj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.2.0"; - sha256 = "0wd1sgrg796wdbj8rfg7lmcj86grnw24k2y247pk7yfxdxwp5f9j"; + version = "0.3.0"; + sha256 = "0sxhc8l7ck20zbn2h7zgcywkygh0gp3mzg0mkgvx1qs4hp0nryvq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-script" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; - version = "0.1.1"; - sha256 = "03yxy43l0ydnafqwgdin69ydnrinppcq7slgzv5681fyi101rdih"; + version = "0.3.0"; + sha256 = "1l2bd93zndmi4zy28ygq63cz020q83viz2pyzy1j0hk0inji9k81"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; license = "unknown"; }) {}; - "gogol-script_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-script"; - version = "0.2.0"; - sha256 = "1js7v9m1h3017lra4khw0hmwm1j2np66bwdggs50rlciflh2wmz2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Apps Script Execution SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-servicecontrol" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicecontrol"; - version = "0.2.0"; - sha256 = "09rwzdvdgi8kcw6v7b7i9wqakcb7ncf1m4cm26xr2n3m162ji50g"; + version = "0.3.0"; + sha256 = "0lfw9592arh01d3swxyp97glxqzc3cvcd3mn6pcm5q6dsjnda1hi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicemanagement"; - version = "0.2.0"; - sha256 = "0bbnd8wb7x26b5kgfsaw4747x808hbsfykxkz0pnfm5zyx6na3hb"; + version = "0.3.0"; + sha256 = "0qasq71k1bm9pm298sdivgnnr1sx9701nhmdn82lx8qglnxvd4v3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; @@ -80452,443 +80661,218 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; - version = "0.1.1"; - sha256 = "0y569mv2limjcg2k6rsvlxhk6nm8nmvmf2738crgmfxn6a1h5cs4"; + version = "0.3.0"; + sha256 = "1kj179262lada2dh3pq129kc6p0rdzppxhmyglin5p2nnlzmkm9d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "gogol-sheets_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-sheets"; - version = "0.2.0"; - sha256 = "1q1pdadk0nchq794z1qsv0y32y91c39w6r0q74iqq4b0s4sdp544"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Sheets SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-shopping-content" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; - version = "0.1.1"; - sha256 = "07smcny86lyc0x0f3lych8k0pwzjxmha9k8p6n9l7lli2pg7mir8"; + version = "0.3.0"; + sha256 = "05q68x2krghnv0j7f7bizhqpjgni2lqm03bp74ydcy7f2y675i55"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "gogol-shopping-content_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-shopping-content"; - version = "0.2.0"; - sha256 = "0qjncikv3qs428z3w1fg15hy1cdg2518pw2dj3qxpi8qjvfm6jgn"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Content API for Shopping SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-siteverification" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; - version = "0.1.1"; - sha256 = "1qgv1j5wkz70yxysg8y3520qhbp1s5lwwxzdd7qql5imxgg7abgb"; + version = "0.3.0"; + sha256 = "0pi4ljv20p5xjw11p99hksn8qz284pjv9f36i7hsdlf5bjd3v1dh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; license = "unknown"; }) {}; - "gogol-siteverification_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-siteverification"; - version = "0.2.0"; - sha256 = "0chazk5ihxdfcrqm2hsrx4xg5g6gy7v03smv3kxgvajvm0ck8x0z"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Site Verification SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-slides" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-slides"; - version = "0.2.0"; - sha256 = "0k5csk32d6hz42k7d6yci70mxpgpy0s78jzj7d3hjhd5hny904z5"; + version = "0.3.0"; + sha256 = "1bqyq767c4w8m2w9i78vn6psnv68687l0kwf6kbmn150gvg9c1mb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-spectrum" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; - version = "0.1.1"; - sha256 = "1h9fz2g61sr76lps50w1srpby3hlcva08qn3q6dp4k9hwbhrycii"; + version = "0.3.0"; + sha256 = "0b596ajxy6ph28l46wnh03cr264ry4yki197bxls8spvzf8pwf5b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; license = "unknown"; }) {}; - "gogol-spectrum_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-spectrum"; - version = "0.2.0"; - sha256 = "0zkggda3p7j1j6ja5qc33ilqjq73hpa5dbzvcgzh4mzhn9h3m396"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Spectrum Database SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-sqladmin" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; - version = "0.1.1"; - sha256 = "1gs1qa1f7gbxyzw09x8gn5m6bv10r942ssd16322qvpy9lrslyvg"; + version = "0.3.0"; + sha256 = "164w0sqy75m1dsvi64kyrihy647j2gm0k7kar46m9wvym1gvcr3r"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; license = "unknown"; }) {}; - "gogol-sqladmin_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-sqladmin"; - version = "0.2.0"; - sha256 = "0lz1vyhpm61gc7w8xmniv0s46gl8b28j9qgl5sqr8xlsca9qbjyp"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud SQL Administration SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-storage" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.1.1"; - sha256 = "0wmahrs83qwpjjlj0brj6rvyrbq6b0i75a5nvzbvqyz3c12z7x3s"; + version = "0.3.0"; + sha256 = "18n4grbbwwg0ymh0gp6qhqdw7v9x81y70lxmslql0w9dlirg959v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; license = "unknown"; }) {}; - "gogol-storage_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-storage"; - version = "0.2.0"; - sha256 = "1nnq2yjwpwxrpz9ix32x12lnlmqm3nfmxl1cgjcaric8fkf2i18m"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Storage JSON SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-storage-transfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.1.1"; - sha256 = "0id7rjd6nlcy4hagcpmaqwsrskq00dfh3n3hdaad7dfka5ziackz"; + version = "0.3.0"; + sha256 = "0iwal6slja14gbdw2xjs79y3c6l56c1hvv0gyip3b3pz5i2xh4zb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; license = "unknown"; }) {}; - "gogol-storage-transfer_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-storage-transfer"; - version = "0.2.0"; - sha256 = "07izvvdy5zfl3k3rkp447jw8jcxi24bmniyhbiwdd7ldcx49gak4"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Storage Transfer SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-tagmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; - version = "0.1.1"; - sha256 = "1vi0wimdvd89nhk28916zjiks1nxj6gpq7g15a0wq0yzp40l1zld"; + version = "0.3.0"; + sha256 = "0hsplk3yvkdglv38pl9cckc6csh23adasyvfdzw08kfbk8b1llgp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; license = "unknown"; }) {}; - "gogol-tagmanager_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-tagmanager"; - version = "0.2.0"; - sha256 = "0gsls15n3d7c7x1nzzr77bvpvsw78yfn1cp1njhikpwsy1i96n7w"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Tag Manager SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-taskqueue" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.1.1"; - sha256 = "076ya8j1g3lp1kpq3yk89i4hb36pd2qx4503vxzgr0pv72dv75s7"; + version = "0.3.0"; + sha256 = "0irzyv80q2n4jv144rryv5xqbg51gqyws1pnvpdi5lddq90yvjq3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; license = "unknown"; }) {}; - "gogol-taskqueue_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-taskqueue"; - version = "0.2.0"; - sha256 = "19mqnnl65i5i0b4nzyw40nw97vzbrh2kxbxl9knpxjls5ab2q5sv"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google TaskQueue SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-translate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; - version = "0.1.1"; - sha256 = "1apdqj0wz5ipnk8488w0ymm86gx656wwwzm009ay7kv65zlzi310"; + version = "0.3.0"; + sha256 = "0bwmymiz1whc2rffxzlkva72j5cq51y8gxfl7lq5bg668p3grcvk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; license = "unknown"; }) {}; - "gogol-translate_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-translate"; - version = "0.2.0"; - sha256 = "1k3qbsjhcd6231br44hmmschq0mav3pfgmcl2pcybx6shhjdnrdr"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Translate SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-urlshortener" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; - version = "0.1.1"; - sha256 = "1y3wza0xfggjj5nd0d5pn9a0czx4m3hkm2dd2ckm25bbw2hcnn6r"; + version = "0.3.0"; + sha256 = "1hmwk3pfxzyv0hxn33jms7c72yl8pnqnbfpza53ljq0abd749fcv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; license = "unknown"; }) {}; - "gogol-urlshortener_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-urlshortener"; - version = "0.2.0"; - sha256 = "0wl6grqh2a4n47c3gkhsr7ywsrjj0kpd9rhwzzg5ggms117rmckb"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google URL Shortener SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-useraccounts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.1.1"; - sha256 = "0iw6xx2s021vfyy7p7w81r53arv1paqkdzbldy60knx0rscssr20"; + version = "0.3.0"; + sha256 = "0fzmq082x0vvml8c0pxhb3vrnvizmq9cmh8y30yapkad7xwgx3i9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; license = "unknown"; }) {}; - "gogol-useraccounts_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-useraccounts"; - version = "0.2.0"; - sha256 = "0rycp4g11crv9hjq9aw3i0xrggmkxyzrj9vnwrga84fvrg1lll4i"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud User Accounts SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-vision" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.1.1"; - sha256 = "0rd5j18b02vvl9if9i5ldr9rxdcfcdx5frh3bh6yncf1sbh6q176"; + version = "0.3.0"; + sha256 = "1ssdz7cv3v3hz024m3djv4asj6lpd4c7a3dzrnxm9ipfbfmjb5f9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; license = "unknown"; }) {}; - "gogol-vision_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-vision"; - version = "0.2.0"; - sha256 = "0wb0hj0mfsjqyrjiyv29zm6labsmzbjxhdhvf14m4mp3fy73b1vc"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Vision SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-webmaster-tools" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; - version = "0.1.1"; - sha256 = "024nzj4wh5dhzi5az1cgwl4m7jw2wx6xww5qjmhkyis3118qzryg"; + version = "0.3.0"; + sha256 = "0rkpjwnb064i7256j0q8gnkynny596qrg79h2wviadmifz9gyixp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; license = "unknown"; }) {}; - "gogol-webmaster-tools_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-webmaster-tools"; - version = "0.2.0"; - sha256 = "0jx0bmx7yljc7dhks0mr06wkplfqcx6nxdfnlgrclplnyf0k8qq0"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Search Console SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-youtube" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; - version = "0.1.1"; - sha256 = "12sg8200wmw4hcf4wxx6xds5fp0jk822v6nlxg7isgziprkv5ad9"; + version = "0.3.0"; + sha256 = "1sv7djr2x73n3w0cbxncyzz64kxn7pwydcyznqipni7xv6hi5s1j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "gogol-youtube_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube"; - version = "0.2.0"; - sha256 = "01chn9bsap4sc2qzsbmm97pb5m3wksvp2f9ky3zw6v89slkaspj2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Data SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; - version = "0.1.1"; - sha256 = "06y9yxq2nqqhf8isrb54cjahyffq4j3qsk6d1pr71s2yc0hp0acq"; + version = "0.3.0"; + sha256 = "10888jai56jpw6snssclldmxn2my9vadrqm14dmrhl6sr3mabdbh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; license = "unknown"; }) {}; - "gogol-youtube-analytics_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube-analytics"; - version = "0.2.0"; - sha256 = "06s518qfiw7p7kc3d2y4ncfm57mic1z1sr3pwl4hjrds7k78v20f"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Analytics SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gogol-youtube-reporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; - version = "0.1.1"; - sha256 = "0b2ywgm2wjilpa8yd5pn3g3bnmik3pnhf5701sgakvrh38avzlcn"; + version = "0.3.0"; + sha256 = "0j8xalrigh3rvxb8z009s6bs34nw68kwjvczm1hlx1fcifgjrp4f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; license = "unknown"; }) {}; - "gogol-youtube-reporting_0_2_0" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube-reporting"; - version = "0.2.0"; - sha256 = "0f9dm434fhb8vslk9x0zhybp31pk2ydvy1yfhmj5kp23nmzlh5pi"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Reporting SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -80910,6 +80894,8 @@ self: { pname = "google-cloud"; version = "0.0.4"; sha256 = "16pv4iiladfsq92xnpj46xa91x5svk6qsmz5szwwb83fhkk7r9q9"; + revision = "1"; + editedCabalFile = "0512swl7ydlcjdbvcb2xm59q97yr3wxgh3sfdsz3zdm1y88qi18c"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types mtl random scientific stm text time unordered-containers @@ -80996,8 +80982,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.3.0.0"; - sha256 = "1cirpv7ckxnly56ia7wd67djkas99yp9b9qb3cvi996jgwwl7d8i"; + version = "0.4.0.0"; + sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -81046,23 +81032,6 @@ self: { }) {}; "google-oauth2-jwt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; - version = "0.1.3"; - sha256 = "02y0l4ylgx5dzx6bv1h90nk234mm5mdr1p8ifizaizh39mdmg5qm"; - libraryHaskellDepends = [ - base base64-bytestring bytestring HsOpenSSL RSA text unix-time - ]; - homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; - description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "google-oauth2-jwt_0_2_2" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time }: @@ -81076,7 +81045,6 @@ self: { homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; description = "Get a signed JWT for Google Service Accounts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-search" = callPackage @@ -81099,8 +81067,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.4.0.0"; - sha256 = "0r1ln013939vw6jqs1hdljyk2z7wxq2jjwr5v8pci2dcii9ryph1"; + version = "0.5.0.0"; + sha256 = "0iicdiai21wldza2nc1m71j6c923mwwfbhnhzw5p9l623dggjrib"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory MissingH @@ -81118,32 +81086,14 @@ self: { }: mkDerivation { pname = "google-translate"; - version = "0.3"; - sha256 = "0r0zk8fv3jfcd65ac07s50i9qi38i5svcj2sycql73rszrhng75q"; + version = "0.4.1"; + sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers ]; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "google-translate_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-api-data - , http-client, servant, servant-client, text, transformers - }: - mkDerivation { - pname = "google-translate"; - version = "0.4"; - sha256 = "0aa9prwp3sdai75dbywsq4qb96crz9dk6dkp7vl7ixbl2q1zxldc"; - libraryHaskellDepends = [ - aeson base bytestring http-api-data http-client servant - servant-client text transformers - ]; - description = "Google Translate API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "googleplus" = callPackage @@ -81196,6 +81146,7 @@ self: { sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ attoparsec base bytestring directory errors http-types lucid mime-types network optparse-applicative text wai warp @@ -81328,9 +81279,10 @@ self: { }) {}; "gore-and-ash-lambdacube" = callPackage - ({ mkDerivation, base, containers, deepseq, exceptions - , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl - , text, unordered-containers + ({ mkDerivation, base, containers, deepseq, exceptions, GLFW-b + , gore-and-ash, gore-and-ash-glfw, hashable, JuicyPixels + , lambdacube-compiler, lambdacube-gl, lambdacube-ir, linear, mtl + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "gore-and-ash-lambdacube"; @@ -81342,6 +81294,11 @@ self: { base containers deepseq exceptions gore-and-ash hashable lambdacube-compiler lambdacube-gl mtl text unordered-containers ]; + executableHaskellDepends = [ + base containers deepseq exceptions GLFW-b gore-and-ash + gore-and-ash-glfw JuicyPixels lambdacube-compiler lambdacube-gl + lambdacube-ir linear mtl text transformers vector + ]; homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme"; description = "Core module for Gore&Ash engine that do something"; license = stdenv.lib.licenses.bsd3; @@ -81365,7 +81322,6 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging"; description = "Core module for gore-and-ash with logging utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-network" = callPackage @@ -81432,6 +81388,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gotta-go-fast" = callPackage + ({ mkDerivation, base, brick, cmdargs, directory, random, text + , time, vty, word-wrap + }: + mkDerivation { + pname = "gotta-go-fast"; + version = "0.1.4.0"; + sha256 = "15gip4nggw3wxa3k546sqqbiqzhkw5acxwmwy3iv911d61s89gvb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick cmdargs directory random text time vty word-wrap + ]; + 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 ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv , deepseq, directory, filepath, haskell-src-exts, hint, HTTP @@ -81659,7 +81634,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Examples using the Grapefruit library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-frp" = callPackage @@ -81676,7 +81650,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Functional Reactive Programming core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-records" = callPackage @@ -81689,7 +81662,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "A record system for Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-ui" = callPackage @@ -81707,7 +81679,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-ui-gtk" = callPackage @@ -81726,7 +81697,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-core" = callPackage @@ -81798,7 +81768,6 @@ 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 @@ -81811,6 +81780,7 @@ self: { sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec @@ -81836,7 +81806,6 @@ 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 @@ -81850,6 +81819,7 @@ self: { sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout graph-rewriting-strategies IndentParser @@ -81858,7 +81828,6 @@ 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 @@ -81875,7 +81844,6 @@ 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 @@ -81888,6 +81856,7 @@ self: { sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec @@ -81895,7 +81864,6 @@ 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 @@ -81912,7 +81880,6 @@ 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 @@ -81926,6 +81893,7 @@ self: { sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols containers directory filepath GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL @@ -81948,6 +81916,7 @@ self: { sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout IndentParser OpenGL parsec @@ -81955,7 +81924,6 @@ 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 @@ -82001,6 +81969,7 @@ self: { homepage = "https://github.com/atzedijkstra/graph-visit"; description = "Graph walk abstraction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-wrapper" = callPackage @@ -82149,6 +82118,7 @@ self: { pname = "graphql"; version = "0.3"; sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base tasty tasty-hunit text ]; homepage = "https://github.com/jdnavarro/graphql-haskell"; @@ -82180,7 +82150,6 @@ self: { homepage = "https://github.com/jml/graphql-api#readme"; description = "Sketch of GraphQL stuff"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -82246,6 +82215,9 @@ self: { 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 ]; @@ -82271,6 +82243,9 @@ self: { 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 ]; @@ -82417,6 +82392,7 @@ self: { pname = "greencard-lib"; version = "3.0.1"; sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers greencard pretty ]; homepage = "http://www.haskell.org/greencard/"; description = "A foreign function interface pre-processor library for Haskell"; @@ -82513,8 +82489,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.8"; - sha256 = "174x6x4aflv75k89nvpnpwd5201c5375vb0yk4p0ilidqi7kza90"; + version = "7.8.9"; + sha256 = "1gzf8k4v16aavz63fcl0byqxzha796g77dng7rsxjm8zsgzlicy0"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -82659,7 +82635,6 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-converters" = callPackage @@ -82688,8 +82663,8 @@ self: { }: mkDerivation { pname = "groundhog-inspector"; - version = "0.8"; - sha256 = "0vh71ds4ff89skm2ib55q9zfsgjxwlshz1gn3ncahcpb7wgzagfl"; + version = "0.8.0.2"; + sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82703,7 +82678,6 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-mysql" = callPackage @@ -82721,7 +82695,6 @@ self: { ]; description = "MySQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-postgresql" = callPackage @@ -82741,7 +82714,6 @@ self: { ]; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-sqlite" = callPackage @@ -82759,7 +82731,6 @@ self: { ]; description = "Sqlite3 backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-th" = callPackage @@ -82768,15 +82739,14 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.8"; - sha256 = "1hrflzbsmfd8ixad1534ml34swxpdm356zhppzx13i70a2sikxyf"; + version = "0.8.0.1"; + sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "group-by-date" = callPackage @@ -82902,6 +82872,7 @@ self: { sha256 = "02xspk67jy5bhdmbhgk924sqn565aprkvm0sfv1sgmc836qg625f"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ruff ]; executableHaskellDepends = [ base bytestring containers directory filepath FTGL gtk gtkglext mtl @@ -83042,6 +83013,7 @@ self: { pname = "gstreamer"; version = "0.12.8"; sha256 = "1bb9rzgs3dkwwril97073aygrz46gxq039k9vn5d7my8hgcpwhzz"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring directory glib mtl @@ -83050,7 +83022,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -83063,6 +83034,7 @@ self: { sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers extensible-exceptions haskeline HTTP json mtl unix url utf8-string @@ -83095,6 +83067,7 @@ self: { pname = "gtk"; version = "0.14.6"; sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -83155,8 +83128,9 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.3.1"; - sha256 = "0fbbf797i36s65sxywqzvkbvnh4cj17w0km5ym31n7hnvd2i4rdg"; + version = "0.3.4.0"; + sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; @@ -83174,6 +83148,7 @@ self: { pname = "gtk-serialized-event"; version = "0.12.0"; sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -83243,6 +83218,7 @@ self: { sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base Cabal containers directory filepath hashtables pretty process random @@ -83387,7 +83363,8 @@ self: { "gtk3" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text + , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time + , transformers }: mkDerivation { pname = "gtk3"; @@ -83395,11 +83372,15 @@ self: { sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l"; 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; @@ -83411,8 +83392,9 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.3.1"; - sha256 = "1z709van0llwkfyrpmkqkzpcv82kwz54bw3rwwsqrx3mzi7q5fm5"; + version = "0.3.4.0"; + sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -83430,6 +83412,7 @@ self: { pname = "gtkglext"; version = "0.13.1.1"; sha256 = "15v40f21xlg5r2zidh77cfiq6ink1dxljbl59mf5sqyq5pjbdw3h"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; @@ -83447,6 +83430,7 @@ self: { pname = "gtkimageview"; version = "0.12.0"; sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -83468,6 +83452,7 @@ self: { sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base gconf glade gtk MissingH process regex-posix unix ]; @@ -83485,6 +83470,7 @@ self: { pname = "gtksourceview2"; version = "0.13.3.1"; sha256 = "0lzyqlbd0w825ag9iisiicrsb86gx7axxcr4sh4jhnxagz0fpid1"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl text @@ -83503,6 +83489,7 @@ self: { pname = "gtksourceview3"; version = "0.13.3.1"; sha256 = "0yrv71r772h8h7x73xb5k868lg7lmh50r0vzxrl2clrxlpyi4zls"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl text @@ -83560,6 +83547,7 @@ self: { sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; @@ -83688,6 +83676,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "h2c" = callPackage + ({ mkDerivation, base, bytestring, mtl, resourcet }: + mkDerivation { + pname = "h2c"; + version = "1.0.0"; + sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb"; + libraryHaskellDepends = [ base bytestring mtl resourcet ]; + homepage = "https://bitbucket.org/fmapE/h2c"; + description = "Bindings to Linux I2C with support for repeated-start transactions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hArduino" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, serialport , time @@ -83798,6 +83799,7 @@ self: { pname = "hF2"; version = "0.2"; sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cereal vector ]; description = "F(2^e) math for cryptography"; license = stdenv.lib.licenses.bsd3; @@ -84020,7 +84022,6 @@ self: { homepage = "http://gregheartsfield.com/hS3/"; description = "Interface to Amazon's Simple Storage Service (S3)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hScraper" = callPackage @@ -84063,6 +84064,7 @@ self: { pname = "hTalos"; version = "0.2"; sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mgajda/hTalos"; @@ -84091,6 +84093,7 @@ self: { sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base hmatrix ]; executableSystemDepends = [ blas liblapack ]; homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9"; @@ -84175,23 +84178,23 @@ self: { "hablog" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types - , mtl, optparse-applicative, scotty, scotty-tls, text, transformers + , mtl, network-uri, optparse-applicative, rss, scotty, scotty-tls + , text, time, transformers }: mkDerivation { pname = "hablog"; - version = "0.5.1"; - sha256 = "178j0jv38yi5hq2lb9sq8rjxbpvb1y8anqal2mgh7crxkch3llqs"; + version = "0.6.0"; + sha256 = "0373kjd67iivrrr6kcjrhcqkk2wrxfx9zz3qn58mhycp8w78biaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bifunctors blaze-html blaze-markup bytestring containers - directory filepath markdown mime-types mtl scotty scotty-tls text - transformers + directory filepath markdown mime-types mtl network-uri rss scotty + scotty-tls text time transformers ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -84211,6 +84214,7 @@ self: { pname = "hack"; version = "2012.2.6"; sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default ]; homepage = "http://github.com/nfjinjing/hack/tree/master"; description = "a Haskell Webserver Interface"; @@ -84226,6 +84230,7 @@ self: { pname = "hack-contrib"; version = "2010.9.28"; sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring cgi containers data-default directory filepath hack haskell98 mps network old-locale old-time @@ -84263,6 +84268,7 @@ self: { pname = "hack-frontend-happstack"; version = "2009.6.24.1"; sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers hack happstack-server network utf8-string @@ -84325,6 +84331,7 @@ self: { pname = "hack-handler-evhttp"; version = "2009.8.4"; sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring bytestring-class containers data-default hack hack-contrib network @@ -84358,6 +84365,7 @@ self: { pname = "hack-handler-happstack"; version = "2009.12.20"; sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cgi containers data-default hack happstack-server mtl network @@ -84376,6 +84384,7 @@ self: { pname = "hack-handler-hyena"; version = "2010.3.15"; sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default hack hyena network ]; @@ -84391,6 +84400,7 @@ self: { pname = "hack-handler-kibro"; version = "2009.5.27"; sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cgi data-default hack kibro network ]; @@ -84516,6 +84526,7 @@ self: { pname = "hack2-contrib-extra"; version = "2014.12.20"; sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air air-extra base bytestring cgi containers data-default directory filepath hack2 hack2-contrib network old-locale old-time time @@ -84533,6 +84544,7 @@ self: { pname = "hack2-handler-happstack-server"; version = "2011.6.20"; sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cgi containers data-default enumerator hack2 happstack-server mtl network @@ -84553,6 +84565,7 @@ self: { pname = "hack2-handler-mongrel2-http"; version = "2011.10.31"; sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson air attoparsec base blaze-builder blaze-textual bytestring containers data-default directory enumerator hack2 mtl network safe @@ -84592,6 +84605,7 @@ self: { pname = "hack2-handler-warp"; version = "2012.5.25"; sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air base data-default hack2 hack2-interface-wai warp ]; @@ -84616,7 +84630,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-interface-wai"; description = "Hack2 interface to WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-db" = callPackage @@ -84707,7 +84720,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-plot"; description = "Generate cumulative graphs of hackage uploads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-processing" = callPackage @@ -84769,7 +84781,6 @@ 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 @@ -84820,8 +84831,8 @@ self: { }) {}; "hackage-server" = callPackage - ({ mkDerivation, acid-state, aeson, alex, array, async, base - , base16-bytestring, base64-bytestring, binary, blaze-builder + ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec + , base, base16-bytestring, base64-bytestring, binary, blaze-builder , bytestring, Cabal, cereal, containers, crypto-api, csv, deepseq , directory, filepath, happstack-server, happy, HaXml, hscolour , hslogger, HStringTemplate, HTTP, lifted-base, mime-mail, mtl @@ -84836,8 +84847,9 @@ self: { sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - acid-state aeson array async base base16-bytestring + acid-state aeson array async attoparsec base base16-bytestring base64-bytestring binary blaze-builder bytestring Cabal cereal containers crypto-api csv deepseq directory filepath happstack-server HaXml hscolour hslogger HStringTemplate HTTP @@ -84874,7 +84886,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 @@ -84909,7 +84920,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage2hwn"; description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2twitter" = callPackage @@ -84946,31 +84956,6 @@ self: { }) {}; "hackernews" = 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.1.2.0"; - sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base http-client http-types QuickCheck quickcheck-instances - servant servant-client string-conversions text - ]; - executableHaskellDepends = [ base http-client http-client-tls ]; - testHaskellDepends = [ - aeson base hspec http-client http-client-tls QuickCheck - quickcheck-instances - ]; - description = "API for Hacker News"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hackernews_1_2_0_0" = callPackage ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls , http-types, QuickCheck, quickcheck-instances, servant , servant-client, string-conversions, text @@ -85005,6 +84990,7 @@ self: { editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ]; homepage = "https://github.com/fgaz/hackertyper"; description = "\"Hack\" like a programmer in movies and games!"; @@ -85120,8 +85106,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; - version = "2.17.5"; - sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql"; + version = "2.17.4"; + sha256 = "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -85133,6 +85119,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock_2_18_1" = callPackage + ({ mkDerivation, base, filepath, haddock-api, hspec }: + mkDerivation { + pname = "haddock"; + version = "2.18.1"; + sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock-api_2_15_0_2" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-paths, haddock-library @@ -85142,6 +85146,7 @@ self: { pname = "haddock-api"; version = "2.15.0.2"; sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml @@ -85161,6 +85166,7 @@ self: { pname = "haddock-api"; version = "2.16.1"; sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml @@ -85180,6 +85186,9 @@ self: { pname = "haddock-api"; version = "2.17.4"; sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss"; + revision = "1"; + editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml @@ -85190,6 +85199,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-api_2_18_1" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths + , haddock-library, hspec, QuickCheck, transformers, xhtml + }: + mkDerivation { + pname = "haddock-api"; + version = "2.18.1"; + sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8"; + revision = "1"; + editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-boot ghc-paths haddock-library transformers xhtml + ]; + testHaskellDepends = [ base containers ghc hspec QuickCheck ]; + 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-leksah" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, ghc, ghc-paths, pretty @@ -85200,6 +85232,7 @@ self: { sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths pretty ]; @@ -85244,6 +85277,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-library_1_4_5" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq + , hspec, QuickCheck, transformers + }: + mkDerivation { + pname = "haddock-library"; + version = "1.4.5"; + sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; + libraryHaskellDepends = [ + attoparsec base bytestring transformers + ]; + testHaskellDepends = [ + attoparsec base base-compat bytestring deepseq hspec QuickCheck + transformers + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock-test" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , process, syb, xhtml, xml @@ -85268,8 +85322,8 @@ self: { }: mkDerivation { pname = "haddocset"; - version = "0.4.2"; - sha256 = "140ja5i6l3dfy8pz8vrx8z2adx2mvr5y0252avf8b6lqjsxqgxm8"; + version = "0.4.3"; + sha256 = "0fy4vx7jig9zkg4i8fajrz1mz72cdi0y6qk1h152x7nlz26f7ymk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85321,6 +85375,7 @@ self: { homepage = "http://github.com/jystic/hadoop-rpc"; description = "Use the Hadoop RPC interface from Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-tools" = callPackage @@ -85459,10 +85514,11 @@ self: { }: mkDerivation { pname = "hail"; - version = "0.1.0.3"; - sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889"; + version = "0.2.0.0"; + sha256 = "1cb1mszlxwx0091f21gyg3zd42r9qz03h04rl65kl3qydnwrmkyh"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring directory filepath http-client lens lens-aeson netrc network-uri optparse-applicative parsec process text wreq @@ -85479,8 +85535,8 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.4"; - sha256 = "0qcfhprg5x0wb28zgn80x808a1w6il2hc6mykq8wv0ranmwj1lrx"; + version = "0.4.1.5"; + sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; libraryHaskellDepends = [ aeson base bytestring email-validate exceptions filepath http-client http-client-tls http-types tagsoup text time @@ -85706,49 +85762,6 @@ self: { }) {}; "hakyll" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptohash, data-default, deepseq, directory - , filepath, fsnotify, http-conduit, http-types, lrucache, mtl - , network, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base - , regex-tdfa, resourcet, scientific, system-filepath, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, text, time - , time-locale-compat, unordered-containers, utillinux, vector, wai - , wai-app-static, warp, yaml - }: - mkDerivation { - pname = "hakyll"; - version = "4.9.7.0"; - sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process random - regex-base regex-tdfa resourcet scientific system-filepath tagsoup - text time time-locale-compat unordered-containers vector wai - wai-app-static warp yaml - ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process - QuickCheck random regex-base regex-tdfa resourcet scientific - system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text - time time-locale-compat unordered-containers vector wai - wai-app-static warp yaml - ]; - testToolDepends = [ utillinux ]; - homepage = "http://jaspervdj.be/hakyll"; - description = "A static website compiler library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) utillinux;}; - - "hakyll_4_9_8_0" = callPackage ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring , containers, cryptohash, data-default, deepseq, directory , filepath, fsnotify, http-conduit, http-types, lrucache, mtl @@ -85765,6 +85778,7 @@ self: { sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-html blaze-markup bytestring containers cryptohash data-default deepseq directory filepath fsnotify @@ -85789,7 +85803,6 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -85845,6 +85858,7 @@ self: { sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hakyll pandoc ]; executableHaskellDepends = [ base directory filepath hakyll ]; homepage = "http://jaspervdj.be/hakyll"; @@ -85944,7 +85958,6 @@ 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 @@ -85990,7 +86003,6 @@ 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 @@ -86033,7 +86045,6 @@ self: { homepage = "https://github.com/oisdk/hakyll-series"; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -86051,7 +86062,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -86299,6 +86309,30 @@ self: { 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 + }: + mkDerivation { + pname = "hamilton"; + version = "0.1.0.1"; + sha256 = "12wp6z2dhcpyijvf1bqcx1bamw19crm23wvzgbpbjw3azyi72sn3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base comonad free hmatrix hmatrix-gsl typelits-witnesses + vector-sized + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers hmatrix optparse-applicative vector + vector-sized vty + ]; + homepage = "https://github.com/mstksg/hamilton"; + description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -86468,6 +86502,7 @@ self: { sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers scientific ]; @@ -86561,6 +86596,7 @@ self: { sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base mtl random utility-ht ]; description = "Hangman implementation in Haskell written in two hours"; license = stdenv.lib.licenses.mit; @@ -86577,6 +86613,7 @@ self: { sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring directory formatting http-types lens lens-aeson process scotty text transformers unix-time wai-extra @@ -86657,40 +86694,19 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, base, base-compat, directory, either, filepath - , hspec, mtl, process, temporary, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "hapistrano"; - version = "0.2.1.2"; - sha256 = "02gd8j5f006pv8xkrdyn3s6316ggn8nzqbxq37yxdyh26xx0pb93"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base either filepath mtl process time time-locale-compat - transformers - ]; - executableHaskellDepends = [ base base-compat ]; - testHaskellDepends = [ - base directory either filepath hspec mtl process temporary - ]; - homepage = "https://github.com/stackbuilders/hapistrano"; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_2_2" = 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.2.2"; - sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7"; + version = "0.3.2.4"; + sha256 = "08p1060m9wjxgxai5zxhzv40c0h9xsdvcbdg33b20hzyapzgq6kl"; + revision = "1"; + editedCabalFile = "0cvbn9a7jhq8nr1cwfij5bm030d662s5hn287q5w5wx5xmmzsn9m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath mtl path process time transformers ]; @@ -86703,7 +86719,6 @@ self: { 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 @@ -86714,6 +86729,7 @@ self: { pname = "happindicator"; version = "0.0.4"; sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers glib gtk mtl ]; @@ -86725,7 +86741,7 @@ self: { }) {inherit (pkgs) libappindicator-gtk2;}; "happindicator3" = callPackage - ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }: + ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3, text }: mkDerivation { pname = "happindicator3"; version = "0.2.1"; @@ -86734,6 +86750,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ libappindicator-gtk3 ]; + executableHaskellDepends = [ base gtk3 text ]; homepage = "https://github.com/mlacorte/happindicator3"; description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; @@ -86859,8 +86876,9 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.7"; - sha256 = "01xn6j7pqc0czdflxwkmnj8hm6z0wwjqpjmal4qbcbzy16m86bbc"; + version = "2.3.4.8"; + sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default email-validate filepath @@ -86873,6 +86891,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -86895,7 +86914,7 @@ self: { "happstack-contrib" = callPackage ({ mkDerivation, base, bytestring, directory, happstack-data , happstack-ixset, happstack-server, happstack-state - , happstack-util, HTTP, mtl, network, old-time, syb, unix + , happstack-util, HTTP, HUnit, mtl, network, old-time, syb, unix }: mkDerivation { pname = "happstack-contrib"; @@ -86908,6 +86927,7 @@ self: { happstack-server happstack-state happstack-util HTTP mtl network old-time syb unix ]; + executableHaskellDepends = [ HUnit ]; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -87023,6 +87043,7 @@ self: { pname = "happstack-fay-ajax"; version = "0.2.0"; sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ fay-base fay-jquery ]; homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; @@ -87038,8 +87059,9 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.9"; - sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n"; + version = "0.5.9.1"; + sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base monad-control mtl reform reform-happstack reform-hsp safecopy text @@ -87112,8 +87134,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.2"; - sha256 = "1r4mlbzn1ca3q94ly81alz4741q3v6b3655k0kd5ysahq5yy6p9w"; + version = "7.3.7.3"; + sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -87167,8 +87189,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.11"; - sha256 = "076zvc7kb68nanjrhgx1n37n9n83s862qcb4aa62idqzv52biii9"; + version = "7.0.12"; + sha256 = "1bmffidqi784y1qwgqxncwcw6knklnkliznbdx66gjvkfccv9d5s"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -87254,6 +87276,36 @@ self: { 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 + , 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.5.0.1"; + sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -87261,8 +87313,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.2"; - sha256 = "1mghs9xsqmzlslry0hl8gv0cwk988lg41zwrw11a5wbii285lgmw"; + version = "7.1.6.4"; + sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -87271,7 +87323,6 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -87328,7 +87379,6 @@ 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 @@ -87364,6 +87414,7 @@ self: { pname = "happstack-yui"; version = "7373.5.3"; sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base boomerang bytestring containers directory happstack-jmacro happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty @@ -87410,7 +87461,6 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happybara" = callPackage @@ -87514,7 +87564,6 @@ self: { homepage = "https://github.com/freizl/har"; description = "HAR spec in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "harchive" = callPackage @@ -87586,6 +87635,7 @@ self: { sha256 = "1pf5vpyxrqsvrg1w5spzvwjkr7gdy2mp0sdxphcrwwj9n56klgj5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base BNFC containers derive directory hastache hslogger mtl process QuickCheck text @@ -87734,7 +87784,6 @@ self: { homepage = "https://github.com/zmactep/hasbolt#readme"; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -87750,7 +87799,6 @@ self: { homepage = "https://github.com/mekeor/hascal"; description = "tiny calculator library and command-line program"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascar" = callPackage @@ -87761,8 +87809,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.1.1"; - sha256 = "11j0bixpl2fyn5xxyjzh2d42c6hv5scpsjqr6akszfcmjlx1r07z"; + version = "0.2.1.2"; + sha256 = "1x04yddy74vj7sxwsmq411z4s02n5asb17vc5290ha7s257fr81j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87779,6 +87827,7 @@ self: { homepage = "https://github.com/VirtualForgeGmbH/hascar"; description = "Decompress SAPCAR archives"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascas" = callPackage @@ -87909,8 +87958,8 @@ self: { pname = "hashable"; version = "1.2.6.1"; sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll"; - revision = "1"; - editedCabalFile = "1saaj9izz0faj85svdd45z4iygqb9z8i130br9vlqp3py7f2ymzz"; + revision = "2"; + editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88056,7 +88105,6 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashing" = callPackage @@ -88237,6 +88285,7 @@ self: { homepage = "http://github.com/singpolyma/haskades"; description = "Utility to generate bindings for BlackBerry Cascades"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskakafka" = callPackage @@ -88262,7 +88311,6 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -88275,6 +88323,7 @@ self: { sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer SDL-ttf transformers vector Yampa @@ -88282,7 +88331,6 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskarrow" = callPackage @@ -88447,6 +88495,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "haskell-abci" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, foundation, lens + , network-conduit, proto-lens, proto-lens-arbitrary + , proto-lens-protoc, text + }: + mkDerivation { + pname = "haskell-abci"; + version = "0.1.0.0"; + sha256 = "15d4hqld9f00vmc3cvjvhamfkcl60dfdmkkrd9yrqj044ml93kaf"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base binary bytestring conduit conduit-combinators conduit-extra + foundation lens network-conduit proto-lens proto-lens-arbitrary + proto-lens-protoc + ]; + executableHaskellDepends = [ + base binary bytestring foundation lens text + ]; + homepage = "https://github.com/cwgoes/haskell-abci#readme"; + description = "Haskell Application BlockChain Interface (ABCI) Server Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-aliyun" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude , blaze-builder, bytestring, case-insensitive, conduit, Crypto @@ -88585,10 +88660,25 @@ self: { homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {booleanlist = null;}; + "haskell-conll" = callPackage + ({ mkDerivation, base, containers, lens, pretty-show, protolude + , split, text + }: + mkDerivation { + pname = "haskell-conll"; + version = "0.1.0.1"; + sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga"; + libraryHaskellDepends = [ + base containers lens pretty-show protolude split text + ]; + homepage = "https://github.com/mgajda/haskell-conll#readme"; + description = "Core Types for NLP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-course-preludes" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -88601,6 +88691,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-disque" = callPackage + ({ mkDerivation, base, bytestring, hedis, string-conversions + , transformers + }: + mkDerivation { + pname = "haskell-disque"; + version = "0.0.1.1"; + sha256 = "1375phlycnxajfni9yjgskh9a9nxz44jhr5ls508dgslwzvibzv8"; + libraryHaskellDepends = [ + base bytestring hedis string-conversions transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ArekCzarnik/haskell-disque#readme"; + description = "Client library for the Disque datastore"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths @@ -88636,6 +88743,7 @@ 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 @@ -88769,8 +88877,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.20.2"; - sha256 = "1dnavj0qpcljakmb5jnv0hqds8a0zqn5ycn0xq5fls20fmw9j5gh"; + version = "0.20.3"; + sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88792,8 +88900,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.20.3"; - sha256 = "07ggfmbr9s4c1ql4cyyk64fbig5k2mpc25371zrrj44yc6ai2xz1"; + version = "0.20.4"; + sha256 = "00kpn7rxg91im26109q1m3g6hyp8v46v50j3dddz002sj2zycifq"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -88801,6 +88909,18 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-overloading" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "haskell-gi-overloading"; + version = "1.0"; + sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry"; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Overloading support for haskell-gi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-go-checkers" = callPackage ({ mkDerivation, base, containers, gloss }: mkDerivation { @@ -88813,7 +88933,6 @@ 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 @@ -88865,17 +88984,17 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.1"; - sha256 = "14myydivq7dphm2m9wsrwkbc8bn5gnq625mgmq2w4j3yzbaw4267"; + version = "1.0.2"; + sha256 = "17pfvbs6mkv8iv86qzqsnq45f5scry2xkx4b7y3kf9bcj39xx1z6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base classy-prelude ghc graphviz process text transformers ]; executableHaskellDepends = [ base ]; + homepage = "https://github.com/ncaq/haskell-import-graph.git#readme"; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-in-space" = callPackage @@ -88924,6 +89043,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -88994,6 +89146,7 @@ self: { pname = "haskell-names"; version = "0.8.0"; sha256 = "127fjggbgxhpxdh5sdj4pdfgx9xadaw93n0ii07grz0jgbvj0fwn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath haskell-src-exts mtl transformers traverse-with-class uniplate @@ -89314,6 +89467,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts-observe" = callPackage + ({ mkDerivation, base, haskell-src-exts, Hoed }: + mkDerivation { + pname = "haskell-src-exts-observe"; + version = "0.1.0"; + sha256 = "06vqd9ljmlx96xx6gyhfag2fsxwdzab0sy1gry2d24mbppbaa1x1"; + libraryHaskellDepends = [ base haskell-src-exts Hoed ]; + homepage = "https://github.com/pepeiborra/haskell-src-exts-observe"; + description = "Observable orphan instances for haskell-src-exts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-prisms" = callPackage ({ mkDerivation, base, haskell-src-exts, lens, template-haskell }: mkDerivation { @@ -89356,27 +89522,25 @@ self: { 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-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, pretty, syb - , template-haskell, th-orphans + "haskell-src-exts-util" = callPackage + ({ mkDerivation, base, containers, data-default, haskell-src-exts + , transformers, uniplate }: mkDerivation { - pname = "haskell-src-meta"; - version = "0.7.0.1"; - sha256 = "0fka53lw1xh6fa77s7bxcyaf888v3dr89yalrg4x8if6j0f5m3j2"; - revision = "1"; - editedCabalFile = "0g6jslwrz934hpq8x0b7r50rk2q96raw5a6s4mxanjx36g19rrgp"; + pname = "haskell-src-exts-util"; + version = "0.1.0"; + sha256 = "0paqb9k7p7vnykrzmiwkmah50523svsifc7wjy1xc5c2cc19597m"; libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans + base containers data-default haskell-src-exts transformers uniplate ]; - description = "Parse source to template-haskell abstract syntax"; + homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; + description = "Helper functions for working with haskell-src-exts trees"; license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-meta_0_8_0_1" = callPackage + "haskell-src-meta" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb , template-haskell, test-framework, test-framework-hunit , th-orphans @@ -89394,7 +89558,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -89458,32 +89621,14 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.5.0.0"; - sha256 = "0xzfkmpd6s25kglpffd1rm53za2qlbkb1a8cgqpr9fzzyvmzxy39"; + version = "0.8.1.0"; + sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4"; 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_0_8_0_0" = callPackage - ({ mkDerivation, base, ghc, mtl, references, template-haskell - , uniplate - }: - mkDerivation { - pname = "haskell-tools-ast"; - version = "0.8.0.0"; - sha256 = "15d588xnmghq116g4bg0jv10z5xzs54ln4da58dzm0d8241bmcd0"; - 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 @@ -89541,33 +89686,14 @@ self: { }) {}; "haskell-tools-backend-ghc" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc - , haskell-tools-ast, mtl, references, safe, split, template-haskell - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-backend-ghc"; - version = "0.5.0.0"; - sha256 = "1s1gppknkxrp4blnaw4clcvnbnhkm36zrad2hcgqa382cwiqp3gb"; - libraryHaskellDepends = [ - base bytestring containers ghc 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-backend-ghc_0_8_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 = "0.8.0.0"; - sha256 = "076kb9hcjina0d5dcwslbxhkja3p2m2fyxs88ywyqlciry2wdw2n"; + version = "0.8.1.0"; + sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -89575,40 +89701,9 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , directory, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl - , process, references, split, tasty, tasty-hunit, time - }: - mkDerivation { - pname = "haskell-tools-cli"; - version = "0.5.0.0"; - sha256 = "051cgl8hy17dnc13y3a2w5l09jc25r2nlhrni7b9qv6h09nnly88"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths haskell-tools-ast - haskell-tools-prettyprint haskell-tools-refactor mtl references - split - ]; - 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_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl @@ -89639,34 +89734,6 @@ self: { }) {}; "haskell-tools-daemon" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl - , network, process, references, split, tasty, tasty-hunit - }: - mkDerivation { - pname = "haskell-tools-daemon"; - version = "0.5.0.0"; - sha256 = "0nljcpijmiw14amgbmj8zx5kq9637z21s49ldbbxc5ib95nzd3jq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor - mtl network process references split - ]; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-daemon_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , directory, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl @@ -89674,8 +89741,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.8.0.0"; - sha256 = "0fd9pxyxsfy09ks21nsk6khx97mb73kvjk6hg3wc8qcffxng9m69"; + version = "0.8.1.0"; + sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89691,40 +89758,17 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Background process for Haskell-tools refactor that editors can connect to"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-debug" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-refactor, references - }: - mkDerivation { - pname = "haskell-tools-debug"; - version = "0.5.0.0"; - sha256 = "09yw2jqyff607gzrdaijjyp8wp14cclb1mds5cfhbjwrjnlrc1xp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor references - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Debugging Tools for Haskell-tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-debug_0_8_0_0" = 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.0.0"; - sha256 = "0j9gd562kmmanqx9kbs1kks68pksnxgf55rghl8ip3j8a3h93smy"; + version = "0.8.1.0"; + sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89736,7 +89780,6 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-demo" = callPackage @@ -89749,8 +89792,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.5.0.0"; - sha256 = "1331q9gg8i5rf3iikf7sdb8pv3y9rkd4i33ww14jld55whgd6pab"; + version = "0.8.1.0"; + sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89767,65 +89810,16 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-demo_0_8_0_0" = 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.0.0"; - sha256 = "14l8zwzi4nzx1ddq2sbazr5faf0y241ppx9df5q9n0v24aclmxd6"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl - , references, split, uniplate - }: - mkDerivation { - pname = "haskell-tools-prettyprint"; - version = "0.5.0.0"; - sha256 = "0z1na6wm3y8xxpbf1hcp1r3qa73ks4npjkc5vm3kbmg2sifbk426"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast mtl references split 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-prettyprint_0_8_0_0" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.8.0.0"; - sha256 = "19bx0fzgvin78iilw32klmjr0z0c9cw1x0xx1nj8mbi44c5rcb64"; + version = "0.8.1.0"; + sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -89833,7 +89827,6 @@ self: { 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 @@ -89846,8 +89839,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.5.0.0"; - sha256 = "1y2xndnwfx6lc4ih95lans2gmmfpjqslf038fxrd2gv26flw3p21"; + version = "0.8.1.0"; + sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -89864,38 +89857,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-refactor_0_8_0_0" = 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.0.0"; - sha256 = "1k9mq164v7nm83dykdgmzxfdqmyk5p35lgzvnmw9mh43rrnnw8vd"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-rewrite" = callPackage @@ -89905,8 +89866,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.5.0.0"; - sha256 = "155w5m0vi3hpf0a1kgwz2s0n7l2smd3h80fsqqjzyvwvf3l7dgdb"; + version = "0.8.1.0"; + sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -89918,30 +89879,6 @@ self: { 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-tools-rewrite_0_8_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 = "0.8.0.0"; - sha256 = "076dc91swh42rs80ijbjrbzab1m9vjdzvy7z9r7znmrhy951ck5c"; - 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 @@ -90570,6 +90507,7 @@ self: { pname = "haskelzinc"; version = "0.3.0.9"; sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath parsec3 pretty process ]; @@ -90577,6 +90515,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskey-btree" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-ordlist + , focus, hashable, HUnit, list-t, mtl, QuickCheck, semigroups, stm + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, vector + }: + mkDerivation { + pname = "haskey-btree"; + version = "0.1.0.0"; + sha256 = "1kr9ihgvbxirbvs638y5sfmx41mj685jmcka87ics7w9ppcpkbsw"; + libraryHaskellDepends = [ + base binary bytestring containers focus hashable list-t mtl + semigroups stm transformers vector + ]; + testHaskellDepends = [ + base binary bytestring containers data-ordlist HUnit mtl QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers vector + ]; + homepage = "https://github.com/haskell-haskey/haskey-btree"; + description = "B+-tree implementation in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskgame" = callPackage ({ mkDerivation, base, containers, haskell98, SDL, SDL-ttf }: mkDerivation { @@ -90617,6 +90579,7 @@ self: { pname = "haskhol-core"; version = "1.1.0"; sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base containers deepseq filepath ghc-prim hashable mtl parsec pretty safecopy shelly template-haskell text text-show @@ -90649,6 +90612,28 @@ self: { 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 + }: + mkDerivation { + pname = "haskintex"; + version = "0.8.0.0"; + sha256 = "1n6xbk8mc4n7a7w9hw2q21ya784jd2wqfvx54iqz9fik5w8p8jcx"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams , io-streams, time, vector @@ -91027,6 +91012,7 @@ self: { base data-accessor event-list haskore non-negative numeric-prelude random synthesizer-core synthesizer-filter utility-ht ]; + executableHaskellDepends = [ base synthesizer-core utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Music rendering coded in Haskell"; license = "GPL"; @@ -91168,8 +91154,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.2.2"; - sha256 = "0522rp8cicvizvr183vfr07a5c8a98hz7g6m6pjjk1vzf95b7w20"; + version = "0.3.2.4"; + sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91186,9 +91172,8 @@ self: { ]; benchmarkHaskellDepends = [ base criterion directory text ]; homepage = "https://github.com/contivero/hasmin#readme"; - description = "\"A CSS Minifier\""; + description = "CSS Minifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasparql-client" = callPackage @@ -91218,54 +91203,18 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , criterion, data-default-class, deepseq, dlist, either, hashable - , hashtables, loch-th, mtl, placeholders, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, time, transformers - , uuid, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.16"; - sha256 = "1h0iw0ms613s995n00b4g533bx4ykc2p52rkbcr8yyg0gmd1j1xj"; - libraryHaskellDepends = [ - aeson attoparsec base base-prelude bytestring - bytestring-tree-builder contravariant contravariant-extras - data-default-class dlist either hashable hashtables loch-th mtl - placeholders postgresql-binary postgresql-libpq profunctors - scientific semigroups text time transformers uuid vector - ]; - testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase rerebase - tasty tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ - base base-prelude bytestring contravariant contravariant-extras - criterion data-default-class deepseq dlist either hashable - profunctors scientific text time transformers uuid vector - ]; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_0_19_18" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bytestring + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, deepseq, dlist, either, hashable + , criterion, data-default-class, dlist, either, hashable , hashtables, loch-th, mtl, placeholders, postgresql-binary , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, time, transformers - , uuid, vector + , rebase, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, transformers, vector }: mkDerivation { pname = "hasql"; - version = "0.19.18"; - sha256 = "0k922mrj055rklb071z50m0y84wrfyivpm06k4fnxqwph728nzm6"; + version = "0.19.18.1"; + sha256 = "1cmr3l9gb639spqdw8if1da23qhlifr4jyxgfmy61l81mm42zjfb"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist either @@ -91273,18 +91222,13 @@ self: { postgresql-libpq profunctors semigroups text transformers vector ]; testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase rerebase - tasty tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ - base base-prelude bytestring contravariant contravariant-extras - criterion data-default-class deepseq dlist either hashable - profunctors scientific text time transformers uuid vector + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -91370,7 +91314,6 @@ 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 @@ -91414,7 +91357,6 @@ 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 @@ -91530,7 +91472,6 @@ 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 @@ -91594,10 +91535,12 @@ self: { }) {}; "haste-compiler" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, directory, filepath, ghc, ghc-paths - , ghc-prim, monads-tf, network, network-uri, process, random - , shellmate, transformers, utf8-string, websockets + ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder + , bytestring, bzlib, Cabal, containers, data-binary-ieee754 + , directory, either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple + , HTTP, monads-tf, mtl, network, network-uri, process, random + , shellmate, system-fileio, tar, terminfo, transformers, unix + , utf8-string, websockets }: mkDerivation { pname = "haste-compiler"; @@ -91606,11 +91549,18 @@ self: { configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 directory filepath ghc ghc-paths ghc-prim monads-tf network network-uri process random shellmate transformers utf8-string websockets ]; + executableHaskellDepends = [ + array base bin-package-db binary blaze-builder bytestring bzlib + Cabal containers directory either filepath ghc ghc-paths ghc-prim + ghc-simple HTTP mtl network network-uri process random shellmate + system-fileio tar terminfo transformers unix utf8-string + ]; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; @@ -91685,7 +91635,6 @@ self: { homepage = "http://bitbucket.org/sras/hastily"; description = "A program to download subtitle files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasty-hamiltonian" = callPackage @@ -91719,6 +91668,7 @@ self: { editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory old-locale old-time process random ]; @@ -91746,7 +91696,6 @@ self: { ]; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hath" = callPackage @@ -91878,6 +91827,7 @@ self: { sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base64-string bytestring clock containers gconf glade gtk hoauth HTTP json mtl network old-locale parsec regex-base @@ -91924,8 +91874,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "0.5.0.0"; - sha256 = "1s6idnlykwi16d9yikmbx3hc1blcvnvyx7pjwqh9n59sb64l1jfw"; + version = "0.5.1.0"; + sha256 = "09x84igm35d60rg97bcm1q9ivin01i5x64n3hl1j3ls62q28bm29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91936,12 +91886,12 @@ self: { executableHaskellDepends = [ base hashable time ]; testHaskellDepends = [ aeson base binary bytestring containers deepseq filepath hashable - HUnit test-framework test-framework-hunit text unordered-containers + HUnit test-framework test-framework-hunit text time + unordered-containers ]; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = "unknown"; }) {}; "haxl-amazonka" = callPackage @@ -91959,7 +91909,6 @@ self: { homepage = "http://github.com/tvh/haxl-amazonka#readme"; description = "Haxl data source for accessing AWS services through amazonka"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl-facebook" = callPackage @@ -92031,7 +91980,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -92116,6 +92064,7 @@ self: { sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo filepath glade gtk haskell98 process svgcairo time unix ]; @@ -92137,6 +92086,7 @@ self: { sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162"; revision = "2"; editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary boxes containers directory filepath gamma HUnit mtl mwc-random parsec pretty QuickCheck random split statistics @@ -92221,16 +92171,18 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "hblas" = callPackage - ({ mkDerivation, base, blas, hspec, liblapack, primitive - , storable-complex, vector + ({ mkDerivation, base, blas, HUnit, liblapack, primitive + , storable-complex, tasty, tasty-hunit, vector }: mkDerivation { pname = "hblas"; - version = "0.4.0.0"; - sha256 = "02kb6qk89sfs3hwq2xygisllpynnw5yn7z14pm6d22zxfmvidgcb"; + version = "0.3.2.1"; + sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y"; + revision = "2"; + editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; - testHaskellDepends = [ base hspec primitive vector ]; + testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; homepage = "http://github.com/wellposed/hblas/"; description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -92273,6 +92225,7 @@ self: { sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring chunked-data cond containers data-default-class directory dyre errors fast-logger filepath glib gtk3 lifted-async @@ -92302,6 +92255,7 @@ self: { sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring chunked-data containers directory filepath glib gtk3 hbro microlens monad-control @@ -92338,7 +92292,6 @@ self: { homepage = "https://www.bytelabs.org/project/haskell-bottom-up-rewrite-generator/"; description = "Haskell Bottom Up Rewrite Generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcc" = callPackage @@ -92362,6 +92315,7 @@ self: { pname = "hcg-minus"; version = "0.15"; sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base colour ]; homepage = "http://rd.slavepianos.org/t/hcg-minus"; description = "haskell cg (minus)"; @@ -92376,6 +92330,7 @@ self: { pname = "hcg-minus-cairo"; version = "0.15"; sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour filepath hcg-minus utf8-string ]; @@ -92390,6 +92345,7 @@ self: { pname = "hcheat"; version = "2010.1.16"; sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mps ]; homepage = "http://github.com/nfjinjing/hcheat/"; description = "A collection of code cheatsheet"; @@ -92461,6 +92417,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hcom" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "hcom"; + version = "0.0.0.2"; + sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq"; + doHaddock = false; + description = "Haskell COM support library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hcoord" = callPackage ({ mkDerivation, base, data-default, HUnit, ieee754, mtl , regex-pcre @@ -92507,6 +92475,7 @@ self: { sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory HaskellForMaths QuickCheck text ]; @@ -92533,22 +92502,6 @@ self: { }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage - ({ mkDerivation, base, bytestring, extensible-exceptions, filepath - , hsyslog, mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; - version = "0.5.3"; - sha256 = "06311jjqwxrhgis638p03nlziprawjmzpnvn8xpvh4gd8is4r251"; - libraryHaskellDepends = [ - base bytestring extensible-exceptions filepath hsyslog mtl unix - ]; - homepage = "http://github.com/greydot/hdaemonize"; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hdaemonize_0_5_4" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, filepath , hsyslog, mtl, unix }: @@ -92562,7 +92515,6 @@ self: { homepage = "http://github.com/greydot/hdaemonize"; description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdaemonize-buildfix" = callPackage @@ -92766,6 +92718,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hdevtools_0_1_6_0" = callPackage + ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc + , ghc-boot, ghc-paths, network, process, syb, time, transformers + , unix + }: + mkDerivation { + pname = "hdevtools"; + version = "0.1.6.0"; + sha256 = "0yp270sbz501vla87nhzv53ag0b64ny9gza6chr8mbjqkj86d5j5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths + network process syb time transformers unix + ]; + homepage = "https://github.com/hdevtools/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdf" = callPackage ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath , hosc, hsc3, murmur-hash, process, split, transformers @@ -92774,6 +92747,7 @@ self: { pname = "hdf"; version = "0.15"; sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash process split transformers @@ -92882,7 +92856,6 @@ self: { ]; description = "A Digital Ocean client in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdocs" = callPackage @@ -92892,8 +92865,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.2.0"; - sha256 = "144ap99ps0hicmndd0zk3ywbangjyrd9c7h90cxn5ikjp78h58xc"; + version = "0.5.2.1"; + sha256 = "1b8qrkfryyj8fg07vzl4cq4rwsbhlaqm5l477ld4mmgcgk4infi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92986,6 +92959,7 @@ self: { sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath haskeline time @@ -93016,26 +92990,27 @@ self: { }: mkDerivation { pname = "heaps"; - version = "0.3.4.1"; - sha256 = "1y9g3hkwxqy38js24954yprbhryv7bpa7xhxwv7fhnc4bc4nf9bw"; + version = "0.3.5"; + sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; + revision = "1"; + editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heapsort" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, QuickCheck }: mkDerivation { pname = "heapsort"; version = "0.1.0"; sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa"; isLibrary = true; isExecutable = true; - executableHaskellDepends = [ array base ]; + executableHaskellDepends = [ array base QuickCheck ]; homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort"; description = "Heapsort of MArrays as a demo of imperative programming"; license = stdenv.lib.licenses.bsd3; @@ -93084,6 +93059,7 @@ self: { pname = "hecc"; version = "0.4.1.1"; sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cereal crypto-api hF2 ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -93108,25 +93084,27 @@ 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 ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, directory, exceptions, mmorph, mtl - , pretty-show, primitive, random, resourcet, stm, template-haskell - , text, th-lift, time, transformers, transformers-base, unix - , wl-pprint-annotated + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, stm, template-haskell, text, th-lift, time + , transformers, transformers-base, unix, wl-pprint-annotated }: mkDerivation { pname = "hedgehog"; - version = "0.4.1"; - sha256 = "1zsfxls65pvfh57ig5lka3glw52f5h2pvnf7kk6aarasspyagx60"; + version = "0.5"; + sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk"; + revision = "1"; + editedCabalFile = "13079sdirdzch3r199lyxa7xrcq4xpaayxhdvg8v0d27w9z1chln"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers - directory exceptions mmorph mtl pretty-show primitive random - resourcet stm template-haskell text th-lift time transformers - transformers-base unix wl-pprint-annotated + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet stm template-haskell text + th-lift time transformers transformers-base unix + wl-pprint-annotated ]; testHaskellDepends = [ base containers pretty-show text transformers @@ -93134,7 +93112,18 @@ self: { homepage = "https://hedgehog.qa"; description = "Hedgehog will eat all your bugs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hedgehog-quickcheck" = callPackage + ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: + mkDerivation { + pname = "hedgehog-quickcheck"; + version = "0.1"; + sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; + libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; + homepage = "https://hedgehog.qa"; + description = "Use QuickCheck generators in Hedgehog and vice versa"; + license = stdenv.lib.licenses.bsd3; }) {}; "hedis" = callPackage @@ -93145,8 +93134,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.8"; - sha256 = "0qmfscq26f5n3a7xvc2ffg20gcg73y85w01s1vgpwpz55y62jbl2"; + version = "0.9.9"; + sha256 = "1va4lk0pjf3hcw4ap3s35c1slpbrb898g9x01az7g1xgwxq4y2jl"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -93322,8 +93311,8 @@ self: { pname = "heist"; version = "1.0.1.0"; sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx"; - revision = "4"; - editedCabalFile = "1swhqpm0sb6mvqgzy7cf8p7alvsy5qvcx1kdl5rnqq71vql5v4nn"; + revision = "6"; + editedCabalFile = "1r0gqv2y2sar3j4vwnvc6gsdbs9813gviiaa348j9jyc0j6dy4qw"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -93395,6 +93384,7 @@ self: { editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers mtl pretty QuickCheck ]; @@ -93473,6 +93463,7 @@ self: { sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath lvmlib mtl network parsec process Top transformers wl-pprint @@ -93635,7 +93626,6 @@ self: { homepage = "http://github.com/switchface/helm"; description = "A functionally reactive game engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "help-esb" = callPackage @@ -94132,6 +94122,7 @@ self: { sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base hscurses old-time random ]; executableSystemDepends = [ ncurses ]; homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/"; @@ -94164,6 +94155,7 @@ self: { sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cairo filepath haskell98 ]; @@ -94182,6 +94174,7 @@ self: { sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cairo dph-seq filepath haskell98 ]; @@ -94207,6 +94200,7 @@ self: { pname = "hexdump"; version = "0.1"; sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A library for forming hexdumps"; license = stdenv.lib.licenses.publicDomain; @@ -94238,6 +94232,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hexml-lens" = callPackage + ({ mkDerivation, base, bytestring, contravariant, doctest + , foundation, hexml, hspec, lens, profunctors, QuickCheck, text + , wreq + }: + mkDerivation { + pname = "hexml-lens"; + version = "0.2.1"; + sha256 = "0ss9riq7ppmqav4p38ckk479ggq7iy7xm0wsanr29ybg43vlx8xs"; + libraryHaskellDepends = [ + base bytestring contravariant foundation hexml lens profunctors + text + ]; + testHaskellDepends = [ + base bytestring doctest hexml hspec lens QuickCheck wreq + ]; + homepage = "https://github.com/pepeiborra/hexml-lens#readme"; + description = "Lenses for the hexml package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hexpat" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, expat, List , text, transformers, utf8-string @@ -94254,7 +94270,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "XML parser/formatter based on expat"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) expat;}; "hexpat-iteratee" = callPackage @@ -94290,7 +94305,6 @@ 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 @@ -94308,7 +94322,6 @@ self: { homepage = "http://code.haskell.org/hexpat-pickle/"; description = "XML picklers based on hexpat, source-code-similar to those of the HXT package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle-generic" = callPackage @@ -94338,7 +94351,6 @@ self: { libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpr" = callPackage @@ -94381,6 +94393,7 @@ self: { pname = "hexstring"; version = "0.11.1"; sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring text ]; @@ -94450,6 +94463,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ doublefann ]; libraryPkgconfigDepends = [ fann ]; + executableHaskellDepends = [ base ]; executableSystemDepends = [ doublefann ]; description = "Haskell binding to the FANN library"; license = stdenv.lib.licenses.bsd3; @@ -94483,6 +94497,7 @@ self: { sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base eprocess mtl ]; executableHaskellDepends = [ wx wxcore ]; homepage = "http://github.com/elbrujohalcon/hfiar"; @@ -94556,19 +94571,6 @@ self: { }) {}; "hformat" = callPackage - ({ mkDerivation, base, base-unicode-symbols, hspec, text }: - mkDerivation { - pname = "hformat"; - version = "0.1.0.1"; - sha256 = "034ds3bcmyri1zfnf2jbv0739mklp1m2pan3x3zg4f6kny8hv0v2"; - libraryHaskellDepends = [ base base-unicode-symbols text ]; - testHaskellDepends = [ base base-unicode-symbols hspec text ]; - homepage = "http://github.com/mvoidex/hformat"; - description = "Simple Haskell formatting"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hformat_0_3_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec , text }: @@ -94583,7 +94585,6 @@ self: { homepage = "http://github.com/mvoidex/hformat"; description = "Simple Haskell formatting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfov" = callPackage @@ -94621,13 +94622,13 @@ self: { "hfsevents" = callPackage ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl - , text + , text, unix }: mkDerivation { pname = "hfsevents"; version = "0.1.6"; sha256 = "019zbnvfd866ch49gax0c1c93zv92142saim1hrgypz5lprz7hvl"; - libraryHaskellDepends = [ base bytestring cereal mtl text ]; + libraryHaskellDepends = [ base bytestring cereal mtl text unix ]; librarySystemDepends = [ Cocoa ]; libraryToolDepends = [ CoreServices ]; homepage = "http://github.com/luite/hfsevents"; @@ -94803,6 +94804,7 @@ self: { pname = "hgeos"; version = "0.1.8.0"; sha256 = "14fqqabxnfky6x17508xr92dvd3jk6b53zqmy8h7f1dd4r7pm4z7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ geos_c ]; testHaskellDepends = [ base MissingH ]; @@ -94905,6 +94907,8 @@ self: { pname = "hgmp"; version = "0.1.0.1"; sha256 = "0fkcp3l34si7v286dza3yhw2bjpx6vpwqnkqnp9lv18jwxak7xji"; + revision = "1"; + editedCabalFile = "0fmzm7m0z1jzpi7c1k8gk843d9jqljrkrb25yzs1kpbrg0ylpi3c"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -94922,6 +94926,7 @@ self: { sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath mtl parsec wl-pprint ]; @@ -94957,6 +94962,7 @@ self: { homepage = "https://github.com/LukeHoersten/hgrev"; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrib" = callPackage @@ -94972,6 +94978,7 @@ self: { libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ grib_api ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec ]; homepage = "https://github.com/mjakob/hgrib"; description = "Unofficial bindings for GRIB API"; @@ -95056,6 +95063,7 @@ self: { sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers haskell98 HUnit mtl parsec random readline time @@ -95109,15 +95117,14 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; "hidden-char" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "hidden-char"; - version = "0.1.0.0"; - sha256 = "1dy9sxc9nl1qdcpvgqwv6m54ccbqk31p806gfhiv7whr95zqwpc0"; + version = "0.1.0.1"; + sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/rcook/hidden-char#readme"; @@ -95233,6 +95240,7 @@ self: { sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath mustache parsec process text unix ]; @@ -95241,7 +95249,6 @@ self: { homepage = "https://gitlab.com/gonz/hifi"; description = "WiFi connection script generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highWaterMark" = callPackage @@ -95252,6 +95259,7 @@ self: { sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ghc ]; homepage = "http://www.cs.mu.oz.au/~bjpop/code.html"; description = "Memory usage statistics"; @@ -95280,7 +95288,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 = stdenv.lib.platforms.none; }) {}; "higherorder" = callPackage @@ -95313,7 +95320,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Spec based JSON parsing/serialisation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highjson-swagger" = callPackage @@ -95333,7 +95339,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Derive swagger instances from highjson specs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highjson-th" = callPackage @@ -95355,7 +95360,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Template Haskell helpers for highjson specs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highlight" = callPackage @@ -95419,13 +95423,16 @@ self: { libraryHaskellDepends = [ base blaze-html bytestring filepath mtl pcre-light text ]; + executableHaskellDepends = [ + base blaze-html bytestring filepath mtl pcre-light text + ]; description = "source code highlighting"; license = stdenv.lib.licenses.bsd3; }) {}; "highlighter2" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers, filepath - , mtl, pcre-light, text + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , containers, filepath, mtl, pcre-light, text }: mkDerivation { pname = "highlighter2"; @@ -95436,6 +95443,10 @@ self: { libraryHaskellDepends = [ base blaze-html bytestring containers filepath mtl pcre-light text ]; + executableHaskellDepends = [ + base blaze-html blaze-markup bytestring containers filepath mtl + pcre-light text + ]; description = "source code highlighting"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95456,6 +95467,7 @@ self: { base blaze-html bytestring containers mtl parsec pcre-light utf8-string ]; + executableHaskellDepends = [ base blaze-html containers filepath ]; testHaskellDepends = [ base blaze-html containers Diff directory filepath process ]; @@ -95470,8 +95482,8 @@ self: { }: mkDerivation { pname = "hills"; - version = "0.1.2.5"; - sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz"; + version = "0.1.2.6"; + sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95560,6 +95572,7 @@ self: { sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions haskell-src-exts monad-loops mtl text transformers utf8-string yaml @@ -95650,6 +95663,7 @@ self: { pname = "hinduce-examples"; version = "0.0.0.2"; sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers convertible csv hinduce-associations-apriori hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh @@ -95743,25 +95757,6 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-paths, HUnit, mtl, random, unix - }: - mkDerivation { - pname = "hint"; - version = "0.6.0"; - sha256 = "1f8s8a2a8wgamfvq0pj4ivzc9ywkx86d2milr5djc0wfvq73lgfw"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-paths mtl random unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit - ]; - homepage = "https://github.com/mvdan/hint"; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hint_0_7_0" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions , filepath, ghc, ghc-paths, HUnit, mtl, random, unix }: @@ -95769,6 +95764,8 @@ self: { pname = "hint"; version = "0.7.0"; sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9"; + revision = "1"; + editedCabalFile = "07afndz6accq6g4d90xhvjh84ybhbffk5xl1qb3jrymf9vj5ad50"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-paths mtl random unix ]; @@ -95778,7 +95775,6 @@ self: { homepage = "https://github.com/mvdan/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -95788,6 +95784,7 @@ self: { pname = "hint-server"; version = "1.4.3"; sha256 = "1pgz8m5aad8wx9ahnaxawry25rksfn2rnmm6l55ha5pj7zb7zjzy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base eprocess exceptions hint monad-loops mtl ]; @@ -95820,7 +95817,6 @@ self: { homepage = "https://github.com/LTI2000/hinterface"; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -95831,6 +95827,7 @@ self: { sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 random ]; homepage = "http://www.cs.mu.oz.au/~bjpop/code.html"; description = "Space Invaders"; @@ -95872,7 +95869,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 @@ -95917,6 +95913,7 @@ self: { ]; description = "Hipchat API bindings in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hipe" = callPackage @@ -96193,6 +96190,7 @@ self: { sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base byteable bytestring containers cryptohash hourglass mtl parsec patience random system-fileio system-filepath @@ -96262,6 +96260,7 @@ self: { sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory mtl parsec regex-compat ]; @@ -96316,27 +96315,6 @@ self: { }) {}; "hjsonpointer" = callPackage - ({ mkDerivation, aeson, base, hashable, hspec, http-types - , QuickCheck, semigroups, text, unordered-containers, vector - }: - mkDerivation { - pname = "hjsonpointer"; - version = "1.1.1"; - sha256 = "0pqdhi36xb4sj25kgrn77rnawg6bzk6snslwyr8nfgfg43j0vcg3"; - 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_2_0" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: @@ -96357,37 +96335,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.5.0.1"; - sha256 = "18w8wb87hx5vw7vd9bk7d1qxqn3smhbhynj49gx507326a7mrh8s"; - 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_6_3" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -96412,7 +96362,23 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hjugement" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "hjugement"; + version = "1.0.0.20170808"; + sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-hunit tasty-quickcheck text + transformers + ]; + description = "Majority Judgment"; + license = stdenv.lib.licenses.gpl3; }) {}; "hkdf" = callPackage @@ -96430,8 +96396,8 @@ self: { "hlatex" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers, derive - , directory, filepath, mtl, process, template-haskell, transformers - , uniplate, utf8-string + , directory, filepath, frquotes, mtl, process, template-haskell + , transformers, uniplate, utf8-string }: mkDerivation { pname = "hlatex"; @@ -96443,6 +96409,9 @@ self: { base base-unicode-symbols containers derive directory filepath mtl process template-haskell transformers uniplate utf8-string ]; + executableHaskellDepends = [ + base base-unicode-symbols containers frquotes mtl transformers + ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96478,6 +96447,7 @@ self: { sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring haskell98 parallel ]; @@ -96530,6 +96500,7 @@ self: { sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv data-default directory file-embed filepath hashable haskeline here @@ -96576,6 +96547,7 @@ self: { sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers Decimal docopt either hledger hledger-lib microlens microlens-platform safe servant-server @@ -96584,7 +96556,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 @@ -96611,8 +96582,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.9"; - sha256 = "0ajjiz6jvm45j472f0ypxk33hc47rg0zs9ylkcrkvvk9992x7lnq"; + version = "0.2.0.10"; + sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -96624,22 +96595,22 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free - , hledger-lib, hspec, megaparsec, microlens, optparse-applicative - , QuickCheck, text, text-format, text-zipper, time, transformers - , unordered-containers, vector, vty, xdg-basedir + , hledger-lib, hspec, megaparsec, microlens, microlens-th + , optparse-applicative, QuickCheck, semigroups, text, text-format + , text-zipper, time, transformers, unordered-containers, vector + , vty, xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.2"; - sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a"; - revision = "2"; - editedCabalFile = "0yhc50km7jfhdynvyvqyqi2jwpy554kwz1l9fsvklf2scfv4c3k5"; + version = "1.2.5"; + sha256 = "1va5a1j4pa6yvzhk0y4pxs0q80ph3yr8jdbgy422mkvbmczxynna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec - microlens optparse-applicative text text-format text-zipper time - transformers unordered-containers vector vty xdg-basedir + microlens microlens-th optparse-applicative semigroups text + text-format text-zipper time transformers unordered-containers + vector vty xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens @@ -96664,6 +96635,7 @@ self: { sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base Cabal Decimal hledger-lib mtl text time ]; @@ -96688,7 +96660,6 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -96704,6 +96675,7 @@ self: { pname = "hledger-lib"; version = "1.3"; sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory @@ -96734,8 +96706,11 @@ self: { pname = "hledger-ui"; version = "1.3"; sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj"; + revision = "1"; + editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal async base base-compat brick cmdargs containers data-default directory filepath fsnotify hledger hledger-lib HUnit @@ -96782,6 +96757,7 @@ self: { sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin @@ -96873,8 +96849,8 @@ self: { ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.6.0"; - sha256 = "1plw99ri6xnrjdgrbmwzrw0hdr2m0f38zwr6yagigqfq2b72d21x"; + version = "0.1.6.1"; + sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy"; configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; @@ -96887,28 +96863,6 @@ self: { }) {inherit (pkgs) libsass;}; "hlint" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, hscolour, process - , refact, transformers, uniplate - }: - mkDerivation { - pname = "hlint"; - version = "1.9.41"; - sha256 = "1d1z14gfls87jgq0bm67aq81xmczhlbzjym60qplpx1ajpvrk4id"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts hscolour process refact transformers - uniplate - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hlint_2_0_9" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, directory, extra, filepath, haskell-src-exts , hscolour, process, refact, text, transformers, uniplate @@ -96920,6 +96874,7 @@ self: { sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base bytestring cmdargs containers cpphs directory extra filepath haskell-src-exts hscolour process refact text @@ -96929,7 +96884,6 @@ self: { homepage = "https://github.com/ndmitchell/hlint#readme"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlogger" = callPackage @@ -96969,6 +96923,7 @@ self: { pname = "hls"; version = "0.15"; sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers hcg-minus hps ]; homepage = "http://rd.slavepianos.org/t/hls"; description = "Haskell Lindenmayer Systems"; @@ -96986,6 +96941,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm transformers unix X11 ]; + executableHaskellDepends = [ base stm transformers unix X11 ]; homepage = "https://github.com/hpdeifel/hlwm-haskell"; description = "Bindings to the herbstluftwm window manager"; license = stdenv.lib.licenses.bsd2; @@ -96998,6 +96954,7 @@ self: { pname = "hly"; version = "0.15"; sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hmt process ]; homepage = "http://rd.slavepianos.org/t/hly"; description = "Haskell LilyPond"; @@ -97059,6 +97016,27 @@ self: { 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 + }: + mkDerivation { + pname = "hmatrix"; + version = "0.18.1.0"; + sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c"; + configureFlags = [ "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random split storable-complex + vector + ]; + librarySystemDepends = [ openblasCompat ]; + preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'"; + 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 ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -97096,7 +97074,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -97197,7 +97174,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-special" = callPackage @@ -97244,7 +97220,6 @@ self: { homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-syntax" = callPackage @@ -97280,7 +97255,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -97310,6 +97284,7 @@ self: { sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring bytestring-lexing delimited-text gnuplot hmatrix hmeap hosc hsc3 parsec @@ -97444,8 +97419,9 @@ self: { ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; - version = "0.4.2.1"; - sha256 = "048amh4w9vjrihahhb3rw0gbk3yp7qvjf6vcp9c5pq2kc3n7vcnc"; + version = "0.4.3"; + sha256 = "09q4gmj2gr3krh7vpkc8xwiy874d7mr6v57hv2i3n481yhky0yir"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; homepage = "https://github.com/michalkonecny/hmpfr"; @@ -97463,6 +97439,7 @@ self: { pname = "hmt"; version = "0.15"; sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring colour containers data-ordlist directory filepath lazy-csv logict multiset-comb parsec permutation primes @@ -97481,6 +97458,7 @@ self: { pname = "hmt-diagrams"; version = "0.15"; sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour filepath hcg-minus hcg-minus-cairo hmt html-minimalist process xml @@ -97521,6 +97499,7 @@ self: { sha256 = "15fpn895r2sa6n8pahv2frcp6qkxbpmam7hd03y4i65jhkf9vskh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers either errors filepath repa transformers vector ]; @@ -97674,42 +97653,27 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , text, unordered-containers + ({ 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 = "0.5.7"; - sha256 = "1v5rx50hcnaqnvyg3n671sf7vhbn8jmzay9lxd5pq85qf15nw6bv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-conduit http-types text - unordered-containers - ]; - homepage = "https://github.com/freizl/hoauth2"; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit - , http-types, microlens, text, unordered-containers, uri-bytestring - }: - mkDerivation { - pname = "hoauth2"; - version = "1.2.0"; - sha256 = "19f8r0dhm4kmzwfv9zsj2cfqpkkn68ncaxqp2kcz3cvr5habryay"; + version = "1.3.0"; + sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-conduit http-types text + uri-bytestring wai warp ]; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -97723,6 +97687,7 @@ self: { sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk-largeTreeStore gtk3 gtksourceview3 mtl pango system-filepath text transformers vector @@ -97917,6 +97882,7 @@ self: { sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base hogre ]; executableSystemDepends = [ OgreMain ]; homepage = "http://github.com/anttisalonen/hogre-examples"; @@ -98013,6 +97979,7 @@ self: { sha256 = "05181blw3y9j2715rdm49y6mfcpgyihb6yjswhp231kr6x40zxmh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring directory filepath hastache http-conduit lens lens-aeson process random split syb text time @@ -98227,6 +98194,7 @@ self: { sha256 = "1rhxmiqwmzmnaqw7qj77k9y8svyy0gknpn8di7q5r9w1bdl807q5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cmdargs configurator containers directory filepath hoodle-core mtl @@ -98270,6 +98238,7 @@ self: { pname = "hoodle-core"; version = "0.16.0"; sha256 = "1v1y99x5rbkn85f91pdw19jfccwhcyfklg1qli0d7lq2c6aak4ka"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary bytestring cairo cereal configurator containers coroutine-object @@ -98408,10 +98377,11 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.12"; - sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx"; + version = "5.0.13"; + sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath @@ -98594,11 +98564,14 @@ self: { }) {}; "hopenssl" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, openssl }: + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , HUnit, openssl + }: mkDerivation { pname = "hopenssl"; - version = "2.2"; - sha256 = "0hypc779yyrf3kgb9ik396zwf83d05x2gvrzr1nhv55pr8m0kvax"; + version = "2.2.1"; + sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base doctest HUnit ]; @@ -98675,7 +98648,6 @@ self: { homepage = "https://github.com/ananthakumaran/hopfli"; description = "Bidings to Google's Zopfli compression library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoppy-docs" = callPackage @@ -98732,6 +98704,7 @@ self: { pname = "hoppy-std"; version = "0.3.0"; sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator ]; @@ -98753,6 +98726,7 @@ self: { sha256 = "16a1ygxv4isw5wiq5dhjn4xdlr67zy1ngn61mwilgwkvwj0cjxc3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base bytestring conduit conduit-extra containers deepseq directory filepath http-conduit @@ -98771,7 +98745,6 @@ self: { homepage = "http://akc.is/hops"; description = "Handy Operations on Power Series"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoq" = callPackage @@ -98784,6 +98757,7 @@ self: { sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bifunctors bytestring filepath mtl pretty readline void ]; @@ -98811,7 +98785,6 @@ self: { homepage = "https://github.com/ciez/hora"; description = "date time"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "horizon" = callPackage @@ -98846,6 +98819,7 @@ self: { homepage = "https://github.com/cocreature/horname#readme"; description = "Rename function definitions returned by SMT solvers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc" = callPackage @@ -98857,6 +98831,7 @@ self: { pname = "hosc"; version = "0.15"; sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-builder bytestring data-binary-ieee754 network time transformers @@ -98879,6 +98854,7 @@ self: { pname = "hosc-json"; version = "0.15"; sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring hosc json text unordered-containers utf8-string vector @@ -98899,6 +98875,7 @@ self: { sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cgi haskeline hosc hosc-json hsc3 json text transformers utf8-string websockets www-minus @@ -99116,6 +99093,7 @@ self: { sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring cairo containers directory filepath glade glib gtk gtkglext hp2any-core hp2any-graph OpenGL time @@ -99134,6 +99112,7 @@ self: { sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers filepath ]; description = "A tool for converting GHC heap-profiles to HTML"; license = stdenv.lib.licenses.bsd3; @@ -99158,37 +99137,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack_0_17_1" = 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.17.1"; - sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , containers, deepseq, directory, filepath, Glob, hspec @@ -99249,7 +99197,6 @@ 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 @@ -99301,6 +99248,7 @@ self: { sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Cabal cabal-macosx containers directory eprocess filepath FindBin haskell-src-exts hint hint-server monad-loops mtl @@ -99394,7 +99342,6 @@ self: { ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc_0_6_0_3" = callPackage @@ -99403,6 +99350,8 @@ self: { pname = "hpc"; version = "0.6.0.3"; sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn"; + revision = "1"; + editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i"; libraryHaskellDepends = [ base containers directory filepath time ]; @@ -99435,7 +99384,6 @@ self: { homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -99476,6 +99424,7 @@ self: { pname = "hpdft"; version = "0.1.0.4"; sha256 = "1rxr2qfs6cvk0hyvvq7w0jsq8vjf8b84ay5jzfhqyk8qk73ppfji"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers directory file-embed parsec text utf8-string zlib @@ -99557,6 +99506,7 @@ self: { sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath process ]; description = "Application for managing playlist files on a music player"; license = "GPL"; @@ -99590,8 +99540,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.4.0"; - sha256 = "0pcz89zw3asc1vm0w6f6qk6y6bvqnsr3wailzx89ym60minkx4h5"; + version = "0.4.1"; + sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99637,22 +99587,22 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base, log - , monad-control, mtl, safe, tasty, tasty-hunit, text, text-show - , transformers + , cryptohash, exceptions, fields-json, hpqtypes, lifted-base + , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text + , text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.3.0.0"; - sha256 = "10n97i18g94j8xc7zayp03a3b59kzjyhxs1kg06cy1npgbn8kvlz"; + version = "1.3.1.1"; + sha256 = "01ckscym6lgb6k63n6g0q9972imabv4kncsxr2h37xkahfyh68hk"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log monad-control mtl safe text - text-show + fields-json hpqtypes lifted-base log-base monad-control mtl safe + text text-show ]; testHaskellDepends = [ - base exceptions hpqtypes lifted-base log tasty tasty-hunit text - transformers + base exceptions hpqtypes lifted-base log-base monad-control tasty + tasty-hunit text transformers ]; homepage = "https://github.com/scrive/hpqtypes-extras"; description = "Extra utilities for hpqtypes library"; @@ -99667,10 +99617,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.0"; - sha256 = "0wrgdz6a2k64kgsp8qfpjpw4wywicjq50bvsr8i1mw11lkwysjkf"; - revision = "1"; - editedCabalFile = "1xfm12nlwyd6gd6b2c4zqjfxlqdsddg4qpy3dw08wlx42jvymrl9"; + version = "2.4.3"; + sha256 = "1qdk5s1dv3v9pvf8hrr2cwgqsvk7pfiy1k3vvdqcv5cfnknqx0y1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99722,14 +99670,18 @@ self: { }) {}; "hps" = callPackage - ({ mkDerivation, base, hcg-minus }: + ({ mkDerivation, base, directory, filepath, hcg-minus, random }: mkDerivation { pname = "hps"; version = "0.15"; sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hcg-minus ]; + executableHaskellDepends = [ + base directory filepath hcg-minus random + ]; homepage = "http://rd.slavepianos.org/?t=hps"; description = "Haskell Postscript"; license = "GPL"; @@ -99743,6 +99695,7 @@ self: { sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk hps ]; executableHaskellDepends = [ base cairo gtk hps random ]; homepage = "http://slavepianos.org/rd/?t=hps-cairo"; @@ -99784,6 +99737,7 @@ self: { pname = "hpygments"; version = "0.2.0"; sha256 = "0f1cvkslvijlx8qlsc1vkv240ir30w4wq6h4pndzsqdj2y95ricj"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring process process-extras ]; @@ -99836,6 +99790,8 @@ self: { pname = "hquantlib"; version = "0.0.4.0"; sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp"; + revision = "1"; + editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99871,6 +99827,7 @@ self: { ]; description = "A query language for transforming HTML5"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hranker" = callPackage @@ -99919,7 +99876,6 @@ self: { homepage = "http://github.com/dredozubov/hreader-lens"; description = "Optics for hreader package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hricket" = callPackage @@ -99967,8 +99923,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.4.3"; - sha256 = "1k7rmjdbgxsh8fp77mywhpdd5i10q1c6w58g5aqi5bpy1zi6izm1"; + version = "0.3.4.4"; + sha256 = "08997g32rnmwznzywf1k0bmki0kbcwss9s4lka6s501l54gp1ij9"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -99979,7 +99935,6 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -99993,7 +99948,6 @@ self: { homepage = "http://github.com/ozataman/hs-GeoIP"; description = "Haskell bindings to the MaxMind GeoIPCity database via the C library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {GeoIP = null;}; "hs-bibutils" = callPackage @@ -100153,7 +100107,6 @@ self: { homepage = "https://github.com/myfreeweb/hs-duktape"; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-excelx" = callPackage @@ -100191,6 +100144,7 @@ self: { pname = "hs-fltk"; version = "0.2.5"; sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fltk fltk_images ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/"; @@ -100205,6 +100159,7 @@ self: { pname = "hs-gchart"; version = "0.4.1"; sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; homepage = "http://github.com/deepakjois/hs-gchart"; description = "Haskell wrapper for the Google Chart API"; @@ -100306,6 +100261,7 @@ self: { sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs colour containers diagrams-core diagrams-lib diagrams-svg mtl parsec parsec-numbers random @@ -100390,6 +100346,7 @@ self: { sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base MonadPrompt mtl random ]; executableHaskellDepends = [ array base directory glib gtk MonadPrompt mtl random @@ -100423,7 +100380,6 @@ self: { homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-pkpass" = callPackage @@ -100498,7 +100454,8 @@ self: { }) {}; "hs-server-starter" = callPackage - ({ mkDerivation, base, directory, HUnit, network, temporary, unix + ({ mkDerivation, base, directory, http-types, HUnit, network + , temporary, unix, wai, warp }: mkDerivation { pname = "hs-server-starter"; @@ -100507,12 +100464,30 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; + executableHaskellDepends = [ base http-types network wai warp ]; testHaskellDepends = [ base HUnit network temporary unix ]; homepage = "https://github.com/hiratara/hs-server-starter"; description = "Write a server supporting Server::Starter's protocol in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; + "hs-snowtify" = callPackage + ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle + }: + mkDerivation { + pname = "hs-snowtify"; + version = "0.1.0.0"; + sha256 = "124n8n6h1qrn359a9bhdxz4was9pc3n2d8r8zqvxaa2xqywjwfvf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base either safe safe-exceptions text turtle + ]; + homepage = "https://github.com/aiya000/hs-snowtify#README.md"; + description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -100537,6 +100512,7 @@ self: { sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base HTTP json mtl network pretty ]; homepage = "https://github.com/deepakjois/hs-twitterarchiver"; description = "Commandline Twitter feed archiver"; @@ -100613,6 +100589,7 @@ self: { sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory filepath haskell-src mtl ]; @@ -100674,6 +100651,7 @@ self: { pname = "hsSqlite3"; version = "0.1"; sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-sqlite3 bytestring mtl utf8-string ]; @@ -100726,6 +100704,7 @@ self: { sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base Hclip HTTP process unix ]; description = "(ab)Use Google Translate as a speech synthesiser"; license = stdenv.lib.licenses.gpl3; @@ -100855,12 +100834,12 @@ self: { sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath process ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3" = callPackage @@ -100872,6 +100851,7 @@ self: { pname = "hsc3"; version = "0.15.1"; sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers data-default data-ordlist directory filepath hashable hosc network process random safe split @@ -100889,6 +100869,7 @@ self: { pname = "hsc3-auditor"; version = "0.15"; sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath hmt hosc hsc3 hsc3-sf-hsndfile ]; @@ -100903,6 +100884,7 @@ self: { pname = "hsc3-cairo"; version = "0.14"; sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ]; homepage = "http://rd.slavepianos.org/?t=hsc3-cairo"; description = "haskell supercollider cairo drawing"; @@ -100918,6 +100900,7 @@ self: { pname = "hsc3-data"; version = "0.15"; sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot hsc3-sf-hsndfile safe split SVGPath xml @@ -100934,6 +100917,7 @@ self: { pname = "hsc3-db"; version = "0.15"; sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hsc3 safe ]; homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; @@ -100946,6 +100930,7 @@ self: { pname = "hsc3-dot"; version = "0.15"; sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hsc3 process ]; homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; @@ -100962,6 +100947,7 @@ self: { sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath hashable hosc hsc3 hsc3-db hsc3-dot mtl unix @@ -100974,9 +100960,10 @@ self: { "hsc3-graphs" = callPackage ({ mkDerivation, array, base, binary, bytestring, cairo, containers - , data-default, directory, filepath, hls, hmt, hosc, hps, hsc3 - , hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils, hsharc - , MonadRandom, primes, random, random-shuffle, sc3-rdu, she, split + , data-default, directory, filepath, hashable, hls, hmt, hosc, hps + , hsc3, hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils + , hsharc, MonadRandom, primes, process, random, random-shuffle + , sc3-rdu, she, split }: mkDerivation { pname = "hsc3-graphs"; @@ -100984,13 +100971,19 @@ self: { sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring cairo containers data-default directory filepath hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random random-shuffle sc3-rdu she split ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + array base binary bytestring cairo containers directory filepath + hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf + hsc3-unsafe hsharc MonadRandom primes process random random-shuffle + sc3-rdu split + ]; homepage = "http://rd.slavepianos.org/t/hsc3-graphs"; description = "Haskell SuperCollider Graphs"; license = "GPL"; @@ -101007,6 +101000,7 @@ self: { pname = "hsc3-lang"; version = "0.15"; sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bifunctors bytestring containers data-default data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom @@ -101028,6 +101022,7 @@ self: { sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath hashable hosc hsc3 hsc3-dot husk-scheme mtl safe unix @@ -101046,6 +101041,7 @@ self: { pname = "hsc3-plot"; version = "0.15"; sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hosc hsc3 hsc3-lang process split statistics vector @@ -101071,6 +101067,7 @@ self: { base bytestring containers data-default directory filepath hosc hsc3 process time time-compat transformers ]; + executableHaskellDepends = [ base data-default hosc hsc3 ]; homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; @@ -101082,6 +101079,7 @@ self: { pname = "hsc3-rec"; version = "0.14.1"; sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hsc3 ]; homepage = "http://rd.slavepianos.org/?t=hsc3-rec"; description = "Haskell SuperCollider Record Variants"; @@ -101097,6 +101095,7 @@ self: { pname = "hsc3-rw"; version = "0.15"; sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory haskell-src-exts parsec polyparse split syb transformers @@ -101112,7 +101111,7 @@ self: { , failure, hashtables, hosc, hsc3, hsc3-process, lifted-base , ListZipper, monad-control, QuickCheck, random, resourcet , test-framework, test-framework-quickcheck2, transformers - , transformers-base + , transformers-base, unix }: mkDerivation { pname = "hsc3-server"; @@ -101125,6 +101124,9 @@ self: { hosc hsc3 hsc3-process lifted-base ListZipper monad-control resourcet transformers transformers-base ]; + executableHaskellDepends = [ + base hosc hsc3 random transformers unix + ]; testHaskellDepends = [ base failure QuickCheck random test-framework test-framework-quickcheck2 transformers @@ -101141,6 +101143,7 @@ self: { pname = "hsc3-sf"; version = "0.15"; sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring hosc ]; homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; @@ -101155,6 +101158,7 @@ self: { pname = "hsc3-sf-hsndfile"; version = "0.15"; sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base hsc3-sf hsndfile hsndfile-vector vector ]; @@ -101169,6 +101173,7 @@ self: { pname = "hsc3-unsafe"; version = "0.14"; sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hsc3 ]; homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe"; description = "Unsafe Haskell SuperCollider"; @@ -101186,6 +101191,7 @@ self: { sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath hashable hosc hsc3 hsc3-sf ]; @@ -101298,6 +101304,7 @@ self: { sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; homepage = "http://code.haskell.org/~malcolm/hscolour/"; @@ -101372,6 +101379,7 @@ self: { sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj"; revision = "1"; editedCabalFile = "0a65hmlhd668r8y7qcjsdy4fgs46j8rr9jbjryjddkma6r02jpqq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions mtl old-locale old-time unix ]; @@ -101408,8 +101416,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.2.5.0"; - sha256 = "12x26y11xd5h0j3s2j3pvfjak6mbdc417brhx6zva9k1x4lijagm"; + version = "0.2.5.1"; + sha256 = "15rr12mric0gm4xfskwsqh89kdiqxzvg47nkddbyr7hah1rjmcn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101435,7 +101443,6 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -101444,6 +101451,7 @@ self: { pname = "hsdif"; version = "0.14"; sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring hosc ]; homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; @@ -101459,6 +101467,7 @@ self: { sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers HUnit parsec ]; homepage = "http://neugierig.org/software/darcs/hsdip/"; description = "hsdip - a Diplomacy parser/renderer"; @@ -101476,6 +101485,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; + executableHaskellDepends = [ base network ]; homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; @@ -101547,6 +101557,7 @@ self: { pname = "hsemail-ns"; version = "1.3.2"; sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl old-time parsec ]; homepage = "http://patch-tag.com/r/hsemail-ns/home"; description = "Internet Message Parsers"; @@ -101565,6 +101576,7 @@ self: { sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Cabal directory file-embed filepath http-streams io-streams mtl process safe split unix @@ -101608,8 +101620,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.1"; - sha256 = "029zlchaijhv5rmd0llmqp1wpaskjfp8alhqh0bisz4sjgk2qw1p"; + version = "0.6.1.2"; + sha256 = "1i6h4gpjlrb9jadm52ygs9i1430lik2kljv86bpq6wz9zmq25d0s"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -101699,6 +101711,7 @@ self: { pname = "hsgsom"; version = "0.2.0"; sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers random stm time ]; description = "An implementation of the GSOM clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -101780,8 +101793,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.3"; - sha256 = "1hfhni85518hqvq3gzllc2mj83z1fwqlsfh2ida5pn8lg2j9ix2b"; + version = "0.8.4"; + sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101794,7 +101807,6 @@ self: { ]; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -101815,20 +101827,6 @@ self: { }) {}; "hsinstall" = callPackage - ({ mkDerivation, base, directory, filepath }: - mkDerivation { - pname = "hsinstall"; - version = "1.5"; - sha256 = "070sbjcb7vdl0dxx5jv1q1aiihb5q5malrdmxb6dcs0gc01qp13p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - description = "Install Haskell software"; - license = stdenv.lib.licenses.isc; - }) {}; - - "hsinstall_1_6" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { pname = "hsinstall"; @@ -101836,11 +101834,11 @@ self: { sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ base directory filepath ]; description = "Install Haskell software"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hskeleton" = callPackage @@ -101878,6 +101876,7 @@ self: { pname = "hslibsvm"; version = "2.89.0.1"; sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ svm ]; description = "A FFI binding to libsvm"; @@ -101902,7 +101901,7 @@ self: { }) {}; "hslogger" = callPackage - ({ mkDerivation, base, containers, directory, mtl, network + ({ mkDerivation, base, containers, directory, HUnit, mtl, network , old-locale, process, time, unix }: mkDerivation { @@ -101912,6 +101911,7 @@ self: { libraryHaskellDepends = [ base containers directory mtl network old-locale process time unix ]; + testHaskellDepends = [ base HUnit ]; homepage = "http://software.complete.org/hslogger"; description = "Versatile logging framework"; license = stdenv.lib.licenses.bsd3; @@ -101923,8 +101923,8 @@ self: { }: mkDerivation { pname = "hslogger-reader"; - version = "1.0.2"; - sha256 = "0kr07kw18ydn3l22dis7nfym4x5gi909riv2vs6s63szyghmj5dl"; + version = "1.0.3"; + sha256 = "18yvks9v8z27jjrfwmczrnhkpx9q33v2l6vfwisrx4a7sv7mc0fp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base hslogger text time ]; @@ -101946,7 +101946,6 @@ self: { libraryHaskellDepends = [ base hslogger mtl template-haskell ]; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger4j" = callPackage @@ -102009,20 +102008,23 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_5_0" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit - , lua5_1, QuickCheck, quickcheck-instances, text + "hslua_0_8_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, fail + , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.5.0"; - sha256 = "06qp857wicgyl6k0mm4d0vfg5gi56yvx00377r26l176rha0l9vb"; + version = "0.8.0"; + sha256 = "0zl7znhbwnqcdvy9v18x3ch8vxk719k5lx55nr65996wb193nwmc"; configureFlags = [ "-fsystem-lua" ]; - libraryHaskellDepends = [ base bytestring ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; librarySystemDepends = [ lua5_1 ]; testHaskellDepends = [ - base bytestring hspec hspec-contrib HUnit QuickCheck - quickcheck-instances text + 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; @@ -102051,6 +102053,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-aeson_0_3_0" = callPackage + ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit + , ieee754, QuickCheck, quickcheck-instances, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "0.3.0"; + sha256 = "1vsgncxxdwachbqp7pbckij94621zccz001hs774asvyc12anp38"; + 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 = "Allow aeson data types to be used with lua"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 @@ -102060,6 +102085,7 @@ self: { pname = "hsmagick"; version = "0.5"; sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory filepath pretty process ]; @@ -102157,6 +102183,7 @@ self: { sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base parsec readline ]; executableHaskellDepends = [ base parsec readline ]; testHaskellDepends = [ @@ -102224,6 +102251,7 @@ self: { sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base mtl network old-time random ]; executableHaskellDepends = [ unix ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/"; @@ -102333,7 +102361,6 @@ self: { homepage = "http://www.jasani.org/search/label/hsparklines"; description = "Sparklines for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsparql" = callPackage @@ -102343,8 +102370,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.3"; - sha256 = "08a24py8scbshrs1j0x5d6n1lsw1sxyp90wvvsscndnqsy60wcnl"; + version = "0.3.5"; + sha256 = "0557c81wgk930x2bq72f2f3kycanxxvk1s5nrfxn56lmgijzkkqz"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -102377,29 +102404,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, call-stack, directory, hspec-core - , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck - , stringbuilder, transformers - }: - mkDerivation { - pname = "hspec"; - version = "2.4.3"; - sha256 = "0dvfmzys2vcgaghmqdmq91j416vn556scdyx96gy0q8l8ziqhwrs"; - 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; - }) {}; - - "hspec_2_4_4" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers @@ -102420,7 +102424,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -102460,6 +102463,8 @@ self: { pname = "hspec-contrib"; version = "0.4.0"; sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg"; + revision = "1"; + editedCabalFile = "07p0pckzyih1zc56v2cnchxjsbx4w69b10j343c0yvicq6yjyrkb"; libraryHaskellDepends = [ base hspec-core HUnit ]; testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; homepage = "http://hspec.github.io/"; @@ -102468,34 +102473,6 @@ self: { }) {}; "hspec-core" = 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.3"; - sha256 = "0mg1144azwhrvk6224qnn7gbjyqlpq4kbxqns0hh4gwvg4s6z7bw"; - revision = "1"; - editedCabalFile = "0shqhsss67lhp2kn7spjn9ngfhlf6cnsrn66s6h1wk4f9k24lf5v"; - 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 - ]; - homepage = "http://hspec.github.io/"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_4_4" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, call-stack , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -102519,26 +102496,9 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta }: - mkDerivation { - pname = "hspec-discover"; - version = "2.4.3"; - sha256 = "0kmld0l61xr3qyjx2b2c61n5w1axy53ybbxnvhh404yxj747agda"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath hspec-meta ]; - homepage = "http://hspec.github.io/"; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_4_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; @@ -102552,7 +102512,6 @@ self: { 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 @@ -102594,7 +102553,6 @@ self: { libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-pretty" = callPackage @@ -102664,7 +102622,6 @@ self: { homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; description = "Use tests to monitor changes in Aeson serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-hashable" = callPackage @@ -102742,25 +102699,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-megaparsec_1_0_0" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "1.0.0"; + sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; + 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 - ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq - , directory, filepath, hspec-expectations, HUnit, QuickCheck - , quickcheck-io, random, setenv, time, transformers + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, HUnit + , QuickCheck, quickcheck-io, random, setenv, time, transformers }: mkDerivation { pname = "hspec-meta"; - version = "2.3.2"; - sha256 = "12waaw3g8v5cm4s6vrcld31k235ns2j0an9lxz6zshzl68zvmcar"; + version = "2.4.4"; + sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal async base call-stack deepseq hspec-expectations - HUnit QuickCheck quickcheck-io random setenv time transformers + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers ]; executableHaskellDepends = [ - ansi-terminal async base call-stack deepseq directory filepath - hspec-expectations HUnit QuickCheck quickcheck-io random setenv - time transformers + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers ]; homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; @@ -102783,6 +102759,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-multicheck" = callPackage + ({ mkDerivation, base, hspec, hspec-smallcheck, QuickCheck + , smallcheck + }: + mkDerivation { + pname = "hspec-multicheck"; + version = "0.1"; + sha256 = "1x4c3fsvxacwh5jlfjmasxm8bznqv9b6hsd7fr0vqp6q9a2hrx8k"; + libraryHaskellDepends = [ + base hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/marcellussiegburg/hspec-multicheck"; + description = "A testing framework for Haskell using Hspec"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -103040,7 +103033,6 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec2" = callPackage @@ -103286,6 +103278,7 @@ self: { sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers hsqml MonadRandom text ]; @@ -103305,6 +103298,7 @@ self: { sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers deepseq directory hsqml OddWord text ]; @@ -103324,6 +103318,7 @@ self: { sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers hsqml sqlite-simple text transformers ]; @@ -103341,6 +103336,7 @@ self: { sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ]; homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML sample programs"; @@ -103358,6 +103354,7 @@ self: { sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers deepseq directory hsqml OddWord tagged ]; @@ -103458,8 +103455,8 @@ self: { }: mkDerivation { pname = "hssqlppp"; - version = "0.6.0"; - sha256 = "1g0c9rvk9pn23bnja46vw67q7k3yvik3bvlzk43ghl8jzcyd0lkh"; + version = "0.6.1"; + sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz"; libraryHaskellDepends = [ base containers mtl parsec pretty pretty-show syb text transformers uniplate @@ -103471,7 +103468,6 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hssqlppp-th" = callPackage @@ -103480,8 +103476,8 @@ self: { }: mkDerivation { pname = "hssqlppp-th"; - version = "0.6.0"; - sha256 = "11apcd3l77zifip70mvkhncfrs5ahmfw26cdqxyqwykkgrx92vjl"; + version = "0.6.1"; + sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg"; libraryHaskellDepends = [ base hssqlppp syb template-haskell text ]; @@ -103491,7 +103487,6 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstatistics" = callPackage @@ -103581,6 +103576,7 @@ self: { sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base containers hsqml network random safecopy socks tagged text @@ -103676,6 +103672,7 @@ self: { sha256 = "0wfi468d08irw0s7dn6rmfsi1hrvh0in2fr655fmmwk6ngmnix51"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base cairo containers directory filepath glade gtk hashable mtl parallel QuickCheck random unordered-containers vector xml @@ -103720,6 +103717,7 @@ self: { sha256 = "1sq498shkr9xvzrg7spwvsfrnp0d414vcb6iv6pcy7h1jsplrgaz"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client http-client-tls hxt text @@ -103755,7 +103753,6 @@ self: { ]; description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hswip" = callPackage @@ -103822,8 +103819,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1"; - sha256 = "191rzsxnilkps20pp124pfbq8blf6g1b3gj1z6h0aa73hhf07c73"; + version = "0.14.1.1"; + sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103849,34 +103846,37 @@ self: { }) {}; "hsyslog" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: mkDerivation { pname = "hsyslog"; - version = "4"; - sha256 = "0j9s002vly1c43m7ik79zsf6az7fadgaz0cf4msid3xzdnkzrm9k"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring QuickCheck ]; + version = "5.0.1"; + sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "hsyslog_5" = callPackage - ({ mkDerivation, base, doctest }: + "hsyslog-tcp" = callPackage + ({ mkDerivation, base, bytestring, hsyslog, hsyslog-udp, network + , text, time + }: mkDerivation { - pname = "hsyslog"; - version = "5"; - sha256 = "06prb179djw9fh6fylyjxx5fv76hblyx1crmkqvi8b62rrkwlbsd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/peti/hsyslog"; - description = "FFI interface to syslog(3) from POSIX.1-2001"; + pname = "hsyslog-tcp"; + version = "0.1.0.0"; + sha256 = "06qlpxl5cf45a2y9ncjcngrghbhgf624a6s1yczx1pfx7zqda6i6"; + libraryHaskellDepends = [ + base bytestring hsyslog hsyslog-udp network text time + ]; + homepage = "https://github.com/osa1/hsyslog-tcp#readme"; + description = "syslog over TCP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hsyslog-udp" = callPackage @@ -103911,24 +103911,6 @@ self: { }) {com_err = null; zephyr = null;}; "htaglib" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , taglib, text - }: - mkDerivation { - pname = "htaglib"; - version = "1.0.4"; - sha256 = "19s01g8inwmzbvbs1ph4rg2kaqipj7jc9lkg2y9y28gpdrgw48qb"; - revision = "1"; - editedCabalFile = "0z0jzhmrm77b3rl1h89wfgbwjg374n1mda73z7qrrdfc7ky99dmy"; - libraryHaskellDepends = [ base bytestring text ]; - librarySystemDepends = [ taglib ]; - testHaskellDepends = [ base directory filepath hspec ]; - homepage = "https://github.com/mrkkrp/htaglib"; - description = "Bindings to TagLib, audio meta-data library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) taglib;}; - - "htaglib_1_1_1" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , taglib, text, transformers }: @@ -103936,13 +103918,13 @@ self: { pname = "htaglib"; version = "1.1.1"; sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -104035,6 +104017,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htirage" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "htirage"; + version = "1.20170804"; + sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck text transformers + ]; + description = "Equiprobable draw from publicly verifiable random data"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "htlset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -104067,8 +104065,8 @@ self: { pname = "html-conduit"; version = "1.2.1.1"; sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq"; - revision = "1"; - editedCabalFile = "0hqkhbg3lq988pr26nanw37pq6pg68p1pnqig817qjprdm6wlcny"; + revision = "2"; + editedCabalFile = "1fhna6ck1v05zpf4c715phz102v8vz0p7lsjk3fljmxblamc8kn6"; libraryHaskellDepends = [ base bytestring conduit conduit-extra containers resourcet tagstream-conduit text transformers xml-conduit xml-types @@ -104099,15 +104097,17 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, text, unordered-containers + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-doctest, directory, doctest, filepath, text + , unordered-containers }: mkDerivation { pname = "html-entities"; - version = "1.1.4"; - sha256 = "1h4jjy1fqzfcj49q99iprnz4ifaznacxnryq9bx8abxqsss22p0d"; + version = "1.1.4.1"; + sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec base-prelude text unordered-containers + attoparsec base base-prelude text unordered-containers ]; testHaskellDepends = [ base base-prelude directory doctest filepath @@ -104136,6 +104136,7 @@ self: { pname = "html-minimalist"; version = "0.15"; sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base xml ]; homepage = "http://rd.slavepianos.org/t/html-minimalist"; description = "Minimalist haskell html library"; @@ -104143,14 +104144,21 @@ self: { }) {}; "html-parse" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup - , text + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , string-conversions, tagsoup, text }: mkDerivation { pname = "html-parse"; - version = "0.2.0.0"; - sha256 = "14jap2xx030hzb0qs2rz30q92zivl0qd9h5z2ab3msl6vh0q97ww"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; + version = "0.2.0.1"; + sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + libraryHaskellDepends = [ + attoparsec base containers deepseq text + ]; + testHaskellDepends = [ + base containers hspec hspec-discover QuickCheck + quickcheck-instances string-conversions text + ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text ]; @@ -104311,6 +104319,7 @@ self: { pname = "hts"; version = "0.15"; sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hmt xml ]; homepage = "http://rd.slavepianos.org/t/hts"; description = "Haskell Music Typesetting"; @@ -104542,7 +104551,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -104647,8 +104655,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3.1"; - sha256 = "03na2nbm9la0shlijvjyb5mpp1prfskk4jmjy8iz707r0731dbjk"; + version = "2.2.3.2"; + sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -104712,7 +104720,6 @@ self: { homepage = "https://github.com/bazqux/http-conduit-downloader"; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-date" = callPackage @@ -104871,7 +104878,6 @@ self: { homepage = "https://github.com/myfreeweb/http-link-header"; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "http-listen" = callPackage @@ -104912,17 +104918,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-media_0_7_0" = callPackage + "http-media_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 , utf8-string }: mkDerivation { pname = "http-media"; - version = "0.7.0"; - sha256 = "11d5dcax7i58zhmaz1x35g0mbqm9h9ayzz058cm4p1p2dm7rsag5"; - revision = "1"; - editedCabalFile = "1z8pq2xfqjb8z8xar3inc51wsid9b66lfxrzq2sdb45953rcrbpd"; + version = "0.7.1.1"; + sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -104970,7 +104974,6 @@ self: { homepage = "https://github.com/nfjinjing/http-pony"; description = "A type unsafe http library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony-serve-wai" = callPackage @@ -105126,6 +105129,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-reverse-proxy_0_4_5" = 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.4.5"; + sha256 = "0v1f1z3gmc51sbxmxhnp4sspzj6mdm0ihl5x30218p1ynz9ssxjn"; + 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 @@ -105189,7 +105220,6 @@ self: { homepage = "http://github.com/afcowie/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -105283,6 +105313,11 @@ self: { array base bytestring bytestring-builder case-insensitive containers psqueues stm ]; + executableHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + case-insensitive containers directory filepath hex text + unordered-containers vector word8 + ]; testHaskellDepends = [ aeson aeson-pretty array base bytestring bytestring-builder case-insensitive containers directory doctest filepath Glob hex @@ -105297,6 +105332,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2-client" = callPackage + ({ mkDerivation, async, base, bytestring, connection, containers + , data-default-class, http2, network, optparse-applicative, time + , tls + }: + mkDerivation { + pname = "http2-client"; + version = "0.3.0.0"; + sha256 = "00rchfi3wdyg91hvyinlmvzyl8n6gcd47ycx06n427cvxa3gmz48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring connection containers http2 network time tls + ]; + executableHaskellDepends = [ + async base bytestring data-default-class http2 optparse-applicative + time tls + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/lucasdicioccio/http2-client"; + description = "A native HTTP2 client library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { @@ -105341,6 +105400,7 @@ self: { pname = "https-everywhere-rules-raw"; version = "4.0"; sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath functor-infix text ]; @@ -105414,7 +105474,6 @@ self: { homepage = "http://justhub.org"; description = "For multiplexing GHC installations and providing development sandboxes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubigraph" = callPackage @@ -105423,11 +105482,11 @@ self: { pname = "hubigraph"; version = "0.3.2"; sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers haxr mtl ]; homepage = "http://ooxo.org/hubigraph/"; description = "A haskell wrap for Ubigraph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubris" = callPackage @@ -105549,10 +105608,10 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-parse"; - version = "0.1.0.0"; - sha256 = "00jngz0v32jd90hq22zshp3ldfrjfkdik9pf6ab4n2bd2mql3va5"; + version = "0.1.0.2"; + sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym"; libraryHaskellDepends = [ base text ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; license = stdenv.lib.licenses.asl20; }) {}; @@ -105575,10 +105634,10 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-text"; - version = "0.1.0.1"; - sha256 = "0i3z7hmlq7d3kcbx81rkm828l8wv7bv8q9la7cx0l7df9anri7za"; + version = "0.1.0.2"; + sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q"; libraryHaskellDepends = [ base text ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; license = stdenv.lib.licenses.asl20; }) {}; @@ -105596,6 +105655,7 @@ self: { sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-builder bytestring case-insensitive ConfigFile containers directory filepath HaXml http-types hxt MissingH mtl @@ -105635,20 +105695,20 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.3.0.3"; - sha256 = "085i2k25vkh8lplnp1qgvp573v6dfcyx4rwbwz29dqhisrmzvbf9"; + version = "0.6.0.0"; + sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah"; 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; }) {}; - "hunit-dejafu_0_6_0_0" = callPackage + "hunit-dejafu_0_7_0_0" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.6.0.0"; - sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah"; + version = "0.7.0.0"; + sha256 = "0pp3rxzb00glkc9fn45hik7rn4dwampdbh7va0gdlzh1jma6wpgw"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -105664,6 +105724,7 @@ self: { sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ]; executableHaskellDepends = [ base cairo gtk haskell98 HUnit ]; homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home"; @@ -105877,6 +105938,7 @@ self: { sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory haskeline knob mtl parsec process time transformers utf8-string @@ -105988,14 +106050,38 @@ self: { "hw-balancedparens" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess - , hw-prim, hw-rankselect-base, QuickCheck, vector + , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector }: mkDerivation { pname = "hw-balancedparens"; - version = "0.1.0.0"; - sha256 = "1zk9h51hmzckh1szjzlgx91mhlv4cn9wyqlk51agm6pmv1gc2vn5"; + version = "0.1.0.2"; + sha256 = "1s14dkwvm0ya75z6jqbhy3d8vyfh7dw33d3k9c3xgzwzvznbhq02"; libraryHaskellDepends = [ - base hw-bits hw-excess hw-prim hw-rankselect-base vector + 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_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess + , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.0.0"; + sha256 = "1yd7s4n93rparg99x3kjsfiyk1si8kfg2ibfz5da1dlnzpffvmfq"; + 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 @@ -106015,8 +106101,28 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.5.0.0"; - sha256 = "0pr31aarxaaszknzljgax51m3550nrf49pvfp175d4c2vw1jcks1"; + 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_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, hw-int + , hw-prim, hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.7.0.0"; + sha256 = "18vqxkdzq42186k9ynrhlhk5wigg302y0xcpmgwah6is6hng1mxw"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -106032,37 +106138,15 @@ self: { "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , hw-bits, mmap, resourcet, vector, word8 + , mmap, time, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.1.0.0"; - sha256 = "06s906cs8glr4yfm9k1apl5rgkgrb9fzlhrifi1b8rjkbj37zg18"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.1"; + sha256 = "1zsh8dvafxxrzrgdfa3fl40bzlm6f4isimmmcbgfv3whzxnv15z1"; libraryHaskellDepends = [ - array base bytestring conduit hw-bits resourcet word8 + array base bytestring conduit time word8 ]; - executableHaskellDepends = [ base criterion ]; - testHaskellDepends = [ base bytestring hspec ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion mmap vector - ]; - homepage = "http://github.com/haskell-works/hw-conduit#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-conduit_0_2_0_0" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , mmap, vector, word8 - }: - mkDerivation { - pname = "hw-conduit"; - version = "0.2.0.0"; - sha256 = "17b31pdxisv6ksvha6c5ydv549rjg9xy5q0zch8s5rg3a5f8az3j"; - libraryHaskellDepends = [ array base bytestring conduit word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ base bytestring conduit criterion mmap vector @@ -106070,7 +106154,6 @@ self: { homepage = "http://github.com/haskell-works/hw-conduit#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-diagnostics" = callPackage @@ -106102,7 +106185,6 @@ self: { homepage = "http://github.com/haskell-works/hw-eliasfano#readme"; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage @@ -106111,8 +106193,8 @@ self: { }: mkDerivation { pname = "hw-excess"; - version = "0.1.0.0"; - sha256 = "1fs22xphm2kpbnmq0nc52k11ss9rxldaz6qy3zqn1b60r57b9x2d"; + version = "0.1.0.1"; + sha256 = "0q6mrmlii351iji1b0c4j7sck74zgs1hxfyj8cd3k5a6q8j3nkb1"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -106122,9 +106204,54 @@ self: { 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 + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.0.0"; + sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe storable-record 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.1"; + sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/hw-hedgehog#readme"; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-hspec-hedgehog" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.0"; + sha256 = "1f1yqcjdn1jbqcpm6qxajqlkirhpyshvy5zi5ccd64anz691dqdw"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106177,7 +106304,6 @@ self: { homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -106212,6 +106338,38 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; + }) {}; + + "hw-kafka-avro" = callPackage + ({ mkDerivation, aeson, avro, base, binary, bytestring, cache + , containers, errors, hashable, hspec, http-client, mtl, pure-zlib + , QuickCheck, semigroups, servant, servant-client, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hw-kafka-avro"; + version = "1.1.0"; + sha256 = "0srp47c5s295qmf5vjfz4qfs19xn407c58iv51lij674c587vsvb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson avro base binary bytestring cache containers errors hashable + http-client mtl pure-zlib semigroups servant servant-client text + transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson avro base binary bytestring cache containers errors hashable + http-client mtl pure-zlib semigroups servant servant-client text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson avro base binary bytestring cache containers errors hashable + hspec http-client mtl pure-zlib QuickCheck semigroups servant + servant-client text transformers unordered-containers + ]; + homepage = "https://github.com/haskell-works/hw-kafka-avro#readme"; + description = "Avro support for Kafka infrastructure"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -106222,8 +106380,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "1.1.2"; - sha256 = "0y5v1rprysd5d125kxcb2dnc74i647vi1ad94r2iq2m117xrqsnr"; + version = "1.1.4"; + sha256 = "1vh3nq6mv8aq5ws17kilkcmdgxg1i1v582ddydrwz3p42kpg1qi4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106251,8 +106409,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "1.1.2"; - sha256 = "1krvd42qd4l95f69md7122mzqsb1ilj82w742ih2lgp8143na0da"; + version = "1.1.4"; + sha256 = "17rmal7kncddyqw7y3sa9kr5frv3gqcr4s85lb8k9iaj64wa2cfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106266,8 +106424,8 @@ self: { base bifunctors bytestring conduit conduit-extra containers extra hspec hw-kafka-client mtl QuickCheck resourcet transformers ]; - homepage = "https://github.com/haskell-works/hw-kafka-client-conduit"; - description = "Conduit bindings for kafka-client"; + 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; }) {}; @@ -106305,7 +106463,6 @@ self: { homepage = "http://github.com/haskell-works/hw-packed-vector#readme"; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage @@ -106314,13 +106471,13 @@ self: { }: mkDerivation { pname = "hw-parser"; - version = "0.0.0.1"; - sha256 = "09c02ajw5nx3mmydyi82464fkd6z8xf6a4z63alwmks16jyda24v"; + version = "0.0.0.2"; + sha256 = "0c9ns631f3lmar3xqkqk6lgdrfzmpphcray2c32li7n2hj5bcdik"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim mono-traversable text ]; homepage = "http://github.com/haskell-works/hw-parser#readme"; - description = "Conduits for tokenizing streams"; + description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -106337,14 +106494,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: + mkDerivation { + pname = "hw-prim"; + version = "0.5.0.0"; + sha256 = "00sivy11g7haafpqy12sxgslffw841bx0i25phaz5vcfwp5xrp9j"; + 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; + 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.0"; - sha256 = "1ddaxfv10hqfpcp9majy5c9wccl1ikq9l0dh49sqhkd4fxxl71fv"; + version = "0.8.0.2"; + sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm"; libraryHaskellDepends = [ base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector ]; @@ -106354,6 +106525,38 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect#readme"; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-rankselect_0_10_0_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap + , QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.10.0.2"; + sha256 = "1l3s40jk6nsq87q83mj4kalzn4kphxkpy4h89bw4jzzlykqwpcz9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory hw-bits hw-prim hw-rankselect-base mmap vector + ]; + testHaskellDepends = [ + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect#readme"; + description = "Rank-select"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -106363,8 +106566,8 @@ self: { }: mkDerivation { pname = "hw-rankselect-base"; - version = "0.2.0.0"; - sha256 = "195g51py2kx0nx0kc67nhswmpq6r8dlb6p9i1y53hyis1ygc2ly8"; + version = "0.2.0.1"; + sha256 = "0nkbq0wzljhdjvcn04wkysqa357qhzacisimqpj8k5nbf3rkrlvj"; libraryHaskellDepends = [ base hw-bits hw-int hw-prim hw-string-parse safe vector ]; @@ -106377,7 +106580,6 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-string-parse" = callPackage @@ -106410,7 +106612,6 @@ self: { homepage = "http://github.com/haskell-works/hw-succinct#readme"; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-vector" = callPackage @@ -106442,6 +106643,7 @@ self: { sha256 = "05bahk2fl2cp0dgx4v91dghzhsh1bclaj8z24j4s0p25xbi63zvr"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring conduit containers hw-balancedparens hw-bits hw-conduit hw-parser hw-prim @@ -106466,7 +106668,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 @@ -106665,6 +106866,7 @@ self: { sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cairo cmdargs configurator containers Diff directory double-conversion dyre fclabels filepath gtk @@ -106780,7 +106982,6 @@ self: { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Expat parser for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -106835,8 +107036,8 @@ self: { pname = "hxt-pickle-utils"; version = "0.1.0.3"; sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx"; - revision = "1"; - editedCabalFile = "16dh3pj4bjalvahiwqcfxx3qasr3kqqy9bq7jfhp8hnn2fij0nvf"; + revision = "2"; + editedCabalFile = "109jh2iibhnllkwpqpiyfwdqjn3v06ap58fhyzikjdqzz0rzwgh5"; libraryHaskellDepends = [ base hxt mtl ]; homepage = "https://github.com/silkapp/hxt-pickle-utils"; description = "Utility functions for using HXT picklers"; @@ -106988,6 +107189,7 @@ self: { sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base blaze-html bytestring cmdargs directory filepath highlighting-kate mtl pandoc regex-pcre-builtin text @@ -107007,6 +107209,7 @@ self: { sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers haskell98 mtl parsec ]; @@ -107107,6 +107310,7 @@ self: { sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax @@ -107285,6 +107489,7 @@ self: { sha256 = "0ryzhbmwrg173lmzyl8a77qnqp11maxcn72y1x0hn8mabj8js3hn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hylogen vector-space ]; executableHaskellDepends = [ aeson base bytestring filepath fsnotify hint http-types hylogen @@ -107331,6 +107536,7 @@ self: { sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base hylolib mtl ]; homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php"; description = "Tableau based theorem prover for hybrid logics"; @@ -107358,8 +107564,8 @@ self: { ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.1.0.1"; - sha256 = "0jzfij3wqnyj7yf4ip8a8y0kz8zj9ci8gsjxf4m4hr5zsh90bas4"; + version = "0.1.0.2"; + sha256 = "1lp9mlg2ky1ph508xiwvn2f5ycxv0w7lyl0rl7wnlhm5wcp6793r"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; @@ -107371,14 +107577,13 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.1.0.1"; - sha256 = "1ffbp3qqplfys3yhy3mm8k76xnfzkmyk1zsgmcw4hn4phmqbkdvc"; + version = "0.1.0.2"; + sha256 = "032ccqrpjqqlgg416x2igg5dycd2ddgl0mfh2yywg9fmigs0zxdd"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper svg-builder text ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -107387,8 +107592,8 @@ self: { }: mkDerivation { pname = "hyper-haskell-server"; - version = "0.1.0.1"; - sha256 = "147jwzv9jym0bimlvaxgwyf0081vw0zb4sw7xs5c783ci5qdgc23"; + version = "0.1.0.2"; + sha256 = "0ljkh1n4lh877gxcy15pv9bybl9rnhi7ycxvzw9m97r80hyxidm1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107444,8 +107649,8 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.4.1"; - sha256 = "08r0yrnfjcfv0p14p69dqjrsmff4alx5yykkq06mig0wycl4v4q0"; + version = "0.4.2"; + sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad @@ -107459,7 +107664,6 @@ 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 @@ -107510,26 +107714,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, doctest - , filepath, unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.6"; - sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg"; - libraryHaskellDepends = [ - base bytestring containers unordered-containers zlib - ]; - testHaskellDepends = [ - base containers directory doctest filepath unordered-containers - ]; - homepage = "http://github.com/ekmett/hyphenation"; - description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hyphenation_0_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers , doctest, unordered-containers, zlib }: @@ -107537,6 +107721,9 @@ self: { pname = "hyphenation"; version = "0.7"; sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; + revision = "2"; + editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers unordered-containers zlib @@ -107547,7 +107734,6 @@ self: { homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -107855,6 +108041,7 @@ self: { editedCabalFile = "0bb6cg0yiadcwa7pdg5gan3lir3pxdakwimi0cp64hi76scy0xng"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async attoparsec base binary bytestring Cabal-ide-backend containers data-accessor data-accessor-mtl directory filemanip @@ -108002,6 +108189,7 @@ self: { sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; revision = "1"; editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ base bytestring hspec JuicyPixels QuickCheck @@ -108036,7 +108224,6 @@ self: { ]; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idiii" = callPackage @@ -108050,6 +108237,7 @@ self: { sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor MissingH polyparse text utf8-string @@ -108127,6 +108315,7 @@ self: { configureFlags = [ "-fcurses" "-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 @@ -108151,6 +108340,52 @@ self: { 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 + , 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.1.1"; + sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; + configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmp;}; + "ieee" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -108246,7 +108481,6 @@ self: { homepage = "http://code.haskell.org/~thielema/iff/"; description = "Constructing and dissecting IFF files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ifscs" = callPackage @@ -108296,6 +108530,7 @@ self: { pname = "ige-mac-integration"; version = "0.1.0.1"; sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -108363,22 +108598,23 @@ self: { "ihaskell" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , cmdargs, containers, directory, filepath, ghc, ghc-parser - , ghc-paths, haskeline, haskell-src-exts, hlint, hspec, http-client - , http-client-tls, HUnit, ipython-kernel, mtl, parsec, process - , random, setenv, shelly, split, stm, strict, system-argv0, text - , transformers, unix, unordered-containers, utf8-string, uuid - , vector + , cmdargs, containers, directory, filepath, ghc, ghc-boot + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, text, transformers, unix + , unordered-containers, utf8-string, uuid, vector }: mkDerivation { pname = "ihaskell"; - version = "0.8.4.0"; - sha256 = "09vzwbxc8hnm7cwhs1nfpd6abwmlld495h304iwv1j653zrhjygp"; + version = "0.9.0.1"; + sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal cmdargs containers - directory filepath ghc ghc-parser ghc-paths haskeline + directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline haskell-src-exts hlint http-client http-client-tls ipython-kernel mtl parsec process random shelly split stm strict system-argv0 text transformers unix unordered-containers utf8-string uuid vector @@ -108388,12 +108624,8 @@ self: { process strict text transformers unix ]; testHaskellDepends = [ - aeson base base64-bytestring bytestring cereal cmdargs containers - directory filepath ghc ghc-parser ghc-paths haskeline - haskell-src-exts hlint hspec http-client http-client-tls HUnit - ipython-kernel mtl parsec process random setenv shelly split stm - strict system-argv0 text transformers unix unordered-containers - utf8-string uuid vector + base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv + shelly text transformers ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; @@ -108630,8 +108862,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.0"; - sha256 = "178psggvaad58kxfjgg3i4a8xgggn3gjcsi8y2f302dfza8kvlwa"; + version = "0.1.0.1"; + sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -108660,23 +108892,6 @@ self: { }) {}; "ilist" = callPackage - ({ mkDerivation, base, criterion, hspec, lens, transformers, vector - }: - mkDerivation { - pname = "ilist"; - version = "0.2.0.0"; - sha256 = "1vrww0w956rjyh6jrjfnbqbdd12hadvmvxx3r8v4n6p00i4apgzz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec transformers ]; - benchmarkHaskellDepends = [ - base criterion lens transformers vector - ]; - homepage = "http://github.com/aelve/ilist"; - description = "Optimised list functions for doing index-related things"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ilist_0_3_1_0" = callPackage ({ mkDerivation, base, criterion, hspec, lens, loop, transformers , vector }: @@ -108692,7 +108907,6 @@ self: { homepage = "http://github.com/aelve/ilist"; description = "Optimised list functions for doing index-related things"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "illuminate" = callPackage @@ -108865,6 +109079,7 @@ self: { sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bibtex bytestring ConfigFile containers curl directory download-curl filepath glib gnomevfs gtk mtl parsec process split @@ -108897,40 +109112,6 @@ self: { }) {}; "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 - }: - mkDerivation { - pname = "imm"; - version = "1.1.0.0"; - sha256 = "0mizq3b9n7qnb0g41dcp3x9ym91jylc40l470wn6sxbxrbm3g12j"; - 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 - ]; - executableHaskellDepends = [ base free ]; - homepage = "https://github.com/k0ral/imm"; - description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; - license = "unknown"; - }) {}; - - "imm_1_2_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive , chunked-data, comonad, conduit, conduit-combinators, connection @@ -108962,7 +109143,6 @@ self: { 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; }) {}; "immortal" = callPackage @@ -109243,6 +109423,7 @@ self: { sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers filepath IndentParser mtl parsec presburger pretty ]; @@ -109262,6 +109443,8 @@ self: { pname = "inchworm"; version = "1.0.2.1"; sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc"; + revision = "1"; + editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/DDCSF/inchworm"; description = "Inchworm Lexer Framework"; @@ -109389,8 +109572,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.3.1"; - sha256 = "1lda5zya9nk2sgi074v5j5hj8dr25cayla40mgy3v0pnwgplsdsv"; + version = "0.3.2"; + sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k"; libraryHaskellDepends = [ base indentation-core indentation-parsec indentation-trifecta mtl parsec parsers trifecta @@ -109404,8 +109587,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "indentation-core"; - version = "0.0"; - sha256 = "1nbqr8vac93cbxfaswcq21izpp8n0s1mwp8c13yvz6nfaqkz1ljg"; + version = "0.0.0.1"; + sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1"; libraryHaskellDepends = [ base mtl ]; homepage = "https://bitbucket.org/adamsmd/indentation"; description = "Indentation sensitive parsing combinators core library"; @@ -109418,8 +109601,8 @@ self: { }: mkDerivation { pname = "indentation-parsec"; - version = "0.0"; - sha256 = "0z6dklvb5nyyi9wabwbblc508f7s0w6srsg0wkygzmdj8y7bqlji"; + version = "0.0.0.1"; + sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp"; libraryHaskellDepends = [ base indentation-core mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; homepage = "https://bitbucket.org/adamsmd/indentation"; @@ -109433,8 +109616,8 @@ self: { }: mkDerivation { pname = "indentation-trifecta"; - version = "0.0.1"; - sha256 = "1ap6z3gvc93y1bq9msx401bm8wa7js5g5gmzr161bq722rs7y7n7"; + version = "0.0.2"; + sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis"; libraryHaskellDepends = [ base indentation-core mtl parsers trifecta ]; @@ -109715,6 +109898,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.0"; + sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + homepage = "https://github.com/stackbuilders/inflections-hs"; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -109732,9 +109936,9 @@ self: { "influxdb" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clock , containers, foldl, http-client, http-types, HUnit, lens, mtl - , network, optional-args, scientific, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text, time, unordered-containers - , vector + , mwc-random, network, optional-args, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, vector }: mkDerivation { pname = "influxdb"; @@ -109747,6 +109951,10 @@ self: { http-types lens network optional-args scientific text time unordered-containers vector ]; + executableHaskellDepends = [ + aeson base bytestring containers foldl http-client lens mwc-random + network optional-args text time vector + ]; testHaskellDepends = [ base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector @@ -109754,7 +109962,6 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -109894,6 +110101,33 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) gsl; gslcblas = null;}; + "inline-c_0_6_0_5" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl + , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck + , raw-strings-qq, regex-posix, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.6.0.5"; + sha256 = "0fy19z3r6xyzhkkagi050rasc4ak8xmvdgidy4wplayck9fr3z47"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + executableSystemDepends = [ gsl gslcblas ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + 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 ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -109906,6 +110140,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-cpp_0_2_1_0" = callPackage + ({ mkDerivation, base, hspec, inline-c, safe-exceptions + , template-haskell + }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.2.1.0"; + sha256 = "02m7w3n9rjynirniplp2gc2vy7c1jyalsqznh5mz366ps6vr19ip"; + libraryHaskellDepends = [ + base inline-c safe-exceptions template-haskell + ]; + 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 ({ mkDerivation, base, containers, inline-c, template-haskell , Win32 @@ -109923,33 +110174,6 @@ 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.1"; - sha256 = "0i90rrqsv9sr55cd81d6a9kswfnkyblf7ln56vwi57c38cxp68pp"; - revision = "1"; - editedCabalFile = "1kz51n1fbj9zv2109ciyd9myralrlbr2ym0c4kkgbdjkivp9lxy8"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "inline-java_0_6_5" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , directory, distributed-closure, filepath, ghc-heap-view, hspec , inline-c, jni, jvm, language-java, process, singletons, syb @@ -109959,6 +110183,8 @@ self: { 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 @@ -109971,7 +110197,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 @@ -110008,7 +110233,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 = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -110026,7 +110250,7 @@ self: { lucid-extras plotlyhs text time ]; executableHaskellDepends = [ base text ]; - testHaskellDepends = [ base text ]; + testHaskellDepends = [ base text time ]; homepage = "https://github.com/diffusionkinetics/open/inliterate"; description = "Interactive literate programming"; license = stdenv.lib.licenses.mit; @@ -110289,7 +110513,6 @@ self: { homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-gmp_1_0_0_1" = callPackage @@ -110313,10 +110536,8 @@ self: { }: mkDerivation { pname = "integer-logarithms"; - version = "1.0.1"; - sha256 = "0k3q79yjwln3fk0m1mwsxc3rypysx6ayl13xqgm254dip273yi8g"; - revision = "1"; - editedCabalFile = "1kk94f88qnmvwya9afpr4gqygvg02qc8m571hvd6fmwgsfvphv1y"; + version = "1.0.2"; + sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -110325,7 +110546,6 @@ self: { homepage = "https://github.com/phadej/integer-logarithms"; description = "Integer logarithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -110438,6 +110658,7 @@ self: { pname = "interlude"; version = "0.1.2"; sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://malde.org/~ketil/"; description = "Replaces some Prelude functions for enhanced error reporting"; @@ -110459,7 +110680,6 @@ self: { ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -110488,6 +110708,7 @@ self: { sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base explicit-exception HPDF parsec process transformers utility-ht ]; @@ -110504,12 +110725,11 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.20"; - sha256 = "0xysd4afdvrqbbndby0ylm8qph190d5sj81l42hcdl9w7bgx4gz9"; - revision = "1"; - editedCabalFile = "1fgqd3qkws9yb3vj8ay695ym5cgifi082wryh68dp0qqh7agwkhl"; + version = "0.1.21"; + sha256 = "1fr855gbz0ypxa73d5f74wp2sr3q67wdv6g4bpckj682c1x7dr73"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot-th ghc-paths ghci haskeline process syb time transformers unix @@ -110532,6 +110752,7 @@ self: { sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base haskell-src-exts regex-posix syb @@ -110547,25 +110768,6 @@ self: { }) {}; "interpolate" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta, hspec - , QuickCheck, quickcheck-instances, template-haskell, text - }: - mkDerivation { - pname = "interpolate"; - version = "0.1.0"; - sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id"; - revision = "1"; - editedCabalFile = "0ld319k9phmp6dp8m87bdhqp5519dxggf8r2a5z8hkznyjpa131j"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ - base bytestring haskell-src-meta hspec QuickCheck - quickcheck-instances template-haskell text - ]; - description = "String interpolation done right"; - license = stdenv.lib.licenses.mit; - }) {}; - - "interpolate_0_1_1" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta, hspec , QuickCheck, quickcheck-instances, template-haskell, text }: @@ -110581,7 +110783,6 @@ self: { homepage = "https://github.com/sol/interpolate#readme"; description = "String interpolation done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolatedstring-perl6" = callPackage @@ -110592,6 +110793,7 @@ self: { pname = "interpolatedstring-perl6"; version = "1.0.0"; sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -110606,6 +110808,7 @@ self: { pname = "interpolatedstring-qq"; version = "0.2"; sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell-src-meta-mwotton template-haskell ]; @@ -110621,6 +110824,7 @@ self: { pname = "interpolatedstring-qq-mwotton"; version = "0.1.1"; sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell-src-meta-mwotton template-haskell ]; @@ -110644,7 +110848,6 @@ self: { homepage = "http://hub.darcs.net/thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interruptible" = callPackage @@ -110694,26 +110897,16 @@ self: { }) {}; "intervals" = callPackage - ({ mkDerivation, array, base, distributive, ghc-prim }: - mkDerivation { - pname = "intervals"; - version = "0.7.2"; - sha256 = "0a7ysncmwkqh7q1d8y1h4lb5373k93xdly3bqrjb7ihazmylml0d"; - libraryHaskellDepends = [ array base distributive ghc-prim ]; - homepage = "http://github.com/ekmett/intervals"; - description = "Interval Arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "intervals_0_8" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, directory , distributive, doctest, filepath, ghc-prim, QuickCheck , template-haskell }: mkDerivation { pname = "intervals"; - version = "0.8"; - sha256 = "1i78h7plzckdjs9qr2p1qldhb5gv7v1cl01r27sf1hg2x9gr88v4"; + version = "0.8.1"; + sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; + revision = "1"; + editedCabalFile = "0im2m4acx6g638h7yz0x3qyaipfmri59q4zdq1w7n608r3i406dj"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -110722,7 +110915,6 @@ self: { homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intricacy" = callPackage @@ -110737,6 +110929,7 @@ self: { sha256 = "05nz32z4gyjprh22dddwk3jb45nl2bm558d1sh09g4n2rvx0m4i7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring containers crypto-api crypto-pubkey-types cryptohash directory filepath hscurses mtl @@ -110749,32 +110942,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, safe - , string-conversions, tagged, text, transformers - , unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.1.0.10"; - sha256 = "1na12wh1fz0zjd6ibz5piq9bhj50q827mskcs88fn47zsrxnr30w"; - libraryHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl safe string-conversions tagged 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"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "intro_0_3_0_1" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe , text, transformers, unordered-containers, writer-cps-mtl @@ -110796,7 +110963,6 @@ self: { homepage = "https://github.com/minad/intro#readme"; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -110859,12 +111025,21 @@ self: { }) {}; "intset" = callPackage - ({ mkDerivation, base, bits-extras, bytestring, deepseq }: + ({ mkDerivation, base, bits-extras, bytestring, containers + , criterion, deepseq, QuickCheck, test-framework + , test-framework-quickcheck2 + }: mkDerivation { pname = "intset"; version = "0.1.1.0"; sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0"; libraryHaskellDepends = [ base bits-extras bytestring deepseq ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq + ]; homepage = "https://github.com/pxqr/intset"; description = "Pure, mergeable, succinct Int sets"; license = stdenv.lib.licenses.bsd3; @@ -110874,17 +111049,19 @@ self: { "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, profunctors, QuickCheck - , semigroups, StateVar, stm, tagged, template-haskell, transformers - , transformers-compat, unordered-containers + , semigroups, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers }: mkDerivation { pname = "invariant"; - version = "0.4.2"; - sha256 = "1m5iaj7w4srg0qcd5dga8aphkwapxmhh54f4pi1bc67i17zl99ss"; + version = "0.4.3"; + sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell - transformers transformers-compat unordered-containers + th-abstraction transformers transformers-compat + unordered-containers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell ]; homepage = "https://github.com/nfrisby/invariant-functors"; @@ -110910,7 +111087,6 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -110948,7 +111124,6 @@ self: { homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Invertible syntax descriptions for both parsing and pretty printing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-capture" = callPackage @@ -111078,8 +111253,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.6.1"; - sha256 = "0a1nr29qg5z0fqjnivzzy69bfxv7r9aw9yf2i53alcmiqjmx9p18"; + version = "1.4.1.0"; + sha256 = "0d6m7hq6l3zabqm2kga9qs1742vh5rnhfsa76svpkyn32z8n1i1w"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -111095,33 +111270,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "io-streams_1_4_0_0" = 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.0.0"; - sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -111265,8 +111413,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.9.1"; - sha256 = "10pvs70car553ykpzhgk8zxqpl6a8vlirbw7c9xx0g1lhf3hmvhi"; + version = "0.9.2"; + sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -111474,20 +111622,24 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, process, SHA, temporary, text + , directory, filepath, mtl, parsec, process, SHA, temporary, text , transformers, unordered-containers, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.8.4.0"; - sha256 = "0r426gbvr5k019v49gmw32fv0xnq5viizin4gb7wxcnm6ql84k5c"; + version = "0.9.0.0"; + sha256 = "04byvmf4n55sdanw2lg5hicp2h7ivn2620wybd8i43hgcckx1ach"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cereal containers directory filepath mtl process SHA temporary text transformers unordered-containers uuid zeromq4-haskell ]; + executableHaskellDepends = [ + base filepath mtl parsec text transformers + ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -111530,8 +111682,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "0.4.4.1"; - sha256 = "1xpccg4bqflrf039953qjb721m38w8x6qn75x1xr7d4y8b6hbl9q"; + 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 @@ -111560,8 +111712,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.1"; - sha256 = "06kjl5b5i1s1pazn8yp2sr9f1mlgaibkgjvpd2z2q9kzy8kchh4n"; + version = "0.2.2.3"; + sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -111588,7 +111740,6 @@ self: { homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-ctcp" = callPackage @@ -111626,7 +111777,6 @@ self: { homepage = "https://github.com/JanGe/irc-dcc"; description = "A DCC message parsing and helper library for IRC clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-fun-bot" = callPackage @@ -111730,7 +111880,6 @@ 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 @@ -111764,10 +111913,11 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.6"; - sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q"; + version = "0.1.5.7"; + sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base bytestring Cabal containers extra foldl http-conduit lifted-base monad-control multistate process split @@ -111818,6 +111968,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "irt" = callPackage + ({ mkDerivation, ad, base, data-default-class, statistics }: + mkDerivation { + pname = "irt"; + version = "0.2.0.1"; + sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c"; + libraryHaskellDepends = [ ad base data-default-class statistics ]; + homepage = "https://github.com/argiopetech/irt"; + description = "Item Response Theory functions for use in computerized adaptive testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "is" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -111828,7 +111990,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -112005,26 +112166,6 @@ self: { }) {}; "isotope" = callPackage - ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck - , template-haskell, th-lift - }: - mkDerivation { - pname = "isotope"; - version = "0.4.0.0"; - sha256 = "19wy290r1n7xkpr3qpw4samgbrnpdv5iljfx3cspix27gfmw0384"; - libraryHaskellDepends = [ - base containers megaparsec template-haskell th-lift - ]; - testHaskellDepends = [ - base containers hspec megaparsec QuickCheck - ]; - 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; - }) {}; - - "isotope_0_5_0_1" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift }: @@ -112041,7 +112182,6 @@ 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 @@ -112085,6 +112225,7 @@ self: { sha256 = "049gj5c6z68yf7cmnp1kbjdg71n4rdwyb59hivdjajsdp9xay7hn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base brick data-default microlens text vty ]; @@ -112098,7 +112239,6 @@ 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 @@ -112147,6 +112287,7 @@ self: { pname = "iterable"; version = "3.0"; sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl tagged template-haskell vector ]; @@ -112212,6 +112353,7 @@ self: { libraryHaskellDepends = [ base bytestring containers ListLike MonadCatchIO-mtl mtl unix ]; + executableHaskellDepends = [ base ]; homepage = "http://inmachina.net/~jwlato/haskell/iteratee"; description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; @@ -112288,6 +112430,7 @@ self: { sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych"; revision = "1"; editedCabalFile = "0d96j24n4v61q7ynrwaag96as2sl6q67kmypmb4wk42cw400g41j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers directory haskell98 mtl parsec ]; @@ -112300,21 +112443,20 @@ self: { "ivory" = callPackage ({ mkDerivation, alex, array, base, base-compat, containers, dlist , filepath, happy, monadLib, pretty, template-haskell, text - , th-lift + , th-abstraction, th-lift }: mkDerivation { pname = "ivory"; - version = "0.1.0.6"; - sha256 = "13akncp29sqidkqxfbv6k2gadipdzvnk6svgwm1p29xr5wxfizca"; + version = "0.1.0.7"; + sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty - template-haskell text th-lift + template-haskell text th-abstraction th-lift ]; libraryToolDepends = [ alex happy ]; homepage = "http://ivorylang.org"; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-artifact" = callPackage @@ -112341,10 +112483,9 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.5"; - sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0"; - revision = "3"; - editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49"; + version = "0.1.0.7"; + sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -112393,7 +112534,6 @@ self: { homepage = "http://ivorylang.org"; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-examples" = callPackage @@ -112409,6 +112549,7 @@ self: { editedCabalFile = "0ffshn32fv3qwf7gq0ms0ay21b21xvy0gb97ymg89plan18n2gx8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib monadLib pretty QuickCheck template-haskell @@ -112425,11 +112566,11 @@ self: { pname = "ivory-hw"; version = "0.1.0.5"; sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-opts" = callPackage @@ -112449,7 +112590,6 @@ self: { homepage = "http://ivorylang.org"; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-quickcheck" = callPackage @@ -112483,12 +112623,12 @@ self: { pname = "ivory-serialize"; version = "0.1.0.5"; sha256 = "16hsvfrcrvqwcj75d1xdpb9njh0j66wy7vf4yv7q6vk7papvrwsf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-stdlib" = callPackage @@ -112497,11 +112637,11 @@ self: { pname = "ivory-stdlib"; version = "0.1.0.5"; sha256 = "1sdbwy5sqa87zidfp7xmxwvfw3xx26kc8m68hgmhsxvs8j6xavmg"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivy-web" = callPackage @@ -112584,8 +112724,8 @@ self: { }: mkDerivation { pname = "ixset-typed"; - version = "0.3.1"; - sha256 = "0xdm036vd6p7ax6dqziccrgzh45hv5zzg747s25hsihhjv46665l"; + version = "0.3.1.1"; + sha256 = "04nwmmw9rfvz7bm7vqlahyfx7rxn7qx9zdyh6m8g2vf55in4csyh"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -112845,6 +112985,7 @@ self: { sha256 = "0xlk07vcizp9rms5d28klidcf535ncffcx75rwixhvlii2qmyjn7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base bytestring directory filepath process regex-tdfa temporary @@ -112885,6 +113026,7 @@ self: { sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base pretty ]; executableToolDepends = [ alex happy ]; homepage = "http://github.com/andreasabel/java-adt"; @@ -112986,7 +113128,6 @@ self: { homepage = "https://github.com/NICTA/javaclass"; description = "Java class files"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "javascript-extras" = callPackage @@ -113103,7 +113244,6 @@ 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 @@ -113240,24 +113380,6 @@ self: { }) {}; "jni" = callPackage - ({ mkDerivation, base, bytestring, containers, inline-c, jdk - , singletons, thread-local-storage - }: - mkDerivation { - pname = "jni"; - version = "0.2.3"; - sha256 = "0169fb4zd1kbjnkwc6qx43wcmg23h0j046ih45a2a1yy4g4cyj5s"; - libraryHaskellDepends = [ - base bytestring containers inline-c singletons thread-local-storage - ]; - librarySystemDepends = [ jdk ]; - homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; - description = "Complete JNI raw bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) jdk;}; - - "jni_0_3_1" = callPackage ({ mkDerivation, base, bytestring, choice, containers, cpphs , inline-c, jdk, singletons, thread-local-storage }: @@ -113274,7 +113396,6 @@ self: { 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 @@ -113310,6 +113431,7 @@ self: { pname = "join"; version = "0.4"; sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 multisetrewrite stm ]; homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html"; description = "Parallel Join Patterns with Guards and Propagation"; @@ -113376,68 +113498,35 @@ self: { }) {}; "jose" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , byteable, bytestring, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell - , text, time, unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; - version = "0.5.0.4"; - sha256 = "164cgpz7a9yyd861y43ljw7wkjajvp7ylli4j2qyq4947v7ibxg9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring byteable bytestring - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe template-haskell text time - unordered-containers vector x509 - ]; - executableHaskellDepends = [ aeson base bytestring lens mtl ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring byteable bytestring - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - homepage = "https://github.com/frasertweedale/hs-jose"; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_6_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell - , text, time, unordered-containers, vector, x509 + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.6.0.2"; - sha256 = "1m6ck60z9lmvc3rb8lpf4h7j3yvzmshwb8dm96s0d1ldhcmk26jy"; + version = "0.6.0.3"; + sha256 = "1d6d2w61v5di6mfd1ss14sx7i29bzvhjn7yplg0q2nmxnba5p2xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe template-haskell text time - unordered-containers vector x509 + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 ]; executableHaskellDepends = [ aeson base bytestring lens mtl ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe tasty tasty-hspec + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec tasty-quickcheck template-haskell text time unordered-containers vector x509 ]; homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -113461,7 +113550,6 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jpeg" = callPackage @@ -113481,6 +113569,7 @@ self: { pname = "js-flot"; version = "0.8.3"; sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; homepage = "https://github.com/ndmitchell/js-flot#readme"; @@ -113502,53 +113591,38 @@ self: { }) {}; "js-jquery" = callPackage - ({ mkDerivation, base, HTTP }: - mkDerivation { - pname = "js-jquery"; - version = "3.1.1"; - sha256 = "011adwcf0rx57ld6c75m9rw90zd2qj0d4pf7rmdnf7fp5gbnfbyp"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HTTP ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/js-jquery#readme"; - description = "Obtain minified jQuery code"; - license = stdenv.lib.licenses.mit; - }) {}; - - "js-jquery_3_2_1" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { pname = "js-jquery"; version = "3.2.1"; sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, deepseq, filepath, ghc-prim, http-types - , lens, primitive, process, ref-tf, scientific, stm, text, time - , transformers, unordered-containers, uuid, uuid-types, vector + , lens, primitive, process, random, ref-tf, scientific, stm, text + , time, transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.2.1"; - sha256 = "0527hsra6x9iblv1i8k145waha861zx5khk0f7c7sqar72qmrzj4"; + version = "0.9.4.0"; + sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers - deepseq filepath ghc-prim http-types lens primitive process ref-tf - scientific stm text time transformers unordered-containers uuid - uuid-types vector + deepseq filepath ghc-prim http-types lens primitive process random + ref-tf scientific stm text time transformers unordered-containers + vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -113572,14 +113646,13 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.0.0"; - sha256 = "0yc5m80n3k3l2m429p5icfwk50c6qdfs5h273rgdr9pjb2if5cmm"; + version = "0.9.2.0"; + sha256 = "14m752vj4lpdwa0cbziz1wynjf836f3khrmfdz702c0d0als3j0q"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -113601,17 +113674,16 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, deepseq , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle , lens, network, primitive, process, QuickCheck, ref-tf, stm, text - , time, transformers, uuid, uuid-types, wai, wai-websockets, warp - , webdriver, websockets + , time, transformers, wai, wai-websockets, warp, webdriver + , websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.2.0"; - sha256 = "08r9nzx8yvdw7klv7n19znqfp5r5585fvhz9jsk5mcinpkc7yvyv"; + version = "0.9.4.0"; + sha256 = "0asl6jw6ymc9iw5g45qihxhfb59fhsxj7bxzgnvsqrxq4kdfv0a6"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle - stm text time transformers uuid uuid-types wai wai-websockets warp - websockets + stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ aeson base bytestring containers deepseq doctest filepath ghc-prim @@ -113627,16 +113699,17 @@ self: { "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base - , jsaddle, text, unix, webkit2gtk3-javascriptcore + , haskell-gi-overloading, jsaddle, text, unix + , webkit2gtk3-javascriptcore }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.0.0"; - sha256 = "1qrrvfr9ha5v43940ppdf3ngrig1s324482aaxsnpj2s7jxmqsa6"; + version = "0.9.4.0"; + sha256 = "0mw43kmamp1spw6zfdbm76apn79n7y9inb0c1c8fkfczbjd8b759"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk - gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix - webkit2gtk3-javascriptcore + gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading + jsaddle text unix webkit2gtk3-javascriptcore ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -113668,8 +113741,8 @@ self: { }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.0.0"; - sha256 = "1yy7m60h6kcqb97qwhrh3kbxrz981njff2f23x1axfrb2jc3mby4"; + version = "0.9.4.0"; + sha256 = "05braj7m2z0r5vqq1y1sp6kh11b8z269lvznysmsqay31wccbyvx"; libraryHaskellDepends = [ aeson base bytestring containers data-default jsaddle ]; @@ -113679,8 +113752,9 @@ self: { }) {}; "jsc" = callPackage - ({ mkDerivation, base, jmacro, lens, template-haskell, text - , transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, glib, gtk3, hslogger, jmacro, lens + , template-haskell, text, transformers, webkitgtk3 + , webkitgtk3-javascriptcore }: mkDerivation { pname = "jsc"; @@ -113690,6 +113764,10 @@ self: { base jmacro lens template-haskell text transformers webkitgtk3 webkitgtk3-javascriptcore ]; + testHaskellDepends = [ + base glib gtk3 hslogger jmacro lens template-haskell text + transformers webkitgtk3 webkitgtk3-javascriptcore + ]; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -113759,7 +113837,6 @@ 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 @@ -113976,6 +114053,7 @@ self: { homepage = "https://github.com/tfausak/json-feed#readme"; description = "JSON Feed"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -114259,7 +114337,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-state" = callPackage @@ -114297,7 +114374,6 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -114338,6 +114414,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "json-tracer" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , ghc-prim, hashable, hspec, hspec-core, hspec-discover + , hspec-expectations, microlens, microlens-ghc, mtl + , template-haskell, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "json-tracer"; + version = "0.0.2.0"; + sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq"; + libraryHaskellDepends = [ + aeson base containers ghc-prim hashable microlens microlens-ghc mtl + template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hspec hspec-core + hspec-discover hspec-expectations microlens mtl time + ]; + homepage = "https://github.com/autotaker/json-tracer#readme"; + description = "A polymorphic, type-safe, json-structured tracing library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "json-types" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -114466,6 +114565,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsons-to-schema" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit + , conduit-combinators, containers, Glob, hjsonschema, hspec + , neat-interpolation, optparse-applicative, protolude, QuickCheck + , quickcheck-instances, safe, scientific, semigroups, text + , uniplate, unordered-containers, vector + }: + mkDerivation { + pname = "jsons-to-schema"; + version = "0.1.0.0"; + sha256 = "0agnvc8x2yvl2m0lz5hcflmi44gscyb349zn0xbrlk9arq7ha8nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema protolude + QuickCheck safe scientific semigroups text unordered-containers + vector + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-combinators Glob hjsonschema + optparse-applicative protolude + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema hspec + neat-interpolation protolude QuickCheck quickcheck-instances + scientific text uniplate unordered-containers vector + ]; + homepage = "https://github.com/garetht/jsons-to-schema/README.md"; + description = "JSON to JSON Schema"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonschema-gen" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, process , scientific, tagged, text, time, unordered-containers, vector @@ -114484,7 +114615,6 @@ self: { homepage = "https://github.com/yuga/jsonschema-gen"; description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonsql" = callPackage @@ -114582,6 +114712,7 @@ self: { sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base64-bytestring bytestring data-default-class docopt entropy fast-logger http-types interpolatedstring-perl6 mtl mysql @@ -114590,7 +114721,6 @@ self: { ]; description = "Manage users in MariaDB >= 10.1.1"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "judy" = callPackage @@ -114637,8 +114767,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.17"; - sha256 = "0r57bcg21pnw9qgqp82c60lr8p4m4xv0ml01l3wzzb7vahnxalir"; + version = "0.2.19"; + sha256 = "0f3iibpxgr2f7mvl6x4719gvjd4dcd5ajiz3y985rng6d7n5sbya"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114707,25 +114837,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "jvm" = callPackage - ({ mkDerivation, base, bytestring, distributed-closure, hspec, jni - , singletons, text, vector - }: + "justified-containers" = callPackage + ({ mkDerivation, base, containers }: mkDerivation { - pname = "jvm"; - version = "0.1.2"; - sha256 = "0di1gv1c3zj06cr423sdnl9m5m6lc0xw37kfm75dxqsip54gq80d"; - libraryHaskellDepends = [ - base bytestring distributed-closure jni singletons text vector - ]; - testHaskellDepends = [ base bytestring hspec text ]; - 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; + pname = "justified-containers"; + version = "0.1.2.0"; + sha256 = "1rzphablg1wpx2b33zgdyslb9ch436g0wi59vy6gk06572najvz4"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/matt-noonan/justified-containers"; + description = "Keyed container types with type-checked proofs of key presence"; + license = stdenv.lib.licenses.bsd2; }) {}; - "jvm_0_2_2" = callPackage + "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, criterion , distributed-closure, hspec, jni, singletons, template-haskell , text, vector @@ -114743,7 +114867,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-parser" = callPackage @@ -114763,26 +114886,6 @@ self: { }) {}; "jvm-streaming" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming - }: - mkDerivation { - pname = "jvm-streaming"; - version = "0.1"; - sha256 = "0mnjffsnv40aplbvm9wgwd0j75377iwg72g3pgf2rp2jqmhq8y25"; - revision = "3"; - editedCabalFile = "1hfjr9q08kvwdj828pl41zfig0c721sj1ni8p01rb9ck9pv97fap"; - 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; - }) {}; - - "jvm-streaming_0_2" = callPackage ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni , jvm, singletons, streaming }: @@ -114797,7 +114900,6 @@ self: { 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 @@ -114852,8 +114954,9 @@ self: { }) {}; "kafka-client" = callPackage - ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec - , hspec-discover, network, QuickCheck, snappy, time, zlib + ({ mkDerivation, base, bytestring, cereal, containers, digest + , dlist, hspec, hspec-discover, network, process, QuickCheck + , snappy, temporary, time, zlib }: mkDerivation { pname = "kafka-client"; @@ -114863,7 +114966,8 @@ self: { base bytestring cereal digest dlist network snappy time zlib ]; testHaskellDepends = [ - base bytestring cereal hspec hspec-discover QuickCheck time + base bytestring cereal containers hspec hspec-discover network + process QuickCheck temporary time ]; homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; @@ -115090,6 +115194,7 @@ self: { sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; revision = "11"; editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time transformers unordered-containers @@ -115111,11 +115216,13 @@ self: { sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cmdargs containers data-default data-reify directory dotgen filepath netlist netlist-to-vhdl process random sized-types strict template-haskell ]; + executableHaskellDepends = [ base ]; homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava"; description = "Kansas Lava is a hardware simulator and VHDL generator"; license = stdenv.lib.licenses.bsd3; @@ -115132,10 +115239,12 @@ self: { sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava network sized-types ]; + executableHaskellDepends = [ base ]; homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava"; description = "FPGA Cores Written in Kansas Lava"; license = stdenv.lib.licenses.bsd3; @@ -115151,6 +115260,7 @@ self: { pname = "kansas-lava-papilio"; version = "0.3.1"; sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava kansas-lava-cores netlist network sized-types @@ -115166,6 +115276,7 @@ self: { pname = "kansas-lava-shake"; version = "0.2.0"; sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hastache kansas-lava shake text ]; description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; @@ -115239,96 +115350,61 @@ self: { "katip" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either - , exceptions, hostname, microlens, microlens-th, monad-control, mtl + , filepath, hostname, microlens, microlens-th, monad-control, mtl , old-locale, quickcheck-instances, regex-tdfa, resourcet - , semigroups, string-conv, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unagi-chan, unix, unordered-containers + , safe-exceptions, 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.3.1.5"; - sha256 = "1mnrs6ji7bqh9lrb9bzcxb4c1a60mzf8xkzgk6yi8ijxxv5ch8zn"; + version = "0.5.0.0"; + sha256 = "0wqf5d4hjy6mc050g7hl2m3b66pi3fhyy37w0jwm7q7rrcplyncc"; libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either - exceptions hostname microlens microlens-th monad-control mtl - old-locale resourcet semigroups string-conv template-haskell text - time transformers transformers-base transformers-compat unagi-chan - unix unordered-containers + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions semigroups stm string-conv template-haskell text + time transformers transformers-base transformers-compat unix + unordered-containers ]; testHaskellDepends = [ - aeson base bytestring directory microlens quickcheck-instances - regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck - template-haskell text time time-locale-compat unordered-containers + 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 text time - transformers unix + 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "katip_0_4_1_0" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , exceptions, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , semigroups, string-conv, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unagi-chan, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.4.1.0"; - sha256 = "0rhnp6qg19v180nazwghn2f4chc79fwn1g74wr3zdsqg0j211bnp"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either - exceptions hostname microlens microlens-th monad-control mtl - old-locale resourcet semigroups string-conv template-haskell text - time transformers transformers-base transformers-compat unagi-chan - unix unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring directory microlens quickcheck-instances - regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck - template-haskell text time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq text time - transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, containers - , criterion, deepseq, enclosed-exceptions, exceptions, http-client - , http-types, katip, lens, lens-aeson, quickcheck-instances, retry - , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uuid, vector + ({ mkDerivation, aeson, async, base, bloodhound, bytestring + , containers, criterion, deepseq, enclosed-exceptions, exceptions + , http-client, http-types, katip, lens, lens-aeson + , quickcheck-instances, retry, rng-utils, scientific, stm + , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.1.0"; - sha256 = "162ikrqpk0i8zh5gw3isc1lflg4a4bsqk3ci2rpirll0wf1dqgz9"; + version = "0.4.0.0"; + sha256 = "0ypss3ga6xcqwd03y3jbq9mi6ka4h6srlr7ybb8k38bk9ql0bfld"; libraryHaskellDepends = [ - aeson async base bloodhound enclosed-exceptions exceptions - http-client http-types katip retry scientific stm stm-chans text - time transformers unordered-containers uuid + aeson async base bloodhound bytestring enclosed-exceptions + exceptions http-client http-types katip retry scientific stm + stm-chans text time transformers unordered-containers uuid ]; testHaskellDepends = [ - aeson base bloodhound containers http-client http-types katip lens - lens-aeson quickcheck-instances scientific stm tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers vector + aeson base bloodhound bytestring containers http-client http-types + katip lens lens-aeson quickcheck-instances scientific stm tagged + tasty tasty-hunit tasty-quickcheck text time transformers + unordered-containers vector ]; benchmarkHaskellDepends = [ aeson base bloodhound criterion deepseq rng-utils text @@ -115390,29 +115466,6 @@ self: { }) {}; "kawhi" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-client - , http-conduit, http-types, mtl, safe, scientific, smallcheck - , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "kawhi"; - version = "0.2.3"; - sha256 = "0in0z9hsl1kkgzx0ifrna6ddmxj4r138icf1liwl7awbiv4jn9n2"; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-client http-conduit - http-types mtl safe scientific text - ]; - testHaskellDepends = [ - aeson base bytestring exceptions http-client http-types mtl - scientific smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck text - ]; - homepage = "https://github.com/thunky-monk/kawhi"; - description = "stats.NBA.com library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kawhi_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text @@ -115433,7 +115486,6 @@ self: { homepage = "https://github.com/thunky-monk/kawhi"; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kazura-queue" = callPackage @@ -115467,6 +115519,7 @@ self: { sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ]; homepage = "http://tcana.info/rpoku"; description = "Rpoku spoken word programming language"; @@ -115878,6 +115931,7 @@ self: { sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ allocated-processor base bytestring cmdargs containers cv-combinators directory filepath gio glib gtk gtk-helpers hgettext @@ -116011,6 +116065,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base udbus ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/lunaryorn/haskell-keyring"; description = "Keyring access"; license = stdenv.lib.licenses.mit; @@ -116049,8 +116104,8 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20170303"; - sha256 = "0nmlm6izhg0nh4wh6vrdl8sm6w447x3jnx4nxxwxxz4mfy4yx18p"; + version = "0.20170811"; + sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116078,10 +116133,11 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.8.0.0"; - sha256 = "04lyrd78fkybh07y9xnbnk3ai1nsig55wr1i0p1c63v9sgzpria5"; + version = "0.8.0.2"; + sha256 = "0n5d94wkasrb834j7jvh7fh3a2dshqb21g3a9kpsqjmsjy76bq3g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding asn1-types base base64-bytestring byteable bytestring cipher-aes @@ -116114,7 +116170,6 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -116241,6 +116296,7 @@ self: { sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cmdargs hostname old-time parsec twine ]; @@ -116439,7 +116495,6 @@ self: { homepage = "https://github.com/scrive/kontra-config"; description = "JSON config file parsing based on unjson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kontrakcja-templates" = callPackage @@ -116527,8 +116582,8 @@ self: { pname = "kraken"; version = "0.0.3"; sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0"; - revision = "1"; - editedCabalFile = "0dm107c8nxdh544pswj7saxmaz1jbzwphdzgpyk857l33sdmy203"; + revision = "2"; + editedCabalFile = "0w8w1frkx54ldyhxp09ddm2y1l7q72xfl1p6py7y6ywxnq23lr4h"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -116912,7 +116967,6 @@ self: { homepage = "https://github.com/sgillespie/lambda-calculus#readme"; description = "A lambda calculus interpreter"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-canvas" = callPackage @@ -116965,7 +117019,6 @@ self: { homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-placeholders" = callPackage @@ -116986,8 +117039,8 @@ self: { }: mkDerivation { pname = "lambda-sampler"; - version = "1.0"; - sha256 = "1whs5phj8dd11af8sadnwyxpv4r4bmklqvpqiwdai7639lldk86a"; + version = "1.1"; + sha256 = "0vfin9f9mhxq7r63pyl3rpipb5z7dbyhwbf02y6h7brjq8wg9gx8"; libraryHaskellDepends = [ base MonadRandom mtl transformers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -116995,7 +117048,6 @@ self: { homepage = "https://github.com/maciej-bendkowski/lambda-sampler"; description = "Boltzmann sampler utilities for lambda calculus"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-toolbox" = callPackage @@ -117085,6 +117137,7 @@ self: { sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins lambdabot-misc-plugins lambdabot-novelty-plugins @@ -117285,6 +117338,7 @@ self: { sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cmdargs containers dyre glade gtk mtl network webkit ]; @@ -117368,10 +117422,12 @@ self: { }) {}; "lambdacube-compiler" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring - , containers, directory, exceptions, filepath, lambdacube-ir - , megaparsec, mtl, optparse-applicative, pretty-show, semigroups - , text, vector + ({ mkDerivation, aeson, ansi-wl-pprint, async, base + , base64-bytestring, bytestring, containers, deepseq, directory + , exceptions, filepath, JuicyPixels, lambdacube-ir, megaparsec + , monad-control, mtl, optparse-applicative, patience, pretty-show + , process, QuickCheck, semigroups, tasty, tasty-quickcheck, text + , time, vect, vector, websockets }: mkDerivation { pname = "lambdacube-compiler"; @@ -117379,12 +117435,17 @@ self: { sha256 = "1rylz8cxlf4llnakihphs7250bmvqqbz35aywjmh2vnghyc8dq28"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base containers directory exceptions filepath lambdacube-ir megaparsec mtl pretty-show semigroups text vector ]; executableHaskellDepends = [ - aeson base bytestring filepath optparse-applicative + aeson ansi-wl-pprint async base base64-bytestring bytestring + containers deepseq directory exceptions filepath JuicyPixels + lambdacube-ir megaparsec monad-control mtl optparse-applicative + patience pretty-show process QuickCheck semigroups tasty + tasty-quickcheck text time vect vector websockets ]; homepage = "http://lambdacube3d.com"; description = "LambdaCube 3D is a DSL to program GPUs"; @@ -117456,6 +117517,7 @@ self: { sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base elerea GLFW-b lambdacube-engine mtl ]; @@ -117466,8 +117528,10 @@ self: { }) {}; "lambdacube-gl" = callPackage - ({ mkDerivation, base, bytestring, containers, JuicyPixels - , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl + , network, OpenGLRaw, text, time, vector, vector-algorithms + , wavefront, websockets }: mkDerivation { pname = "lambdacube-gl"; @@ -117479,6 +117543,11 @@ self: { base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms ]; + executableHaskellDepends = [ + aeson base base64-bytestring bytestring containers exceptions + GLFW-b JuicyPixels lambdacube-ir mtl network OpenGLRaw text time + vector wavefront websockets + ]; homepage = "http://lambdacube3d.com"; description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; @@ -117508,6 +117577,7 @@ self: { sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring bytestring-trie elerea GLFW-b lambdacube-core lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect @@ -117538,7 +117608,6 @@ self: { homepage = "http://github.com/NorfairKing/lambdatex"; description = "Type-Safe LaTeX EDSL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdatwit" = callPackage @@ -117610,6 +117679,7 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath text transformers wave @@ -117678,8 +117748,9 @@ self: { }) {}; "language-boogie" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers, lens - , mtl, parsec, pretty, random, stream-monad, time, transformers + ({ mkDerivation, ansi-terminal, base, cmdargs, containers, filepath + , HUnit, lens, mtl, parsec, pretty, random, stream-monad, time + , transformers }: mkDerivation { pname = "language-boogie"; @@ -117692,8 +117763,8 @@ self: { transformers ]; executableHaskellDepends = [ - ansi-terminal base cmdargs containers lens mtl parsec pretty random - stream-monad time transformers + ansi-terminal base cmdargs containers filepath HUnit lens mtl + parsec pretty random stream-monad time transformers ]; homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo"; description = "Interpreter and language infrastructure for Boogie"; @@ -117702,24 +117773,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.5.0"; - sha256 = "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-c_0_6_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: @@ -117736,7 +117789,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 @@ -117745,6 +117797,7 @@ self: { pname = "language-c-comments"; version = "0.3"; sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base language-c ]; libraryToolDepends = [ alex ]; homepage = "http://github.com/ghulette/language-c-comments"; @@ -117759,12 +117812,13 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.10.0"; - sha256 = "152bh73gr6a7iahi2vsn2z4vjgbk2rd5qsmrd5wc7jrb67485n6i"; + version = "0.7.11.0"; + sha256 = "1f31yk4h507d3gl0crjrjxhc2c313i8l04sacw79m2vyvy7fqrzw"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell ]; + testHaskellDepends = [ base language-c-quote ]; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; @@ -117779,35 +117833,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7.3"; - sha256 = "0lj16igd9m3kgq41bbrs0f73m4vrys43787bizay6in1sxaxq6wf"; - revision = "1"; - editedCabalFile = "0p0ljjpgpfnj7f83cqx1pgqrdn5fkwfcca38qxv387nbq0b8zd1k"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - homepage = "http://www.drexel.edu/~mainland/"; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-c-quote_0_12" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.12"; - sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj"; + version = "0.12.1"; + sha256 = "111mvmbr9m8np5zayj95mv8bjcrgwjafq4lskq5qjs20fvskfdgc"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -117821,7 +117848,6 @@ 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 @@ -117837,9 +117863,10 @@ self: { }) {}; "language-conf" = callPackage - ({ mkDerivation, aeson, base, deepseq, directory, filepath, hspec - , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific - , semigroups, text, transformers, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , filepath, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, pretty, QuickCheck, scientific, semigroups + , text, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "language-conf"; @@ -117851,6 +117878,10 @@ self: { aeson base deepseq directory filepath megaparsec pretty scientific semigroups text unordered-containers vector ]; + executableHaskellDepends = [ + aeson base bytestring filepath megaparsec optparse-applicative + pretty text yaml + ]; testHaskellDepends = [ aeson base directory filepath hspec hspec-megaparsec megaparsec pretty QuickCheck semigroups text transformers @@ -117903,6 +117934,11 @@ self: { pretty ShellCheck split template-haskell text th-lift th-lift-instances transformers unordered-containers yaml ]; + executableHaskellDepends = [ + aeson base bytestring directory filepath free Glob mtl parsec + pretty ShellCheck 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 ShellCheck split template-haskell @@ -117930,20 +117966,18 @@ self: { }) {}; "language-ecmascript" = callPackage - ({ mkDerivation, base, containers, data-default-class, Diff - , directory, filepath, HUnit, mtl, parsec, QuickCheck + ({ mkDerivation, base, charset, containers, data-default-class + , Diff, directory, filepath, HUnit, mtl, parsec, QuickCheck , template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint }: mkDerivation { pname = "language-ecmascript"; - version = "0.17.1.0"; - sha256 = "0gl82zq50x98jzagkzdb5fgf5gnspvpx6i66g3r25mcn606ky7nz"; - revision = "2"; - editedCabalFile = "0wndi8w3nchzvsmqxy5pbxld4c18a0b3ncffqfail1dpa6i30my6"; + version = "0.17.2.0"; + sha256 = "1szn269x93k7x2r1z6aj0fqraim1f6vyb7qbg5nfkv8l0gcrz10l"; libraryHaskellDepends = [ - base containers data-default-class Diff mtl parsec QuickCheck - template-haskell testing-feat uniplate wl-pprint + base charset containers data-default-class Diff mtl parsec + QuickCheck template-haskell testing-feat uniplate wl-pprint ]; testHaskellDepends = [ base containers data-default-class Diff directory filepath HUnit @@ -117991,6 +118025,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-elm" = callPackage + ({ mkDerivation, base, HUnit, MissingH, pretty }: + mkDerivation { + pname = "language-elm"; + version = "0.0.10.1"; + sha256 = "1kp2mwl1hngpvl2hfzlf7dghcvcr407f7qc86b3zz2vgxfac0n07"; + libraryHaskellDepends = [ base MissingH pretty ]; + testHaskellDepends = [ base HUnit pretty ]; + homepage = "https://github.com/eliaslfox/language-elm#readme"; + description = "Generate elm code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-fortran" = callPackage ({ mkDerivation, alex, array, base, happy, haskell-src, parsec, syb }: @@ -118022,8 +118069,8 @@ self: { }: mkDerivation { pname = "language-glsl"; - version = "0.2.0"; - sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3"; + version = "0.2.1"; + sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec prettyclass ]; @@ -118053,6 +118100,7 @@ self: { pname = "language-guess"; version = "0.1.2"; sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers ]; description = "Guess at which language a text is written in using trigrams"; license = stdenv.lib.licenses.bsd3; @@ -118190,6 +118238,8 @@ self: { pname = "language-lua"; version = "0.10.0"; sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c"; + revision = "2"; + editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h"; libraryHaskellDepends = [ array base bytestring deepseq text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -118224,9 +118274,9 @@ self: { "language-lua2" = callPackage ({ mkDerivation, base, containers, deepseq, Earley - , lexer-applicative, microlens, QuickCheck, regex-applicative - , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck - , transformers, unordered-containers, wl-pprint + , lexer-applicative, microlens, optparse-applicative, QuickCheck + , regex-applicative, semigroups, srcloc, tasty, tasty-hunit + , tasty-quickcheck, transformers, unordered-containers, wl-pprint }: mkDerivation { pname = "language-lua2"; @@ -118239,6 +118289,9 @@ self: { regex-applicative semigroups srcloc transformers unordered-containers wl-pprint ]; + executableHaskellDepends = [ + base Earley lexer-applicative optparse-applicative srcloc wl-pprint + ]; testHaskellDepends = [ base deepseq lexer-applicative QuickCheck semigroups srcloc tasty tasty-hunit tasty-quickcheck unordered-containers @@ -118265,6 +118318,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-ninja" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , cabal-doctest, containers, deepseq, doctest, flow, ghc + , haddock-api, haddock-library, hashable, intern, lens, megaparsec + , monad-mock, mtl, optparse-generic, QuickCheck + , quickcheck-instances, semigroups, smallcheck, system-filepath + , tasty, tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck + , tasty-smallcheck, template-haskell, text, transformers, turtle + , unordered-containers, versions + }: + mkDerivation { + pname = "language-ninja"; + version = "0.2.0"; + sha256 = "08lzkvq0v3b8grji7gcfg2m714xql85k18b5wg3h0nh38wkh6m8d"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq flow hashable intern lens + megaparsec mtl QuickCheck semigroups smallcheck system-filepath + text transformers unordered-containers versions + ]; + executableHaskellDepends = [ + aeson aeson-pretty base flow lens mtl optparse-generic text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring cabal-doctest containers doctest flow ghc + haddock-api haddock-library hashable lens monad-mock mtl QuickCheck + quickcheck-instances semigroups smallcheck system-filepath tasty + tasty-html tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck + template-haskell text transformers turtle unordered-containers + versions + ]; + homepage = "https://github.com/awakesecurity/language-ninja"; + description = "A library for dealing with the Ninja build language"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-nix" = callPackage ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens , pretty, QuickCheck @@ -118356,10 +118449,11 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.7"; - sha256 = "1vjmb41hh47gmqv3g7f28rkb3lj8hqpdc7pvs6qa9f6pmqi98m4v"; + version = "1.3.8.1"; + sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring case-insensitive containers cryptonite directory either exceptions @@ -118383,7 +118477,51 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; + }) {}; + + "language-puppet_1_3_9" = 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.9"; + sha256 = "13sap5qqpinbn0cvi38kbvlny0vp1pi4xjvx8kjjwkrl30av2rx8"; + 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 + ]; + 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 = stdenv.lib.platforms.none; }) {}; "language-python" = callPackage @@ -118401,7 +118539,6 @@ self: { homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python-colour" = callPackage @@ -118433,7 +118570,6 @@ self: { homepage = "http://github.com/bjpop/language-python-test"; description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-qux" = callPackage @@ -118459,8 +118595,8 @@ self: { }: mkDerivation { pname = "language-sally"; - version = "0.1.1.0"; - sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v"; + version = "0.1.2.0"; + sha256 = "053lswpcscsx74lyfjm6g5yzckfd5fc2bvj34ps8470d8dhbphkb"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers text ]; @@ -118627,7 +118763,6 @@ self: { homepage = "https://github.com/factisresearch/large-hashable"; description = "Efficiently hash (large) Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "largeword" = callPackage @@ -118899,6 +119034,7 @@ self: { sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl OpenGLRaw pretty-show @@ -118938,6 +119074,8 @@ self: { pname = "layout-rules"; version = "0.1.0.1"; sha256 = "0d296p1lwhcyn1ziqpf0gfp5i0b6lycw7d993gbxrn7lqap7f2mh"; + revision = "1"; + editedCabalFile = "00zh22xvwg5fmycj04xsxyyxvl2zjpskcp7wcng86bbwm5kipydh"; libraryHaskellDepends = [ alex-tools base text ]; homepage = "https://github.com/elliottt/layout-rules"; description = "A collection of different layout implementations"; @@ -118959,6 +119097,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lazy-hash" = callPackage + ({ mkDerivation, base, constrained-categories, hashable + , haskell-src-meta, tagged, template-haskell, vector-space + }: + mkDerivation { + pname = "lazy-hash"; + version = "0.1.0.0"; + sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa"; + libraryHaskellDepends = [ + base constrained-categories hashable haskell-src-meta tagged + template-haskell vector-space + ]; + description = "Identifiers for not-yet-computed values"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "lazy-hash-cache" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , data-default-class, directory, filepath, hashable, lazy-hash + , microlens, microlens-th, temporary + }: + mkDerivation { + pname = "lazy-hash-cache"; + version = "0.1.0.0"; + sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring data-default-class + directory filepath hashable lazy-hash microlens microlens-th + temporary + ]; + description = "Storing computed values for re-use when the same program runs again"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "lazy-io" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -119199,6 +119371,7 @@ self: { sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-html directory filepath pandoc split ]; @@ -119232,8 +119405,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.2"; - sha256 = "0xqkf9ijghbcdypsdfd4ji9aqh43sq736db49y0kilw2hfqxj8pl"; + version = "0.6.4"; + sha256 = "0vvqzcl53d18axi3p6n9chggb2g7i2ip3wq8z5cbklkm9vb8qirc"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -119241,6 +119414,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_6_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.6.5"; + sha256 = "05mda73v91y951fc8lph2fq8nhq3q12d30xjwj5h7xqwi2c8sdiy"; + 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 = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -119281,12 +119468,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "leapseconds-announced_2017_1" = callPackage + "leapseconds-announced_2017_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; - version = "2017.1"; - sha256 = "06gn0y1nkg2wr3rnfm7f5drjfjxgaq16qayanhhdy59hdpfim70g"; + version = "2017.1.0.1"; + sha256 = "1mm8j994106gyx9p3widkydczn8wcj79m2kiymg9fjkhmxyb4fyd"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; homepage = "https://github.com/bjornbm/leapseconds-announced"; @@ -119370,6 +119557,7 @@ self: { sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers ]; homepage = "http://github.com/phaazon/leetify"; description = "Leetify text"; @@ -119429,16 +119617,17 @@ self: { "legion-discovery-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , http-client, http-types, load-balancing, resourcet, text - , transformers + , http-client, http-types, load-balancing, monad-logger, resourcet + , safe-exceptions, text, text-show, transformers }: mkDerivation { pname = "legion-discovery-client"; - version = "0.1.1.1"; - sha256 = "096zj3rc63wci6z1pqlwsmn22gn71rs1pildlizydf6xbpim0w95"; + version = "0.2.0.1"; + sha256 = "0wvm0y5gpriq17jvvczij83sh8cwkijv7w3ayx6yqkyjhwwlljdi"; libraryHaskellDepends = [ aeson base bytestring Cabal containers http-client http-types - load-balancing resourcet text transformers + load-balancing monad-logger resourcet safe-exceptions text + text-show transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/owensmurray/legion-discovery-client#readme"; @@ -119473,86 +119662,80 @@ self: { "leksah" = callPackage ({ mkDerivation, array, base, base-compat, binary, binary-shared , blaze-html, bytestring, Cabal, conduit, containers, cpphs - , deepseq, directory, executable-path, filepath, ghc - , ghcjs-codemirror, ghcjs-dom, gio, glib, gtk3, gtksourceview3 - , haskell-src-exts, hlint, hslogger, jsaddle, leksah-server, lens - , ltk, monad-loops, mtl, network, network-uri, old-time, parsec - , pretty, pretty-show, QuickCheck, regex-base, regex-tdfa - , regex-tdfa-text, shakespeare, stm, strict, text, time - , transformers, unix, utf8-string, vado, vcsgui, vcswrapper - , webkitgtk3, webkitgtk3-javascriptcore + , deepseq, directory, executable-path, filepath, fsnotify, ghc + , ghcjs-codemirror, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib + , gi-gobject, gi-gtk, gi-gtk-hs, gi-gtksource, gi-pango, gi-webkit2 + , gtk3, haskell-gi-base, haskell-gi-overloading, haskell-src-exts + , hlint, hslogger, HTTP, leksah-server, ltk, mtl, network + , network-uri, old-time, parsec, pretty, pretty-show, QuickCheck + , regex-base, regex-tdfa, regex-tdfa-text, shakespeare, split, stm + , strict, text, time, transformers, unix, utf8-string, vado, vcsgui + , vcswrapper }: mkDerivation { pname = "leksah"; - version = "0.15.2.0"; - sha256 = "01ln9rnv7af6jjcvmsd46g02g6ws5mvrgx7vvn1v67q9nx78bgj4"; - revision = "1"; - editedCabalFile = "0iqg1qlfh6knmlq29ydzp2qs75aa6a2rpl5l5fzp1b1lcsh8njdm"; + version = "0.16.2.2"; + sha256 = "11b1im02687snpw1d6bbprnczrc11s2qr8k2jvcdl5bbzi1hjnw7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-compat binary binary-shared blaze-html bytestring Cabal conduit containers cpphs deepseq directory executable-path - filepath ghc ghcjs-codemirror gio glib gtk3 gtksourceview3 - haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl - network network-uri old-time parsec pretty pretty-show QuickCheck - regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text - time transformers unix utf8-string vado vcsgui vcswrapper - webkitgtk3 webkitgtk3-javascriptcore - ]; - executableHaskellDepends = [ - base ghcjs-dom gtk3 gtksourceview3 jsaddle stm webkitgtk3 - webkitgtk3-javascriptcore - ]; - testHaskellDepends = [ - base Cabal containers glib gtk3 gtksourceview3 hslogger - leksah-server ltk monad-loops QuickCheck stm text transformers - webkitgtk3 + filepath fsnotify ghc ghcjs-codemirror gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-gtk-hs gi-gtksource gi-pango + gi-webkit2 haskell-gi-base haskell-gi-overloading haskell-src-exts + hlint hslogger HTTP leksah-server ltk mtl network network-uri + old-time parsec pretty pretty-show QuickCheck regex-base regex-tdfa + regex-tdfa-text shakespeare split stm strict text time transformers + unix utf8-string vado vcsgui vcswrapper ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ]; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gtk3 = pkgs.gnome3.gtk;}; "leksah-server" = callPackage - ({ mkDerivation, attoparsec, base, bin-package-db, binary + ({ mkDerivation, aeson, attoparsec, base, base-compat, binary , binary-shared, bytestring, Cabal, conduit, conduit-extra - , containers, deepseq, directory, executable-path, filepath, ghc - , haddock-api, haddock-library, hslogger, HTTP, HUnit, ltk, network - , network-uri, parsec, pretty, process, resourcet, strict, text - , time, transformers, unix + , containers, deepseq, directory, doctest, executable-path + , filepath, ghc, ghc-boot, haddock-api, haddock-library, hslogger + , HTTP, HUnit, ltk, network, network-uri, parsec, pretty, process + , resourcet, strict, text, time, transformers, unix }: mkDerivation { pname = "leksah-server"; - version = "0.15.2.0"; - sha256 = "0haj6pi593x0chkvkvvv6d523fmg8vd0hjzkj8sjf8h8ys0sg9k2"; + version = "0.16.2.0"; + sha256 = "0wfikbv98p29rv2cl1wwnac82g5vj1w70hy4m40vxgag3qpnr6iw"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bin-package-db binary binary-shared bytestring + aeson attoparsec base base-compat binary binary-shared bytestring Cabal conduit conduit-extra containers deepseq directory - executable-path filepath ghc haddock-api haddock-library hslogger - HTTP ltk network network-uri parsec pretty process resourcet strict - text time transformers unix + executable-path filepath ghc ghc-boot haddock-api haddock-library + hslogger HTTP ltk network network-uri parsec pretty process + resourcet strict text time transformers unix ]; executableHaskellDepends = [ - attoparsec base bin-package-db binary binary-shared bytestring - Cabal conduit conduit-extra containers deepseq directory - executable-path filepath ghc haddock-api haddock-library hslogger - HTTP ltk network network-uri parsec pretty process resourcet strict - text time transformers unix + attoparsec base base-compat binary binary-shared bytestring Cabal + conduit conduit-extra containers deepseq directory executable-path + filepath ghc ghc-boot haddock-api haddock-library hslogger HTTP ltk + network network-uri parsec pretty process resourcet strict text + time transformers unix ]; testHaskellDepends = [ - base conduit conduit-extra hslogger HUnit process resourcet - transformers + base conduit conduit-extra directory doctest filepath hslogger + HUnit process resourcet text transformers ]; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {bin-package-db = null;}; + }) {}; "lendingclub" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, HsOpenSSL @@ -119574,50 +119757,10 @@ self: { "lens" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, criterion, deepseq, directory - , distributive, doctest, exceptions, filepath, free - , generic-deriving, ghc-prim, hashable, hlint, HUnit - , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-compat, unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.15.1"; - sha256 = "19myn50qwr1f8g3cx4fvzajln428qb8iwyi4qa9p2y5rn56adyjw"; - revision = "4"; - editedCabalFile = "0f8mn6zgfclibdgy9v1ga550ysmh8biwbyvsjhi93grh5lddwmg0"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring comonad containers criterion deepseq - generic-deriving transformers unordered-containers vector - ]; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens_4_15_3" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , Cabal, cabal-doctest, comonad, containers, contravariant - , criterion, deepseq, directory, distributive, doctest, exceptions - , filepath, free, generic-deriving, ghc-prim, hashable, hlint - , HUnit, kan-extensions, mtl, nats, parallel, profunctors + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect , tagged, template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, text @@ -119626,21 +119769,21 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.15.3"; - sha256 = "0znd63nkpdndpdgpvcwnqm31v4w2d1ipkj8lnnbsabbrhywknqd2"; + version = "4.15.4"; + sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids semigroups tagged template-haskell text th-abstraction transformers transformers-compat unordered-containers vector void ]; testHaskellDepends = [ base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect test-framework test-framework-hunit + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; @@ -119651,7 +119794,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-accelerate" = callPackage @@ -119660,6 +119802,8 @@ self: { pname = "lens-accelerate"; version = "0.1.0.0"; sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4"; + revision = "1"; + editedCabalFile = "0mgh4px2gpbny3fnbxv91ml5anvq3gmxs3w3q0zgsbnhaw73w4cf"; libraryHaskellDepends = [ accelerate base lens ]; homepage = "https://github.com/tmcdonell/lens-accelerate"; description = "Instances to mix lens with accelerate"; @@ -119673,8 +119817,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2.1"; - sha256 = "07b5bh9m7brhwkpc0x3k9k4xvvs6r4g51fflsay1r4b1kl6zaabk"; + version = "0.2.2"; + sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids @@ -119693,8 +119837,10 @@ self: { }: mkDerivation { pname = "lens-aeson"; - version = "1.0.1"; - sha256 = "1g8d6a7lhg6i1v56afm6x102pcxk0dxcyh2j7qqi62vp12kamljx"; + version = "1.0.2"; + sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; + revision = "1"; + editedCabalFile = "1xkxncl218ni4idq90g6bdd7vnwxshcpa1xk11fd3kc3i3j90pqs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -119747,12 +119893,13 @@ self: { }) {}; "lens-family-th" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, hspec, lens-family, template-haskell }: mkDerivation { pname = "lens-family-th"; - version = "0.5.0.0"; - sha256 = "17lmvsj4jar5qkscz804infivv77cfx5c8yh6raxnscq1b9nm3ll"; + version = "0.5.0.1"; + sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec lens-family template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; license = stdenv.lib.licenses.bsd3; @@ -119762,8 +119909,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "lens-labels"; - version = "0.1.0.1"; - sha256 = "0yskbghzi5cqiqcrw1d6h98kd9m5i76xi6x343rflfkkng3725rl"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/google/proto-lens"; description = "Integration of lenses with OverloadedLabels"; @@ -119849,7 +119996,6 @@ self: { ]; description = "Computing lenses generically using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-text-encoding" = callPackage @@ -119877,12 +120023,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-toml-parser" = callPackage + ({ mkDerivation, base, containers, dwergaz, hlint, lens-simple + , profunctors, text, time, toml-parser + }: + mkDerivation { + pname = "lens-toml-parser"; + version = "0.1.0.0"; + sha256 = "17i3da42gahf9ni29mk369jq2pgbgdimvwszgj6dzywxv1yflldb"; + libraryHaskellDepends = [ base profunctors text time toml-parser ]; + testHaskellDepends = [ + base containers dwergaz hlint lens-simple text toml-parser + ]; + homepage = "https://github.com/xngns/lens-toml-parser"; + description = "Lenses for toml-parser"; + license = stdenv.lib.licenses.isc; + }) {}; + "lens-tutorial" = callPackage ({ mkDerivation, base, doctest, lens }: mkDerivation { pname = "lens-tutorial"; - version = "1.0.2"; - sha256 = "1dg1s44gqip77bqb76f8yyq9x20rhicdw2y2mlamzczvkgv3h9pg"; + version = "1.0.3"; + sha256 = "1x6lbmylfp1gbik32ssfq643nmkhvhliryz70fsvcmscscm0chxp"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -119970,7 +120133,6 @@ self: { homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz" = callPackage @@ -119982,7 +120144,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -120014,7 +120175,7 @@ self: { }) {}; "leveldb-haskell" = callPackage - ({ mkDerivation, base, bytestring, data-default, directory + ({ mkDerivation, async, base, bytestring, data-default, directory , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty , tasty-quickcheck, temporary, transformers }: @@ -120029,6 +120190,9 @@ self: { transformers ]; librarySystemDepends = [ leveldb ]; + executableHaskellDepends = [ + async base bytestring data-default resourcet transformers + ]; testHaskellDepends = [ base bytestring data-default directory exceptions mtl QuickCheck tasty tasty-quickcheck temporary transformers @@ -120039,9 +120203,9 @@ self: { }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage - ({ mkDerivation, base, bytestring, data-default, filepath, hspec - , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet - , transformers + ({ mkDerivation, async, base, bytestring, data-default, filepath + , hspec, hspec-expectations, leveldb, mtl, process, QuickCheck + , resourcet, transformers }: mkDerivation { pname = "leveldb-haskell-fork"; @@ -120053,6 +120217,9 @@ self: { base bytestring data-default filepath resourcet transformers ]; librarySystemDepends = [ leveldb ]; + executableHaskellDepends = [ + async base bytestring data-default resourcet transformers + ]; testHaskellDepends = [ base bytestring data-default hspec hspec-expectations mtl process QuickCheck transformers @@ -120077,7 +120244,8 @@ self: { }) {}; "levmar-chart" = callPackage - ({ mkDerivation, base, Chart, colour, data-accessor, levmar }: + ({ mkDerivation, base, Chart, colour, data-accessor, levmar, random + }: mkDerivation { pname = "levmar-chart"; version = "0.2"; @@ -120085,6 +120253,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; + executableHaskellDepends = [ + base Chart colour data-accessor levmar random + ]; description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120184,13 +120355,27 @@ self: { }) {}; "lhc" = callPackage - ({ mkDerivation }: + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , bytestring-trie, Cabal, containers, core, derive, digest + , directory, extensible-exceptions, filepath, haskell98, HUnit, mtl + , parallel, pretty, process, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck, time, unix + , xhtml + }: mkDerivation { pname = "lhc"; version = "0.10"; sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-wl-pprint base binary bytestring bytestring-trie Cabal + containers core derive digest directory extensible-exceptions + filepath haskell98 HUnit mtl parallel pretty process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck time + unix xhtml + ]; homepage = "http://lhc.seize.it/"; description = "LHC Haskell Compiler"; license = stdenv.lib.licenses.publicDomain; @@ -120219,6 +120404,7 @@ self: { sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs filepath haskell-src-exts syb uu-parsinglib ]; @@ -120236,6 +120422,7 @@ self: { sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath Glob ]; description = "Compile lhs in bird style to md, html, hs"; license = stdenv.lib.licenses.publicDomain; @@ -120284,6 +120471,7 @@ self: { pname = "libGenI"; version = "0.16.1"; sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers HUnit mtl parsec process QuickCheck ]; @@ -120397,8 +120585,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.12"; - sha256 = "04mm5va8dzxhp65q404dq44zma9x069sw9hyqmz1xj7b9cwkigwn"; + version = "1.13"; + sha256 = "0h4sas34nfql5w3mxds1j68qv4mcfjrrawxssd3rr23d1icavw2c"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -120441,6 +120629,8 @@ self: { pname = "libinfluxdb"; version = "0.0.4"; sha256 = "0gzgcczw1jz0cns9x9na8rnyrapwml2ih9x0dv28pqf9fk1bpd95"; + revision = "1"; + editedCabalFile = "17ddlql04hgah7pr0zi8zvpza17ig7a0m27wr2c47gdzy7k0nr2v"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types resource-pool stm text @@ -120475,14 +120665,13 @@ self: { ]; description = "Jenkins API interface"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liblastfm" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, hspec, hspec-expectations-lens, http-client - , http-client-tls, lens, lens-aeson, network-uri, profunctors - , semigroups, text, transformers, xml-conduit + , http-client-tls, HUnit, lens, lens-aeson, network-uri + , profunctors, semigroups, text, transformers, xml-conduit , xml-html-conduit-lens }: mkDerivation { @@ -120496,8 +120685,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring cereal containers cryptonite hspec - hspec-expectations-lens http-client http-client-tls lens lens-aeson - network-uri profunctors text transformers xml-conduit + hspec-expectations-lens http-client http-client-tls HUnit lens + lens-aeson network-uri profunctors text transformers xml-conduit xml-html-conduit-lens ]; description = "Lastfm API interface"; @@ -120521,6 +120710,7 @@ self: { pname = "liblawless"; version = "0.24.0"; sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring concurrent-machines containers containers-unicode-symbols @@ -120566,6 +120756,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; @@ -120612,8 +120803,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.6"; - sha256 = "0dy9j12mw3d2j2ixj1nq3s6g59zgwzr1xmqjvs2ysy50pd3bksxx"; + version = "0.9.0.7"; + sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -120734,7 +120925,6 @@ self: { homepage = "https://github.com/SaneTracker/librato"; description = "Bindings to the Librato API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libravatar" = callPackage @@ -120743,13 +120933,13 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.4"; - sha256 = "0b0zyavlxmh0qcfiksyshrhxrnynz3wwbg13vd64gs0i9abdxjij"; + version = "0.4.0.1"; + sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url ]; - homepage = "http://rel4tion.org/projects/libravatar/"; + homepage = "https://rel4.seek-together.space/projects/libravatar/"; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -120765,7 +120955,6 @@ self: { homepage = "https://ahakki.xyz"; description = "Use Roman Numerals as a Numeric Datatype (sort of)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libssh2" = callPackage @@ -120849,10 +121038,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.1"; - sha256 = "06rsiqlal0617lr8cnqqci9gf8plhas17kjm940vpwkcpakx28vd"; - revision = "1"; - editedCabalFile = "0g4km425r803skih1a2r1wsmmhkw7nqr9sl080m82g8pyck5wxsw"; + version = "1.4.2"; + sha256 = "0pdb4spffm4q7xxc3nd8zn4y91v5cf4xmdgb4zls3nnh579h1ygk"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe text transformers uniplate unix-bytestring unordered-containers uuid vector @@ -120861,7 +121048,6 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; "libtagc" = callPackage @@ -120870,6 +121056,7 @@ self: { pname = "libtagc"; version = "0.12.0"; sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring glib ]; librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; @@ -120891,7 +121078,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 @@ -120904,7 +121090,6 @@ self: { homepage = "https://github.com/the-real-blackh/libvorbis"; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libxls" = callPackage @@ -120990,7 +121175,6 @@ self: { executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -120999,8 +121183,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.2.0"; - sha256 = "1rbi61ficz67mifrjha02ry80s91nr6r1mzm9cfsbvz94ny4rv47"; + version = "0.2.1"; + sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121022,6 +121206,7 @@ self: { sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base GLUT OpenGL random ]; homepage = "http://github.com/sproingie/haskell-cells/"; description = "Conway's Life cellular automaton"; @@ -121137,6 +121322,7 @@ self: { sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bitmap bytestring directory filepath gloss mtl stb-image ]; @@ -121185,7 +121371,8 @@ self: { transformers ]; testHaskellDepends = [ - aeson api-builder base bytestring hspec text transformers + aeson api-builder base bytestring hspec http-client http-client-tls + http-types network text transformers ]; homepage = "https://github.com/cmoresid/lightning-haskell#readme"; description = "Haskell client for lightning-viz REST API"; @@ -121286,7 +121473,6 @@ self: { libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linda" = callPackage @@ -121316,6 +121502,7 @@ self: { editedCabalFile = "0bvcyh2mryg78kd2yrxz0g67ry4bb23xvrg7pnl0jla49wzg8pjf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring containers deepseq delay exceptions filepath hashable hedis http-types lens monad-supply mtl @@ -121344,30 +121531,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 = "2.2.0"; - sha256 = "1a4pfrkx1szq5mg9m539waakkkavnv4yhhhs3akgman8rjfbn8mb"; - 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_3_1_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -121389,7 +121552,6 @@ self: { homepage = "https://github.com/noraesae/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -121444,8 +121606,10 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.20.6"; - sha256 = "1xcr36g6rr7k0vlzsh6szzxxrdi1f6vb9sxdilcpsb8xjvkk258m"; + version = "1.20.7"; + sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; + revision = "1"; + editedCabalFile = "0ghmlkk5cy0pylx47rwr37p403ml7x6sg0sapz9c7534nzzhxq0g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -121463,25 +121627,33 @@ self: { }) {}; "linear-accelerate" = callPackage - ({ mkDerivation, accelerate, base, lens, linear }: - mkDerivation { - pname = "linear-accelerate"; - version = "0.2"; - sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6"; - libraryHaskellDepends = [ accelerate base lens linear ]; - homepage = "http://github.com/ekmett/linear-accelerate/"; - description = "Instances to use linear vector spaces on accelerate backends"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linear-accelerate_0_4" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear }: mkDerivation { pname = "linear-accelerate"; - version = "0.4"; - sha256 = "03pma42zkk6cfisyfsjmb8496jkfqiab3my4wdahk8z9shmqa3rg"; + 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" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.5"; + sha256 = "1whgf5bxl8knh04n7brgy7a7awdsxkyvkrqqpskyiii5bya21q7r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -121556,6 +121728,7 @@ self: { sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers HUnit ]; description = "Finite maps for linear use"; license = stdenv.lib.licenses.bsd3; @@ -121621,7 +121794,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 @@ -121670,15 +121842,14 @@ self: { homepage = "http://ariis.it/static/articles/linebreak/page.html"; description = "breaks strings to fit width"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linguistic-ordinals" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "linguistic-ordinals"; - version = "0.1.0.1"; - sha256 = "02sl3jbfpbb77a6g4g9gj7a6mba804fqjx5d21ix8c8rzakavh38"; + version = "0.1.0.2"; + sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik"; libraryHaskellDepends = [ base text ]; homepage = "http://github.com/argiopetech/linguistic-ordinals"; description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)"; @@ -121710,6 +121881,7 @@ self: { sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base gtk haskell98 popenhs regex-compat unix ]; @@ -121727,6 +121899,7 @@ self: { sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers extcore filepath process ]; @@ -121793,7 +121966,6 @@ self: { homepage = "https://github.com/hlian/linklater"; description = "A Haskell library for the Slack API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode" = callPackage @@ -121816,7 +121988,6 @@ self: { homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode-v4" = callPackage @@ -121951,6 +122122,7 @@ self: { sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers mtl pretty ]; @@ -122072,6 +122244,7 @@ self: { sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring conduit filepath http-types lio simple simple-templates text wai wai-extra warp @@ -122171,10 +122344,11 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.0"; - sha256 = "1jwh46z9d7ll380fygdk90zic9br723aag82w1cgllc1r5m8kqib"; + version = "0.8.0.1"; + sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base bifunctors binary bytestring Cabal cereal cmdargs containers data-default deepseq Diff directory exceptions filepath @@ -122196,6 +122370,7 @@ 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 @@ -122300,6 +122475,9 @@ self: { libraryHaskellDepends = [ ansi-terminal base data-default stm terminal-size vty ]; + executableHaskellDepends = [ + ansi-terminal base data-default stm terminal-size vty + ]; testHaskellDepends = [ ansi-terminal base data-default hspec stm terminal-size vty ]; @@ -122340,8 +122518,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1"; - sha256 = "05ccx0l6rc97ls0jy7hfma5g0fa10s0h0kik1m596lk41776i6ji"; + version = "1.0.0.1"; + sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa"; libraryHaskellDepends = [ base base-prelude mmorph monad-control mtl transformers transformers-base @@ -122429,7 +122607,6 @@ self: { homepage = "https://github.com/nikita-volkov/list-t-libcurl"; description = "A \"libcurl\"-based streaming HTTP client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-text" = callPackage @@ -122457,8 +122634,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.1"; - sha256 = "0sjhhvdysfi9a70bkx3iwi81i5fyhak6jzxizlcqvc2x6vd79x95"; + version = "1.0.3"; + sha256 = "13pasfggjbzldy85d0kaydw95myxna63299k021fmbaifz26q2fx"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; @@ -122483,7 +122660,6 @@ 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 @@ -122498,6 +122674,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "listenbrainz-client" = callPackage + ({ mkDerivation, aeson, base, free, freer-effects, http-client + , kan-extensions, mtl, servant, servant-client, text, time + , transformers + }: + mkDerivation { + pname = "listenbrainz-client"; + version = "1.0.1"; + sha256 = "0xrya35nwfkcx0dd5pislm8kw0pxfsh2azjk0yd7yn1668y2zrxd"; + libraryHaskellDepends = [ + aeson base free freer-effects http-client kan-extensions mtl + servant servant-client text time transformers + ]; + homepage = "https://github.com/ocharles/listenbrainz-client"; + description = "A client library to the ListenBrainz project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "listlike-instances" = callPackage ({ mkDerivation, base, bytestring, ListLike, text, vector }: mkDerivation { @@ -122578,10 +122772,11 @@ self: { }: mkDerivation { pname = "live-sequencer"; - version = "0.0.5.2"; - sha256 = "1qcjs56mfj62pvgv7ab1c2q7ya6ykaw1sixak43iprpviwa3i3w4"; + version = "0.0.6"; + sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base event-list non-negative ]; executableHaskellDepends = [ alsa-core alsa-seq base bytestring cgi concurrent-split containers @@ -122593,7 +122788,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liveplot" = callPackage @@ -122732,6 +122926,7 @@ self: { pname = "llvm-base-types"; version = "0.3.0"; sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers deepseq dwarf failure GenericPretty graphviz hashable pretty regex-tdfa text transformers unordered-containers @@ -122931,31 +123126,9 @@ self: { homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; "llvm-hs-pure" = callPackage - ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit - , template-haskell, transformers, transformers-compat - }: - mkDerivation { - pname = "llvm-hs-pure"; - version = "4.0.0.0"; - sha256 = "1z9r0qfzj738g0l8f5lbn5lx122p4gyg4gg9njpxjnwmmi532lkl"; - libraryHaskellDepends = [ - base containers mtl parsec template-haskell transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers mtl tasty tasty-hunit transformers - transformers-compat - ]; - homepage = "http://github.com/llvm-hs/llvm-hs/"; - description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "llvm-hs-pure_4_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, mtl , tasty, tasty-hunit, tasty-quickcheck, template-haskell , transformers, transformers-compat @@ -122975,7 +123148,6 @@ self: { 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 @@ -123005,6 +123177,7 @@ self: { sha256 = "1ynxkdaanw3nxpsgfcjg6wsz6jgxszp239xhssyzasz59qhw64rr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base Cabal explicit-exception process transformers utility-ht ]; @@ -123024,9 +123197,10 @@ self: { }) {}; "llvm-pretty-bc-parser" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, fgl, fgl-visualize, filepath, llvm-pretty, monadLib - , pretty, process + ({ mkDerivation, abstract-par, array, base, bytestring, cereal + , containers, deepseq, directory, fgl, fgl-visualize, filepath + , llvm-pretty, monad-par, monadLib, pretty, process, random + , temporary, time, transformers, xml }: mkDerivation { pname = "llvm-pretty-bc-parser"; @@ -123039,8 +123213,9 @@ self: { pretty ]; executableHaskellDepends = [ - array base bytestring cereal containers fgl fgl-visualize - llvm-pretty monadLib pretty + abstract-par array base bytestring cereal containers deepseq + directory fgl fgl-visualize filepath llvm-pretty monad-par monadLib + pretty process random temporary time transformers xml ]; testHaskellDepends = [ base bytestring directory filepath llvm-pretty process @@ -123081,6 +123256,7 @@ self: { sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory filemanip filepath graphviz llvm-analysis llvm-data-interop parallel-io xml @@ -123131,6 +123307,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lmdb-simple" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, lmdb + , QuickCheck, serialise + }: + mkDerivation { + pname = "lmdb-simple"; + version = "0.3.1.0"; + sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn"; + libraryHaskellDepends = [ base bytestring lmdb serialise ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/verement/lmdb-simple#readme"; + description = "Simple API for LMDB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lmonad" = callPackage ({ mkDerivation, base, containers, exceptions, HUnit, monad-control , transformers, transformers-base @@ -123212,11 +123404,11 @@ self: { ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }: mkDerivation { pname = "loc"; - version = "0.1.2.3"; - sha256 = "064q3hyjnfpa2r2290604m9pcgh9l1g9fbap176d3n7xknn3lvcc"; + version = "0.1.3.1"; + sha256 = "0irwsh3ib9rb1h6chs060vzr7bhczqb3qxrizxvsqiymgd1yjjgx"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog loc-test ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/loc"; description = "Types representing line and column positions and ranges in text files"; license = stdenv.lib.licenses.asl20; }) {}; @@ -123225,10 +123417,10 @@ self: { ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.2.1"; - sha256 = "0l75qvhxhppg2vw90fx5g6rg98zy83dx0hd2v9ad799fp4mk6qai"; + version = "0.1.3.1"; + sha256 = "0z2d1fi77msbgzipz87q32z5fmfb6aj923j2wh1565qbjaf7qjxx"; libraryHaskellDepends = [ base containers hedgehog loc ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/loc"; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; }) {}; @@ -123253,6 +123445,7 @@ self: { pname = "local-search"; version = "0.0.7"; sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; @@ -123278,8 +123471,8 @@ self: { ({ mkDerivation, base, criterion }: mkDerivation { pname = "located-base"; - version = "0.1.1.0"; - sha256 = "17ym69bxjic63mj5g37ycp9vw7vy9x000wmddc5q5jbyr20n1ac3"; + version = "0.1.1.1"; + sha256 = "1f8k78p7nx7dbrjrkx6ff8d02a0zspg1pc1y3whqbxrhm0ynl1ay"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/gridaphobe/located-base"; @@ -123298,7 +123491,6 @@ 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 @@ -123370,7 +123562,6 @@ 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 @@ -123417,31 +123608,6 @@ self: { }) {}; "log" = callPackage - ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions - , http-client, http-types, log-base, log-elasticsearch - , log-postgres, process, random, tasty, tasty-hunit, text, time - , transformers - }: - mkDerivation { - pname = "log"; - version = "0.7"; - sha256 = "06z5fqixyvz4dj0g6ps00pbm7n4ix2cg2lxq5j7q7nbnrrkymnk7"; - revision = "1"; - editedCabalFile = "070i5xqgg6k09i8lsn0gbyh4j86wf6fd9x8fzvzyrhwbmz32s875"; - libraryHaskellDepends = [ - base log-base log-elasticsearch log-postgres - ]; - testHaskellDepends = [ - aeson base bloodhound bytestring exceptions http-client http-types - process random tasty tasty-hunit text time transformers - ]; - homepage = "https://github.com/scrive/log"; - description = "Structured logging solution with multiple backends"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "log_0_9_0_1" = callPackage ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg , exceptions, hpqtypes, http-client, http-types, log-base , log-elasticsearch, log-postgres, process, random, tasty @@ -123471,17 +123637,19 @@ self: { "log-base" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq - , exceptions, monad-control, monad-time, mtl, semigroups, stm, text - , time, transformers-base, unordered-containers + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unordered-containers }: mkDerivation { pname = "log-base"; - version = "0.7.1.1"; - sha256 = "0kxng0pvql8sv4wk3x1bx0a0mqjsr3ynbixps9l1zrmsisp01344"; + version = "0.7.2.0"; + sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds"; + revision = "1"; + editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring deepseq exceptions monad-control - monad-time mtl semigroups stm text time transformers-base - unordered-containers + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unordered-containers ]; homepage = "https://github.com/scrive/log"; description = "Structured logging solution (base package)"; @@ -123496,8 +123664,10 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.11.1"; - sha256 = "0zbwnx6bs417g67m0hr9n4lk9iwpcm0ivmfhjgaz98hryxx3s8wc"; + version = "0.11.2"; + sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd"; + revision = "1"; + editedCabalFile = "0frl4vwwlkfvz73pkiay4qh1vm576z4kj2gsbbq1za6b6pya4qhw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -123529,29 +123699,6 @@ self: { }) {}; "log-elasticsearch" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, deepseq, http-client, log-base - , semigroups, text, text-show, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "log-elasticsearch"; - version = "0.7"; - sha256 = "1drb28jdl9b4d62x5bprqv8ccs1zy31wwwrrai9295sl1jm2c8xz"; - revision = "1"; - editedCabalFile = "0ddiwm479a0l8mrr73ipl8db0valpfx2dppxd4w1pilbj1brzgdj"; - libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bloodhound bytestring - deepseq http-client log-base semigroups text text-show time - transformers unordered-containers vector - ]; - homepage = "https://github.com/scrive/log"; - description = "Structured logging solution (Elasticsearch back end)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "log-elasticsearch_0_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bloodhound, bytestring, deepseq, http-client, http-client-tls , log-base, semigroups, text, text-show, time, transformers @@ -123559,8 +123706,10 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.9.0.1"; - sha256 = "01xfr3rq3s1zp7fw60857c4jvlliy6v9dzx6sip3sbzl3b4hcg1x"; + version = "0.9.1.0"; + sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5"; + revision = "1"; + editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -123569,7 +123718,6 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -123580,8 +123728,10 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.0.1"; - sha256 = "0gfb7xss31fqjlvxs8pywlhzmckgz98srimwhsp819mb9vrysjrn"; + version = "0.7.0.2"; + sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; + revision = "1"; + editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -123596,20 +123746,20 @@ self: { "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config - , lifted-base, log, monad-control, random, text, time, transformers - , transformers-base, unjson, vector, wai, warp + , lifted-base, log-base, monad-control, random, text, time + , transformers, transformers-base, unjson, vector, wai, warp }: mkDerivation { pname = "log-utils"; - version = "0.2.2"; - sha256 = "121nxm72jxixq71dm4yg6l896inhw97c6j7kdczv7svdqr827qbz"; + version = "0.2.2.1"; + sha256 = "151dgpkcc0hmsjw3vw13zzgqlww1mzh61k87hksfcd7dqvgcvmkj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring cmdargs data-default exceptions hpqtypes - http-types invariant kontra-config lifted-base log monad-control - random text time transformers transformers-base unjson vector wai - warp + http-types invariant kontra-config lifted-base log-base + monad-control random text time transformers transformers-base + unjson vector wai warp ]; homepage = "https://github.com/scrive/log-utils"; description = "Utils for working with logs"; @@ -123627,8 +123777,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.1.2"; - sha256 = "0j17ylwga4vw0f0hahpmvm3nhk6s274m0msjv0r9jx6a6jx1wsmn"; + version = "1.1.4"; + sha256 = "1q9n0b0dwdkpvmpk60s65sw8z25k9nbybwnrfv6k0ifdjs86x6lh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123646,7 +123796,6 @@ self: { homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -123754,29 +123903,6 @@ self: { }) {}; "logging-effect" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , semigroups, stm, stm-delay, text, time, transformers - , transformers-base, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect"; - version = "1.1.3"; - sha256 = "053rpry8fagfnf3c05gjidjk0r319d7v81n8qk5wgb3lj7n39ahf"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl semigroups stm - stm-delay text time transformers transformers-base wl-pprint-text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text - ]; - homepage = "https://github.com/ocharles/logging-effect"; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_2_0" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , semigroups, stm, stm-delay, text, time, transformers @@ -123797,24 +123923,9 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage - ({ mkDerivation, base, hspec, template-haskell, transformers }: - mkDerivation { - pname = "logging-facade"; - version = "0.1.1"; - sha256 = "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0"; - revision = "1"; - editedCabalFile = "1cm2q8l033w1bwi30mzsz0knr8pqxcb4f5c38594rdm96r9h12gw"; - libraryHaskellDepends = [ base template-haskell transformers ]; - testHaskellDepends = [ base hspec ]; - description = "Simple logging abstraction that allows multiple back-ends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-facade_0_3_0" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { pname = "logging-facade"; @@ -123825,7 +123936,6 @@ self: { homepage = "https://github.com/sol/logging-facade#readme"; description = "Simple logging abstraction that allows multiple back-ends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade-journald" = callPackage @@ -123845,7 +123955,6 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade-syslog" = callPackage @@ -123963,7 +124072,6 @@ self: { homepage = "https://github.com/sol/logsink#readme"; description = "A logging framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lojban" = callPackage @@ -124110,6 +124218,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A library for benchmarking ."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-calculus" = callPackage @@ -124151,6 +124260,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A fast C++ backend for ."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-repa" = callPackage @@ -124171,6 +124281,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A repa backend for ."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-tests" = callPackage @@ -124191,6 +124302,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A library for testing ."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-typing" = callPackage @@ -124226,6 +124338,7 @@ self: { pname = "loli"; version = "2011.6.24"; sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default hack hack-contrib mps mtl template utf8-string @@ -124345,6 +124458,7 @@ self: { sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec-conduit base bytestring case-insensitive conduit conduit-extra data-default directory @@ -124443,20 +124557,19 @@ self: { }) {}; "loup" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-swf, base, basic-prelude - , bytestring, conduit, lifted-async, lifted-base, optparse-generic - , preamble, shakers, time, turtle, unordered-containers, uuid, yaml + ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring + , conduit, lifted-async, lifted-base, optparse-generic, preamble + , shakers, time, turtle, unordered-containers, uuid, yaml }: mkDerivation { pname = "loup"; - version = "0.0.10"; - sha256 = "0j65vx9cpn0q1zhcz4wsk86wnqlmr2m8dkqgzy2scm7chfd2hbhv"; + version = "0.0.15"; + sha256 = "1pb2ka69vpv9x318b80dcgk72g6r4s24j9n8dcjg0ibw6cxsn5fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka amazonka-swf base basic-prelude bytestring conduit - lifted-async lifted-base preamble time turtle unordered-containers - uuid yaml + aeson amazonka amazonka-swf base bytestring conduit lifted-async + lifted-base preamble time turtle unordered-containers uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/loup"; @@ -124493,7 +124606,6 @@ self: { ]; description = "An EDSL for diagrams based based on linear constraints"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lp-diagrams-svg" = callPackage @@ -124511,6 +124623,9 @@ self: { base containers FontyFruity gasp JuicyPixels lens linear lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector ]; + executableHaskellDepends = [ + base containers FontyFruity gasp lens lp-diagrams + ]; description = "SVG Backend for lp-diagrams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -124652,7 +124767,6 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -124673,26 +124787,29 @@ self: { homepage = "https://github.com/achirkin/qua-kit"; description = "Partial implementation of a service provider for LTI 1.1."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltk" = callPackage - ({ mkDerivation, base, Cabal, containers, filepath, ghc, glib, gtk3 - , mtl, parsec, pretty, text, transformers + ({ mkDerivation, base, base-compat, Cabal, containers, filepath + , ghc, gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gtk, gi-gtk-hs + , gtk3, haskell-gi-base, haskell-gi-overloading, mtl, parsec + , pretty, text, transformers }: mkDerivation { pname = "ltk"; - version = "0.15.0.5"; - sha256 = "18niv2rr06nms5g7vjk7ki52s7dfbkdbw52w55p79s9n6gj1q424"; + version = "0.16.1.0"; + sha256 = "00vxsp5w38wv12wl09z6wa72kpczd6k5g9m02clshaq3ai6cyg1a"; libraryHaskellDepends = [ - base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text - transformers + base base-compat Cabal containers filepath ghc gi-cairo gi-gdk + gi-glib gi-gobject gi-gtk gi-gtk-hs haskell-gi-base + haskell-gi-overloading mtl parsec pretty text transformers ]; + libraryPkgconfigDepends = [ gtk3 ]; homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gtk3 = pkgs.gnome3.gtk;}; "ltl" = callPackage ({ mkDerivation, base, vcd }: @@ -124714,6 +124831,8 @@ self: { pname = "lua-bc"; version = "0.1.1"; sha256 = "0bp0j181j2zr2xw6mpj4f17998bmh6qs0y7xbimxz4nh7bf8chba"; + revision = "1"; + editedCabalFile = "1bp54qza0pncf4r8dwavxqls2zfvcxavpsvj7sxr52yiz8nisink"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -124854,6 +124973,7 @@ self: { sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base64-bytestring blaze-html bson bytestring compact-string-fix feed happstack happstack-server HTTP mongoDB mtl @@ -124914,6 +125034,7 @@ self: { pname = "luka"; version = "2012.8.29"; sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air base bytestring libffi ]; librarySystemDepends = [ objc ]; homepage = "https://github.com/nfjinjing/luka"; @@ -125158,30 +125279,29 @@ self: { doHaddock = false; description = "liblzma C library and headers for use by LZMA bindings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit - , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers + ({ 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.1"; - sha256 = "0bb1ilwb0v4b79gbaz1ckykmqg43y805m00y4w498768wbn1l61c"; + version = "1.1.3.3"; + sha256 = "19bdjgr394cji254y2qp1ibdiyqlys2vf0g1v9psi4cqcdlhdk0p"; libraryHaskellDepends = [ base bindings-DSL bytestring conduit resourcet transformers ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ - base bytestring conduit HUnit QuickCheck resourcet test-framework - test-framework-hunit test-framework-quickcheck2 + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lzma;}; "lzma-enumerator" = callPackage @@ -125332,7 +125452,6 @@ self: { homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines" = callPackage @@ -125343,10 +125462,10 @@ self: { }: mkDerivation { pname = "machines"; - version = "0.6.2"; - sha256 = "0p346dr68qmaiyhfn697nb13fwl07f5b945bihfwk7r8pjsl6l0w"; + version = "0.6.3"; + sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; revision = "1"; - editedCabalFile = "1aj0admkxs91x3bax0rsz073m8rpfingrwggj3hi4f7zprmynjj1"; + editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -125476,6 +125595,7 @@ self: { pname = "macho"; version = "0.22"; sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://github.com/erikcharlebois/macho"; description = "Parser for Mach-O object format"; @@ -125559,8 +125679,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.3.2.0"; - sha256 = "0cg38m9ji0l8kv3sqqhwbvn57all0h9652acjdhhcg3n98hxpam6"; + version = "2.4.0.2"; + sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125587,6 +125707,7 @@ self: { sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers mtl random ]; executableSystemDepends = [ ncurses ]; homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz"; @@ -125680,6 +125801,7 @@ self: { sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ConfigFile containers curl directory happstack-state MissingH mtl network old-time regex-posix tagsoup utf8-string XMPP @@ -125701,6 +125823,7 @@ self: { sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ air air-th base bytestring containers data-default directory filepath hack2 hack2-contrib hack2-handler-snap-server moe process @@ -125800,18 +125923,6 @@ self: { }) {}; "mainland-pretty" = callPackage - ({ mkDerivation, base, containers, srcloc, text }: - mkDerivation { - pname = "mainland-pretty"; - version = "0.4.1.4"; - sha256 = "175gbycqnmnjiqx2mfr9x9gqafx4s2abg6n681kh0knqkl8nnlmn"; - libraryHaskellDepends = [ base containers srcloc text ]; - homepage = "http://www.cs.drexel.edu/~mainland/"; - description = "Pretty printing designed for printing source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mainland-pretty_0_6_1" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; @@ -125823,7 +125934,6 @@ self: { homepage = "https://github.com/mainland/mainland-pretty"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "majordomo" = callPackage @@ -125900,6 +126010,7 @@ self: { sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ async base bytestring configurator containers directory filepath github haskeline lens lens-datetime mtl process text time @@ -125924,19 +126035,6 @@ self: { }) {}; "makefile" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: - mkDerivation { - pname = "makefile"; - version = "0.1.1.0"; - sha256 = "0pij78vl506n7m65p8hg7rlinqmswh28bjlx1cwy884righb3jiw"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; - homepage = "http://github.com/nmattia/mask"; - description = "Simple Makefile parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "makefile_1_0_0_4" = callPackage ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text }: mkDerivation { @@ -125950,7 +126048,6 @@ self: { homepage = "http://github.com/nmattia/mask"; description = "Simple Makefile parser and generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "managed" = callPackage @@ -126042,6 +126139,7 @@ self: { sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers dbus-client derive filepath gtk manatee-core mtl stm text utf8-string webkit @@ -126087,6 +126185,7 @@ self: { sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers curl dbus-client dbus-core derive directory filepath gio glib gtk manatee-core mtl network old-locale @@ -126108,6 +126207,7 @@ self: { sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers dbus-client dbus-core derive filepath gtk gtksourceview2 manatee-core regex-tdfa stm text @@ -126128,6 +126228,7 @@ self: { sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers dbus-client derive filepath gio glib gtk manatee-core mtl old-locale old-time stm text utf8-string @@ -126148,6 +126249,7 @@ self: { sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers dbus-client derive filepath gio glib gtk gtkimageview manatee-core regex-tdfa stm text utf8-string @@ -126170,6 +126272,7 @@ self: { sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring Cabal containers curl dbus-client dbus-core derive fastirc filepath ghc GoogleTranslate groom gtk @@ -126192,6 +126295,7 @@ self: { sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers dbus-client dbus-core derive filepath gio gtk libtagc manatee-core process random regex-tdfa stm @@ -126213,6 +126317,7 @@ self: { sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary cairo containers dbus-client derive filepath gtk manatee-core mtl poppler stm text utf8-string @@ -126232,6 +126337,7 @@ self: { sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers dbus-client derive filepath gtk manatee-core proc stm text @@ -126252,6 +126358,7 @@ self: { sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers curl dbus-client derive download-curl feed filepath gtk manatee-core stm text utf8-string webkit @@ -126291,6 +126398,7 @@ self: { sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers dbus-client derive filepath gtk manatee-core stm text unix vte @@ -126368,6 +126476,7 @@ self: { sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath GLUT hslua time ]; @@ -126500,7 +126609,6 @@ self: { ]; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mappy" = callPackage @@ -126513,6 +126621,7 @@ self: { sha256 = "0ic6jcdsx71qnclv1xvpk812n1fvwm1mvwlj7b2jx5qwvbibvpci"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base containers directory haskeline parsec ]; @@ -126602,7 +126711,6 @@ self: { libraryHaskellDepends = [ base monads-tf papillon ]; description = "markdown parser with papillon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markdown-unlit" = callPackage @@ -126716,7 +126824,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -126730,6 +126837,7 @@ self: { sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl pandoc temporary text transformers webkit @@ -126740,10 +126848,10 @@ self: { }) {}; "marmalade-upload" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, directory - , exceptions, filepath, http-client, http-client-tls, http-types - , keyring, mtl, network, optparse-applicative, tasty, tasty-hunit - , text, transformers + ({ mkDerivation, aeson, base, bytestring, Cabal, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-types, keyring, mtl, network, optparse-applicative, process + , shake, split, tasty, tasty-hunit, text, transformers, zip-archive }: mkDerivation { pname = "marmalade-upload"; @@ -126756,8 +126864,9 @@ self: { http-types mtl network text transformers ]; executableHaskellDepends = [ - aeson base bytestring data-default directory filepath keyring - optparse-applicative text transformers + aeson base bytestring Cabal data-default directory filepath keyring + optparse-applicative process shake split text transformers + zip-archive ]; testHaskellDepends = [ aeson base exceptions tasty tasty-hunit text transformers @@ -126838,6 +126947,7 @@ self: { editedCabalFile = "1aszssi82ap0y6bkviv3vn6cdh3vb0pv1znvs2z5k52r4wwa8h55"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring conduit configurator deepseq hashable haskeline http-client http-client-tls http-types irc-conduit lens @@ -126854,7 +126964,6 @@ 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 @@ -126876,8 +126985,8 @@ self: { "marxup" = callPackage ({ mkDerivation, base, configurator, containers, directory, dlist - , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl - , parsek, pretty, process, text + , filepath, graphviz, haskell-src-exts, labeled-tree, lens + , lp-diagrams, mtl, parsek, pretty, process, text }: mkDerivation { pname = "marxup"; @@ -126885,16 +126994,16 @@ self: { sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath haskell-src-exts labeled-tree lens lp-diagrams mtl process text ]; executableHaskellDepends = [ - base configurator dlist parsek pretty + base configurator dlist graphviz lens lp-diagrams parsek pretty ]; description = "Markup language preprocessor for Haskell"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "masakazu-bot" = callPackage @@ -126921,6 +127030,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "master-plan" = callPackage + ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific + , hspec, megaparsec, mtl, optparse-applicative, QuickCheck + , quickcheck-instances, random, random-shuffle, syb, text + }: + mkDerivation { + pname = "master-plan"; + version = "0.3.1"; + sha256 = "1gkbvs4jl5y4pl699ncwfdl3syhyss51adkjm8mszr18w9jlhs34"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base diagrams diagrams-lib diagrams-rasterific megaparsec mtl syb + text + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ + base hspec mtl QuickCheck quickcheck-instances random + random-shuffle text + ]; + homepage = "https://github.com/rodrigosetti/master-plan"; + description = "The project management tool for hackers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mastermind" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -127001,6 +127136,7 @@ self: { sha256 = "1mbbf0fljaiakw0hw72wsyc1isvylrr7q7wjcyac250lflbkg9dv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring ConfigFile containers data-default deepseq directory either filepath fsnotify HStringTemplate HTTP http-server @@ -127026,6 +127162,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mathflow" = callPackage + ({ mkDerivation, base, doctest, hspec, hspec-server, process + , QuickCheck, shakespeare, singletons, template-haskell, text + }: + mkDerivation { + pname = "mathflow"; + version = "0.1.0.0"; + sha256 = "175r5h1g5dxh1xaxnmy0l0m91433prvd6d32r6pqn9alf6jlm4fd"; + libraryHaskellDepends = [ + base process singletons template-haskell + ]; + testHaskellDepends = [ + base doctest hspec hspec-server QuickCheck shakespeare singletons + template-haskell text + ]; + homepage = "https://github.com/junjihashimoto/mathflow#readme"; + description = "Dependently typed tensorflow modeler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mathgenealogy" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup @@ -127101,28 +127257,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.4.5"; - sha256 = "0f8bahj7i6nxdg5yyn1mn7vq9bw85bvikzvi21zzvijpicwyszz5"; - 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_5_0" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath , process, random, raw-strings-qq, split, tasty , tasty-expected-failure, tasty-golden, tasty-hunit, temporary @@ -127150,8 +127284,8 @@ self: { }: mkDerivation { pname = "matrices"; - version = "0.4.4"; - sha256 = "1virsmh7rwrb3kf9wrvkwj718dp989ji43xyvxx2bnvi3lr11wah"; + version = "0.4.5"; + sha256 = "15vkkd3jwfdp648lfhskzhnisb1bzqia3asw8fmanpk71l9nyf9d"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector @@ -127196,6 +127330,7 @@ self: { pname = "matrix-market-attoparsec"; version = "0.1.0.8"; sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring exceptions scientific ]; @@ -127229,6 +127364,7 @@ self: { sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ConfigFile containers directory MissingH mtl network old-locale split time vty vty-ui XMPP @@ -127240,28 +127376,27 @@ self: { }) {}; "matterhorn" = callPackage - ({ mkDerivation, base, base-compat, brick, bytestring, cheapskate - , checkers, config-ini, connection, containers, directory, filepath - , gitrev, hashable, Hclip, mattermost-api, mattermost-api-qc - , microlens-platform, mtl, process, quickcheck-text, stm, strict + ({ mkDerivation, aspell-pipe, base, base-compat, brick, bytestring + , cheapskate, checkers, config-ini, connection, containers + , directory, filepath, gitrev, hashable, Hclip, mattermost-api + , mattermost-api-qc, microlens-platform, mtl, process + , quickcheck-text, skylighting, stm, stm-delay, strict , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, transformers, Unique + , temporary, text, text-zipper, time, transformers, Unique, unix , unordered-containers, utf8-string, vector, vty, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "30802.1.0"; - sha256 = "0sn8r6yaq2mc034dp9ib5gfcvw30p1a2frqkcmk9f9bjk22r5ix9"; - revision = "2"; - editedCabalFile = "1jrnxx144ckngbvk7sr3sw9im8a2w57dzqwzvdpxr2ql3hanwf2c"; + version = "40000.0.2"; + sha256 = "1lsxadkhvk8bylpc0sh1pmkldv8m17fpi96zkihdpchpwhw1i8jn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base base-compat brick bytestring cheapskate config-ini connection - containers directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl process stm strict temporary text - text-zipper time transformers unordered-containers utf8-string - vector vty xdg-basedir + aspell-pipe base base-compat brick bytestring cheapskate config-ini + connection containers directory filepath gitrev hashable Hclip + mattermost-api microlens-platform mtl process skylighting stm + stm-delay strict temporary text text-zipper time transformers unix + unordered-containers utf8-string vector vty xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -127271,35 +127406,37 @@ self: { tasty-quickcheck text text-zipper time transformers Unique unordered-containers vector vty xdg-basedir ]; - description = "Terminal client for the MatterMost chat system"; + description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mattermost-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, containers - , cryptonite, gitrev, hashable, HTTP, HUnit, memory, microlens + ({ mkDerivation, aeson, base, binary, bytestring, connection + , containers, gitrev, hashable, HTTP, HUnit, memory, microlens , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty , tasty-hunit, template-haskell, text, time, unordered-containers , websockets }: mkDerivation { pname = "mattermost-api"; - version = "30802.1.0"; - sha256 = "0bbg37aj6jxrdvy1zx9q143s7gjhx5dnba9y8vyjcfgypyzlggsv"; + version = "40000.0.1"; + sha256 = "0phykn8h08yprmpds92cp6snraxg66hbh553b8da5v47dn06y8mv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring connection containers cryptonite gitrev - hashable HTTP memory microlens microlens-th network-uri pretty-show - process stm template-haskell text time unordered-containers - websockets + aeson base binary bytestring connection containers gitrev hashable + HTTP memory microlens microlens-th network-uri pretty-show process + stm template-haskell text time unordered-containers websockets + ]; + executableHaskellDepends = [ + aeson base connection pretty-show process text unordered-containers ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit text unordered-containers ]; - description = "Client API for MatterMost chat system"; + description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -127310,8 +127447,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "30802.1.0"; - sha256 = "0rld7i62z66w0c0jfrk6kj7a8ha6hczmavdy3qss14p3z651l8p3"; + version = "40000.0.1"; + sha256 = "0444m1349gpyffpjlvf9faz4sia5kfsry9q174n6b60ch85w1ilg"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -127429,6 +127566,7 @@ self: { sha256 = "0vv4y1a0z2vsg7jakqphn9z4agyir8m3l90a680bm549zkw7blhw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols boxes containers containers-unicode-symbols fgl HaLeX indentparser mtl parsec @@ -127476,8 +127614,8 @@ self: { ({ mkDerivation, base, safe, text, time, time-locale-compat }: mkDerivation { pname = "mbox"; - version = "0.3.3"; - sha256 = "1r8r5y2a69aralqz3mjhkq9dnb9jq1z1v1s2y1dpvx2alapkw2h8"; + version = "0.3.4"; + sha256 = "1pkiagxb013an71d3si3kldgn7rl9l5zi2s3s6hjhfg0pcwbbr6w"; libraryHaskellDepends = [ base safe text time time-locale-compat ]; description = "Read and write standard mailbox files"; license = stdenv.lib.licenses.bsd3; @@ -127485,7 +127623,7 @@ self: { "mbox-tools" = callPackage ({ mkDerivation, base, bytestring, codec-mbox, containers, fclabels - , hsemail, mtl, parsec, process, pureMD5 + , hsemail, mtl, parsec, process, pureMD5, random }: mkDerivation { pname = "mbox-tools"; @@ -127495,7 +127633,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring codec-mbox containers fclabels hsemail mtl parsec - process pureMD5 + process pureMD5 random ]; homepage = "https://github.com/np/mbox-tools"; description = "A collection of tools to process mbox files"; @@ -127521,6 +127659,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mbtiles" = callPackage + ({ mkDerivation, base, bytestring, directory, HUnit, monad-control + , mtl, resource-pool, sqlite-simple, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "mbtiles"; + version = "0.4.0.0"; + sha256 = "03d1wmn974ic0dfapyrf881xnily0g6asqss1raaad9g03kwxcxr"; + libraryHaskellDepends = [ + base bytestring directory monad-control mtl resource-pool + sqlite-simple text transformers unordered-containers + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/caneroj1/mbtiles#readme"; + description = "Haskell MBTiles client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mcl" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, criterion , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl @@ -127627,7 +127784,7 @@ self: { }) {}; "mcpi" = callPackage - ({ mkDerivation, base, network, split, transformers }: + ({ mkDerivation, base, network, pipes, split, transformers }: mkDerivation { pname = "mcpi"; version = "0.0.1.2"; @@ -127635,7 +127792,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network split transformers ]; - executableHaskellDepends = [ base transformers ]; + executableHaskellDepends = [ base network pipes transformers ]; homepage = "https://github.com/DougBurke/hmcpi"; description = "Connect to MineCraft running on a Raspberry PI"; license = stdenv.lib.licenses.publicDomain; @@ -127801,39 +127958,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mediabus" = callPackage - ({ mkDerivation, array, async, base, binary, bytestring, cereal - , conduit, conduit-combinators, conduit-extra, containers - , data-default, deepseq, hspec, lens, lifted-async, monad-control - , monad-logger, mtl, network, parallel, primitive, process - , QuickCheck, random, resourcet, singletons, spool, stm - , streaming-commons, tagged, template-haskell, text, time - , transformers, type-spec, vector + "med-module" = callPackage + ({ mkDerivation, base, bytestring, storable-endian, transformers + , utility-ht }: mkDerivation { - pname = "mediabus"; - version = "0.3.3.0"; - sha256 = "1v1qjbz438hk978xa4zm6s4ydcnxlvwc00rczn6kvzk1mi8vlgn2"; + pname = "med-module"; + version = "0.1.1"; + sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - array async base bytestring cereal conduit conduit-combinators - conduit-extra containers data-default deepseq lens lifted-async - monad-control monad-logger mtl network parallel primitive process - QuickCheck random resourcet spool stm streaming-commons tagged text - time transformers vector + base bytestring storable-endian transformers utility-ht ]; - testHaskellDepends = [ - array async base binary bytestring conduit conduit-combinators - conduit-extra containers data-default deepseq hspec lens - monad-control mtl QuickCheck singletons spool stm tagged - template-haskell text time transformers type-spec vector - ]; - homepage = "https://github.com/lindenbaum/mediabus"; - description = "Multimedia streaming on top of Conduit"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + description = "Parse song module files from Amiga MED and OctaMED"; + license = stdenv.lib.licenses.gpl3; }) {}; - "mediabus_0_4_0_1" = callPackage + "mediabus" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control @@ -127862,7 +128004,6 @@ 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 @@ -127895,45 +128036,6 @@ self: { }) {fdk-aac = null;}; "mediabus-rtp" = callPackage - ({ mkDerivation, array, async, base, binary, bytestring, cereal - , conduit, conduit-combinators, conduit-extra, containers - , data-default, deepseq, hspec, lens, lifted-async, mediabus - , monad-control, monad-logger, mtl, network, parallel, primitive - , process, QuickCheck, random, resourcet, singletons, spool, stm - , streaming-commons, tagged, template-haskell, text, time - , transformers, type-spec, vector - }: - mkDerivation { - pname = "mediabus-rtp"; - version = "0.3.2.1"; - sha256 = "0kb24cw7x4vxjq109ld9l2jb7hqc8aydri8hb3zj0ihsfb82sx85"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base bytestring cereal conduit conduit-combinators - conduit-extra containers data-default deepseq lens lifted-async - mediabus monad-control monad-logger mtl network parallel primitive - process QuickCheck random resourcet spool stm streaming-commons - tagged text time transformers vector - ]; - executableHaskellDepends = [ - async base conduit conduit-combinators conduit-extra data-default - lens lifted-async mediabus monad-control monad-logger mtl parallel - QuickCheck random stm streaming-commons tagged time vector - ]; - testHaskellDepends = [ - array async base binary bytestring conduit conduit-combinators - conduit-extra containers data-default deepseq hspec lens mediabus - monad-control monad-logger mtl QuickCheck singletons spool stm - tagged template-haskell text time transformers type-spec vector - ]; - homepage = "https://github.com/lindenbaum/mediabus-rtp"; - description = "Receive and Send RTP Packets"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "mediabus-rtp_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus @@ -127969,7 +128071,6 @@ 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 @@ -128086,35 +128187,9 @@ self: { homepage = "https://github.com/snoyberg/mega-sdist"; 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.2.0"; - sha256 = "0204x5bklgvfydap1a2y76aicnjfs33jh786y7w6vsb54fpafl62"; - revision = "1"; - editedCabalFile = "1ah5r6jjz187l5g1mnzajsyiac5wdc8ijqwkapl0wa35mj3ybakg"; - 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_5_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, hspec, hspec-expectations, mtl, QuickCheck , scientific, text, transformers, weigh @@ -128135,6 +128210,30 @@ self: { homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; + }) {}; + + "megaparsec_6_1_1" = 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.1.1"; + sha256 = "08vwcxh3538bsgcmghssg87p7nvyi49vmr3zf8mqh52wxh65ygl4"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -128144,6 +128243,7 @@ self: { pname = "meldable-heap"; version = "2.0.3"; sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/priority-queues/"; description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues"; @@ -128269,8 +128369,8 @@ self: { "memcache-conduit" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet - , split + , conduit, conduit-extra, containers, hashtables, memcache-haskell + , monad-control, mtl, network, resourcet, split, stm, transformers }: mkDerivation { pname = "memcache-conduit"; @@ -128282,13 +128382,19 @@ self: { attoparsec attoparsec-binary base bytestring conduit conduit-extra memcache-haskell mtl network resourcet split ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra containers hashtables + memcache-haskell monad-control mtl network resourcet stm + transformers + ]; description = "Conduit library for memcache procotol"; license = stdenv.lib.licenses.mit; }) {}; "memcache-haskell" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit - , network, QuickCheck, split, test-framework, test-framework-hunit + ({ mkDerivation, attoparsec, base, bytestring, conduit-extra + , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck + , resourcet, split, stm, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers }: mkDerivation { @@ -128300,6 +128406,10 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring hashable network split transformers ]; + executableHaskellDepends = [ + base bytestring conduit-extra containers hashtables mtl resourcet + stm transformers + ]; testHaskellDepends = [ base bytestring HUnit network QuickCheck split test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th @@ -128503,6 +128613,8 @@ self: { pname = "memorypool"; version = "0.1.0.0"; sha256 = "0w3ssdffsnaxgs8a22sbclsyss4bvmzhb6bww252dcrgpcmn1dkh"; + revision = "1"; + editedCabalFile = "1jv5zba8jldkic64dmrafq45dwaa0ayc2ihvbg0ff87n5i3sh5z0"; libraryHaskellDepends = [ base containers transformers unsafe vector ]; @@ -128519,6 +128631,7 @@ self: { sha256 = "1xcisngfsw5fd5h7idvni85fap2yh85q01615spfr4y4ia5kq05r"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskeline transformers ]; homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript"; description = "Command line utility for memorizing scriptures or any other text"; @@ -128764,8 +128877,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.4.0.1"; - sha256 = "1ry77ia5jd3a8rjb7mz5bzaqi42v1q0ngx2vj8yc709vlkdfs66v"; + version = "0.4.1.1"; + sha256 = "1f2vqwldp457956bx839r9v3xpmp95q42insn2xcdw669rq6wpym"; libraryHaskellDepends = [ ansi-terminal base bytestring containers lens mwc-random primitive text time transformers transformers-base unix-compat @@ -128802,6 +128915,7 @@ self: { ]; description = "Time Synchronized execution"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mezzo" = callPackage @@ -128932,7 +129046,6 @@ self: { homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -128956,8 +129069,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.8.0"; - sha256 = "1xbspqq1sgw6p16rwmdlwprjpcj2p0ppd1nn5iz3ynbifrqi42xa"; + version = "0.4.8.1"; + sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -128984,7 +129097,6 @@ self: { homepage = "http://github.com/fosskers/microlens-aeson/"; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -129111,8 +129223,8 @@ self: { }: mkDerivation { pname = "microstache"; - version = "1"; - sha256 = "0r3ia4hamyrij4vdaa6vnfwhgv40xr4g9wcigi6yhm4ymkz5p1z8"; + version = "1.0.1.1"; + sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -129149,6 +129261,7 @@ self: { sha256 = "1xvmyjv72v2cd9h4qkq5vxa6ylzdnkf4pk7afs316mzvx68fab4h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions haskeline HCodecs megaparsec mtl QuickCheck random text tf-random transformers @@ -129237,7 +129350,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 @@ -129287,6 +129399,7 @@ self: { pname = "midi-utils"; version = "0.1.0.0"; sha256 = "1dlxihyjx1s1vj57j0fnalav8kq5yxlwlaz0ixmx4aj6glgzp8iz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory event-list midi parsec process ]; @@ -129344,6 +129457,7 @@ self: { sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring c10k directory filepath haskell98 hdaemonize hslogger network parsec time unix webserver @@ -129369,6 +129483,7 @@ self: { sha256 = "1mfqpmvypr67f7kxlagbqydf45lji59zyvwmflyhwjmyc8kcf90g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array async auto-update base blaze-builder byteorder bytestring case-insensitive conduit conduit-extra directory filepath http-date @@ -129385,7 +129500,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mighty-metropolis" = callPackage @@ -129418,21 +129532,26 @@ self: { homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikrokosmos" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit - , mtl, multimap, parsec + ({ mkDerivation, ansi-terminal, base, containers, directory + , haskeline, HUnit, mtl, multimap, options, parsec, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "mikrokosmos"; - version = "0.2.0"; - sha256 = "1ckmcdc161x7mgr5pjzvaw5p58llq4mnkc4by58gb6927wy4wfw5"; + version = "0.6.0"; + sha256 = "12rqvk6czgmvcga1sh97vymxfqfga3a51xwyf6n7m4npza9pyqrr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base containers haskeline HUnit mtl multimap parsec + ansi-terminal base containers directory haskeline HUnit mtl + multimap options parsec tasty tasty-hunit tasty-quickcheck + ]; + testHaskellDepends = [ + ansi-terminal base containers directory haskeline HUnit mtl + multimap options parsec tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/M42/mikrokosmos"; description = "Lambda calculus interpreter"; @@ -129477,7 +129596,6 @@ self: { ]; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -129514,10 +129632,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.13.1"; - sha256 = "05sri6sszmnyxsnrnk5j1wwqf0bawpfb179wjqfsp7bkj886g0cl"; - revision = "4"; - editedCabalFile = "129h3siph3pxiddvrr52dsla6jn0yqr55213zv0wamscjmzwwiy1"; + version = "0.4.14"; + sha256 = "0gmapbjci8nclwm8syg5xfci4nj8cpchb9ry1b7gwhcp9kaw6cln"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -129548,6 +129664,27 @@ self: { 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 + , xml-types + }: + mkDerivation { + pname = "mime-mail-ses"; + version = "0.4.0.0"; + sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl , network, old-time @@ -129604,6 +129741,7 @@ self: { sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory mtl random ]; homepage = "http://finder.homelinux.org/haskell/Mines"; description = "Minesweeper simulation using neural networks"; @@ -129620,6 +129758,7 @@ self: { sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary binary-generic bytestring cairo containers directory filepath glade gtk random time @@ -129735,8 +129874,8 @@ self: { }: mkDerivation { pname = "minio-hs"; - version = "0.2.1"; - sha256 = "1h9ma1lgkirsmv8685m1l3m6k38zyx2kqk49s1x3gdbrsihpnjs8"; + version = "0.3.0"; + sha256 = "0bnva7809g7ry31373j7qcmnfiamqfv4r50y6h1k0d7pnsck3bn5"; libraryHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators conduit-extra containers cryptonite cryptonite-conduit data-default @@ -129759,6 +129898,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs_0_3_1" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, conduit + , conduit-combinators, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, exceptions, filepath + , http-client, http-conduit, http-types, lifted-async, lifted-base + , memory, monad-control, protolude, QuickCheck, resourcet, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text + , text-format, time, transformers, transformers-base, xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "0.3.1"; + sha256 = "0mrrkd3yl1lbii5gjmhcky3g26anvki3liswrzmfjkff0l7s3riv"; + libraryHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude resourcet + text text-format time transformers transformers-base xml-conduit + ]; + testHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + directory exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude QuickCheck + resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck + temporary text text-format time transformers transformers-base + xml-conduit + ]; + homepage = "https://github.com/minio/minio-hs#readme"; + description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -129983,6 +130157,7 @@ self: { sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal directory filepath knob random-fu semigroups text utf8-string vector @@ -129994,23 +130169,44 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, lucid, text - , vector + ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers + , lucid, servant, servant-lucid, text, vector }: mkDerivation { pname = "miso"; - version = "0.1.2.0"; - sha256 = "1f9gs5lmcg86gs35fsdjq7bdhxyawdfna5lp84chsxl5fqa44wjs"; + version = "0.4.0.0"; + sha256 = "1pfmmc14fsydv6km45sc5w0mgqnsww7l053qh0vrqmzb88zp8h7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers lucid text vector + 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_7_3_0" = callPackage + ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers + , lucid, servant, servant-lucid, text, vector + }: + mkDerivation { + pname = "miso"; + version = "0.7.3.0"; + sha256 = "0plxc15kx486cwzgbfxyfnxd8y719kz0spb6snfxhy1b4gcmf17q"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "missing-foreign" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -130047,7 +130243,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Mixing effects of one arrow into another one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mixed-strategies" = callPackage @@ -130070,14 +130265,15 @@ self: { "mixed-types-num" = callPackage ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck + , QuickCheck, smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.1.0.1"; - sha256 = "13pp5c8ldccscf5q99zvzcjkn77f9gnqkn5rp6789cia72wyqhlw"; + version = "0.2.0.1"; + sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck + template-haskell ]; testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; homepage = "https://github.com/michalkonecny/mixed-types-num"; @@ -130085,14 +130281,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mixed-types-num_0_2_0_1" = callPackage + "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.2.0.1"; - sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa"; + version = "0.3.1.3"; + sha256 = "0945zl9g1lpvpgqmaqm168zx6l1zydw9waivh7nm4alfr8awys60"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck template-haskell @@ -130112,6 +130308,7 @@ self: { sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath haskell98 ]; description = "Makes an OS X .app bundle from a binary."; license = "GPL"; @@ -130287,7 +130484,6 @@ self: { homepage = "https://github.com/kryoxide/mnist-idx/"; description = "Read and write IDX data that is used in e.g. the MNIST database."; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moan" = callPackage @@ -130340,7 +130536,6 @@ self: { homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "model" = callPackage @@ -130401,7 +130596,6 @@ self: { homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modsplit" = callPackage @@ -130578,7 +130772,6 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -130593,6 +130786,7 @@ self: { sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory explicit-exception filepath html HTTP network network-uri @@ -130616,6 +130810,8 @@ self: { pname = "mole"; version = "0.0.5"; sha256 = "14vqa4mszb37rlpimlqir4g39lv66bfvg9jp4hcqzj5gsny3a1qb"; + revision = "4"; + editedCabalFile = "1565y432g3xy8q9db5sg4nsrb4pn25sxjlb0d6psgfhajb0qlh3l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130641,6 +130837,7 @@ self: { pname = "mollie-api-haskell"; version = "0.2.0.0"; sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl http-types mtl text time @@ -130738,7 +130935,6 @@ 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 @@ -130758,7 +130954,6 @@ 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 @@ -130771,6 +130966,7 @@ self: { homepage = "https://github.com/kawu/monad-codec"; description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-connect" = callPackage @@ -130795,8 +130991,8 @@ self: { }: mkDerivation { pname = "monad-control"; - version = "1.0.2.0"; - sha256 = "1k5lgwdnbqmzzc7y29pfq7a35g428qivsp5cafdv0mbn5kc59aq5"; + version = "1.0.2.2"; + sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -130805,23 +131001,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-control_1_0_2_1" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-control"; - version = "1.0.2.1"; - sha256 = "1hjq0d1y18yyw3p4g78r7k88xy92pzxiqchqll7rqj8lnwnwnknc"; - libraryHaskellDepends = [ - base stm transformers transformers-base transformers-compat - ]; - homepage = "https://github.com/basvandijk/monad-control"; - description = "Lift control operations, like exception catching, through monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -130862,11 +131041,14 @@ self: { pname = "monad-dijkstra"; version = "0.1.1.0"; sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4"; + revision = "1"; + editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c"; libraryHaskellDepends = [ base free mtl psqueues transformers ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; homepage = "https://github.com/ennocramer/monad-dijkstra"; description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-exception" = callPackage @@ -130952,8 +131134,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "4"; - editedCabalFile = "00xzkxsqz34gc8vf1zanrmqszkbfigcl7dz1xwhab4p55lddvhhl"; + revision = "5"; + editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -131057,8 +131239,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.24"; - sha256 = "1r786v5ndnkfdy9v6h26wsbphjc2ar3zcsxz3ij9sxk860cpkr85"; + version = "0.3.25"; + sha256 = "1ai55mk3n72qcdh7b6n4sv8bh5wqf2nznpzldimrwxg3m2b6g88g"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -131229,8 +131411,8 @@ self: { }: mkDerivation { pname = "monad-mock"; - version = "0.1.1.1"; - sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3"; + version = "0.1.1.2"; + sha256 = "029c8jcw7y3hd1llvfnm85fwxvfh7mlhr7dxnfsx6x8zq1qda12f"; libraryHaskellDepends = [ base constraints exceptions haskell-src-exts haskell-src-meta monad-control mtl template-haskell th-orphans transformers-base @@ -131335,7 +131517,6 @@ self: { homepage = "https://github.com/mnacamura/monad-parallel-progressbar"; description = "Parallel execution of monadic computations with a progress bar"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-param" = callPackage @@ -131444,8 +131625,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monad-skeleton"; - version = "0.1.3.2"; - sha256 = "1cc1rd2p15klff0r0ialbd46n3ny547as9fghh3fy3ag2ahz0r15"; + version = "0.1.5"; + sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/fumieval/monad-skeleton"; description = "Monads of program skeleta"; @@ -131462,7 +131643,6 @@ self: { homepage = "http://github.com/ekmett/monad-st"; description = "Provides a MonadST class"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-state" = callPackage @@ -131791,6 +131971,7 @@ self: { pname = "monadiccp"; version = "0.7.6"; sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl parsec pretty random ]; @@ -131808,6 +131989,7 @@ self: { pname = "monadiccp-gecode"; version = "0.1.2"; sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers monadiccp mtl ]; librarySystemDepends = [ gecodeint gecodekernel gecodesearch gecodeset gecodesupport @@ -131932,9 +132114,10 @@ self: { }) {}; "monarch" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, doctest - , lifted-base, monad-control, mtl, network, pool-conduit, stm - , transformers, transformers-base + ({ mkDerivation, base, binary, bytestring, containers, criterion + , doctest, hspec, lifted-base, monad-control, mtl, network + , pool-conduit, stm, tokyotyrant-haskell, transformers + , transformers-base }: mkDerivation { pname = "monarch"; @@ -131944,7 +132127,12 @@ self: { base binary bytestring containers lifted-base monad-control mtl network pool-conduit stm transformers transformers-base ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + base bytestring doctest hspec transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion tokyotyrant-haskell + ]; homepage = "https://github.com/notogawa/monarch"; description = "Monadic interface for TokyoTyrant"; license = stdenv.lib.licenses.bsd3; @@ -132002,36 +132190,6 @@ self: { }) {}; "mongoDB" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, containers, criterion, cryptohash - , data-default-class, hashtables, hspec, lifted-base, monad-control - , mtl, network, nonce, old-locale, parsec, random, random-shuffle - , text, time, tls, transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.1.1.1"; - sha256 = "0mww0caczsi2srhdzkrmlivd4nsqsyqla524j4dxnwfs4w1qbgz4"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers cryptohash data-default-class hashtables - lifted-base monad-control mtl network nonce parsec random - random-shuffle text tls transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mongoDB_2_3_0" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -132060,7 +132218,6 @@ self: { homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -132119,20 +132276,18 @@ self: { "monky" = callPackage ({ mkDerivation, base, bytestring, cereal, composition, containers , directory, env-locale, formatting, mtl, netlink, network - , optparse-applicative, process, pulseaudio, statvfs, stm + , old-time, optparse-applicative, process, pulseaudio, statvfs, stm , template-haskell, text, time, transformers, unix }: mkDerivation { pname = "monky"; - version = "2.2.0.0"; - sha256 = "1bh86myk4nar4ckq0sly7hvj3bzz022yh2sgmfchr6wb05g92pav"; - revision = "1"; - editedCabalFile = "00666fcv432m8whkmnwpijjvj5w5xa64iv7wrcsrc3dcwq5wy20g"; + version = "2.2.1.0"; + sha256 = "1iw0q2ymddnjq2sbzan03abnj00fwaz8pjadbsn63053wai5axfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal composition containers directory env-locale - formatting mtl netlink network pulseaudio statvfs stm + formatting mtl netlink network old-time pulseaudio statvfs stm template-haskell text time transformers unix ]; executableHaskellDepends = [ @@ -132163,8 +132318,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.2"; - sha256 = "0crn1gd9jnf1j9n3dx9brw6dc4vfsydy0n3qs7hg49mp10ghl4da"; + version = "1.0.2.1"; + sha256 = "0smirpwika7d5a98h20jr9jqg41n7vqfy7k31crmn449qfig9ljf"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -132242,6 +132397,7 @@ self: { pname = "monoid-owns"; version = "2010.5.29"; sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers ]; homepage = "http://github.com/nfjinjing/monoid-owns"; description = "a practical monoid implementation"; @@ -132278,8 +132434,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.3.2"; - sha256 = "1n13a3nj1hzlbpanl6d1ak3j2vnjy8mb5p5gp7y5hfhrpiymhbgi"; + version = "0.4.4"; + sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -132309,8 +132465,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.3.0.1"; - sha256 = "1754bn5kxp7zqprgjkl5w6az4h64iz6hc3wn711s46p7b9llcaps"; + version = "0.3.0.2"; + sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij"; libraryHaskellDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; @@ -132517,6 +132673,7 @@ self: { sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring containers directory filepath mtl pretty QuickCheck text utf8-string vector @@ -132535,6 +132692,7 @@ self: { pname = "morfeusz"; version = "0.4.2"; sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory mtl text ]; @@ -132578,6 +132736,7 @@ self: { sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary containers deepseq Earley http-client http-client-tls microlens microlens-mtl pipes system-fileio @@ -132596,6 +132755,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_10" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, http-client, http-client-tls + , microlens, microlens-mtl, mtl, optparse-applicative, pipes + , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit + , tasty-quickcheck, text, text-format, transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.10"; + sha256 = "0wlcizw6kfbir18mqplnyap76gslbzia6ni25z2r4jb8mxrh5z6d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + base code-page optparse-applicative text text-format + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -132678,6 +132870,7 @@ self: { editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary bytestring ConfigFile daemons directory filepath glib gstreamer hgettext MissingH mtl network random setlocale text unix @@ -132807,6 +133000,7 @@ self: { pname = "mps"; version = "2010.11.28"; sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory filepath monoid-owns old-locale old-time parallel parsec regexpr template-haskell time @@ -132828,6 +133022,7 @@ self: { sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath gtk mtl process template-haskell unix ]; @@ -132864,7 +133059,6 @@ 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 @@ -132882,7 +133076,6 @@ 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 @@ -133380,6 +133573,7 @@ self: { sha256 = "1xqydvz8riz40d4q542akyxfhfq7hbhi306pcxdvbbpczyx8napp"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Cabal containers directory extensible-exceptions filepath hint mtl process QuickCheck show simple-reflect unix @@ -133471,6 +133665,7 @@ self: { homepage = "http://github.com/micxjo/hs-multiaddr"; description = "A network address format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiarg" = callPackage @@ -133509,7 +133704,6 @@ self: { homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -133640,6 +133834,7 @@ self: { pname = "multiplate"; version = "0.0.3"; sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base transformers ]; homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; @@ -133653,6 +133848,7 @@ self: { pname = "multiplate-simplified"; version = "0.0.0.2"; sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base multiplate transformers ]; description = "Shorter, more generic functions for Multiplate"; license = stdenv.lib.licenses.mit; @@ -133667,6 +133863,7 @@ self: { sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers fez-conf mtl process ]; @@ -133748,6 +133945,7 @@ self: { pname = "multisetrewrite"; version = "0.6"; sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 stm ]; homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html"; description = "Multi-set rewrite rules with guards and a parallel execution scheme"; @@ -133761,10 +133959,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.7.1.1"; - sha256 = "19mqzz2mgw0sx92xs8abwqkj2wznnixzvqsbniswf0nipz5m15k0"; - revision = "1"; - editedCabalFile = "0fz1gbiv0fdbmng6kinj3pzc3s6w06lgqgriln5lzrqrp4g5ggd5"; + version = "0.7.1.2"; + sha256 = "1mcl0gp2l9wvscq942mz6p0pwlaf4i8li9kp20bp608kahy332ci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133820,6 +134016,7 @@ self: { sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base blaze-html ConfigFile directory Glob happstack-server HStringTemplate markdown MissingH process text @@ -133963,6 +134160,7 @@ self: { pname = "music-diatonic"; version = "0.1.2"; sha256 = "0r4ha5hv0nvfp6r142fklfnqgf0vp77fxmj7z39690l7h1ckq634"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "Implementation of basic western musical theory objects"; license = stdenv.lib.licenses.bsd3; @@ -134020,6 +134218,7 @@ self: { pname = "music-parts"; version = "1.9.0"; sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring cassava containers data-default lens monadplus music-dynamics music-pitch roman-numerals semigroups @@ -134184,6 +134383,7 @@ self: { sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson amqp base ghc-prim mime-mail optparse-applicative text ]; @@ -134239,37 +134439,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.1.4"; - sha256 = "1nswy084v9vdl58v6zvvfj5j5hyd4qgr5n353pwsr8010yw4qmqw"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mustache_2_2_3" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens , mtl, parsec, process, scientific, tar, template-haskell @@ -134297,7 +134466,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 @@ -134421,8 +134589,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.4"; - sha256 = "0nx66swbca3c481abzbpgxfhs93y6bsm897dbk56v0dfdqn0inw4"; + version = "1.1.5"; + sha256 = "18izqidmhiw2b3xs0q8w7dv73v3300d2xqk3prnk70326bsrvrid"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -134469,6 +134637,8 @@ self: { pname = "mwc-probability"; version = "1.3.0"; sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg"; + revision = "1"; + editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; @@ -134476,7 +134646,10 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, math-functions, primitive, time, vector }: + ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, vector + }: mkDerivation { pname = "mwc-random"; version = "0.13.6.0"; @@ -134484,6 +134657,10 @@ self: { libraryHaskellDepends = [ base math-functions primitive time vector ]; + testHaskellDepends = [ + base HUnit QuickCheck statistics test-framework + test-framework-hunit test-framework-quickcheck2 vector + ]; doCheck = false; homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; @@ -134496,6 +134673,8 @@ self: { pname = "mwc-random-accelerate"; version = "0.1.0.0"; sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; + revision = "1"; + editedCabalFile = "0xgl1glq4jxs48x7wp8wh6pk3zad8483bvppwp89p3k0vlh6yqq3"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -134652,6 +134831,7 @@ self: { sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring clientsession heist mtl mysnapsession snap snap-core snap-server text time @@ -134718,7 +134898,6 @@ self: { homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell_0_8_1_0" = callPackage @@ -134760,7 +134939,6 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-openssl" = callPackage @@ -134798,7 +134976,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -134867,6 +135044,7 @@ self: { sha256 = "1a7fqyn0pvnbxzn9fiaib4pj7hq5p2qgnbdwryg70lkgnjm4y0h4"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring ConfigFile data-default-class docopt fast-logger filepath http-types interpolatedstring-perl6 MissingH @@ -134875,7 +135053,6 @@ self: { ]; description = "Web application to view and kill MySQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mzv" = callPackage @@ -134903,7 +135080,6 @@ self: { executableHaskellDepends = [ base HSH mtl process ]; description = "Utility to call iwconfig"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "n-tuple" = callPackage @@ -135065,8 +135241,8 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "names-th"; - version = "0.2.0.2"; - sha256 = "09mzb4ff45kn6gbbf40jvpk0pgnwlyyw7i3ncmmybx6i4mypv048"; + version = "0.2.0.3"; + sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf"; libraryHaskellDepends = [ base containers template-haskell ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Manipulate name strings for TH"; @@ -135276,15 +135452,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "naperian" = callPackage + ({ mkDerivation, adjunctions, base, comonad, distributive, free + , streams, transformers + }: + mkDerivation { + pname = "naperian"; + version = "0.1.0.0"; + sha256 = "0ydlwk1m3xi12bv2rylay4lrz5j5aj1lz95ivilnh89qg4ahrnlb"; + libraryHaskellDepends = [ + adjunctions base comonad distributive free streams transformers + ]; + homepage = "https://github.com/aaronvargo/naperian#readme"; + description = "Efficient representable functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "naqsha" = callPackage - ({ mkDerivation, base, data-default, groups, hspec, HUnit - , QuickCheck, vector + ({ mkDerivation, base, bytestring, groups, hspec, HUnit, QuickCheck + , vector }: mkDerivation { pname = "naqsha"; - version = "0.1.0.0"; - sha256 = "11n8vbpngwxj41vbvlp731anc5pzsbjc05czvpprvld8yxdx4vmf"; - libraryHaskellDepends = [ base data-default groups vector ]; + version = "0.2.0.1"; + sha256 = "154wydlz7y6mic4d1670dwn9g1c7z92v6bydll0shn6z05324ha9"; + libraryHaskellDepends = [ base bytestring groups vector ]; testHaskellDepends = [ base groups hspec HUnit QuickCheck ]; homepage = "http://github.com/naqsha/naqsha.git"; description = "A library for working with geospatial data types"; @@ -135356,6 +135548,7 @@ self: { sha256 = "1bzccvp7g0z90jm7xd2vydjkha0960bv4s0p9w9vn7dgcc6mj63z"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory filepath process shelly text ]; @@ -135509,6 +135702,7 @@ self: { pname = "nbt"; version = "0.6"; sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cereal text ]; testHaskellDepends = [ array base bytestring cereal HUnit QuickCheck test-framework @@ -135649,6 +135843,7 @@ self: { sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring cereal directory GLFW-b GLURaw OpenGLRaw random @@ -135690,6 +135885,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "neko-obfs" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring, lens + , network, network-simple, optparse-generic, pipes + , pipes-attoparsec, pipes-network, pipes-safe, random, text + , transformers + }: + mkDerivation { + pname = "neko-obfs"; + version = "0.1.0.2"; + sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base binary bytestring lens network network-simple + optparse-generic pipes pipes-attoparsec pipes-network pipes-safe + random text transformers + ]; + homepage = "http://github.com/nfjinjing/neko-obfs"; + description = "a TCP tunnel with packet length obfuscation"; + license = stdenv.lib.licenses.asl20; + }) {}; + "nemesis" = callPackage ({ mkDerivation, base, containers, directory, dlist, Glob, lens , mtl, process, time @@ -135714,6 +135931,7 @@ self: { pname = "nemesis-titan"; version = "2014.5.19"; sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air air-th base bytestring directory filepath hspec HStringTemplate nemesis random uuid @@ -135805,7 +136023,7 @@ self: { , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text , transformers, tries, unordered-containers , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers + , wai-transformers, warp }: mkDerivation { pname = "nested-routes"; @@ -135819,6 +136037,13 @@ self: { semigroups text transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; + executableHaskellDepends = [ + attoparsec base bytestring composition-extra errors exceptions + hashable hashtables HSet http-types mtl poly-arity pred-set + pred-trie regex-compat semigroups text transformers tries + unordered-containers wai-middleware-content-type + wai-middleware-verbs wai-transformers warp + ]; testHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity @@ -135952,6 +136177,7 @@ self: { sha256 = "1dmaac0b22nycq4mar0grb2dzfff08rh9qk075h73r0an1vjh1d9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring cryptonite data-default-class directory exceptions http-client http-client-tls @@ -136192,7 +136418,6 @@ self: { homepage = "https://github.com/esoeylemez/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input" = callPackage @@ -136205,7 +136430,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input"; description = "Input handling abstractions for netwire"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-glfw" = callPackage @@ -136223,7 +136447,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-javascript" = callPackage @@ -136255,6 +136478,7 @@ self: { sha256 = "16n03lpmvf715yi9kpf3nypllvipm58jq63lya619h45b2r8i5n9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath GLFW-b GLUtil lens linear mtl netwire netwire-input netwire-input-glfw OpenGL @@ -136303,7 +136527,7 @@ self: { }) {}; "network-address" = callPackage - ({ mkDerivation, base, Cabal, QuickCheck, test-framework + ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework , test-framework-quickcheck2 }: mkDerivation { @@ -136313,6 +136537,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal ]; + executableHaskellDepends = [ base Cabal criterion ]; testHaskellDepends = [ base Cabal QuickCheck test-framework test-framework-quickcheck2 ]; @@ -136331,6 +136556,7 @@ self: { pname = "network-anonymous-i2p"; version = "0.10.0"; sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -136357,6 +136583,7 @@ self: { sha256 = "0jbm29795dznmrdkvl95v9xhj8pcmwgsdk2ngaj6zv5a9arybbj1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base32string bytestring exceptions hexstring network network-attoparsec network-simple socks text transformers @@ -136381,8 +136608,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.2.2"; - sha256 = "1az26wrfgc8jjvkcrni4i6nr5v6i6gb4193zy858sp90rsln7yiy"; + version = "0.3.0"; + sha256 = "0jjd84wwxjdvj1d17rwwmpdv03c18am09xafysw33d6777xh8dmk"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -136402,6 +136629,7 @@ self: { pname = "network-attoparsec"; version = "0.12.2"; sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -136480,15 +136708,14 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.9"; - sha256 = "0d9v9a8ls8za2mgl7ff2nkgg2kjlcq2fm07gybl1x2nf9xr0v1kh"; + version = "1.0.10"; + sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc"; libraryHaskellDepends = [ base bytestring network text time vector ]; homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-conduit" = callPackage @@ -136673,8 +136900,8 @@ self: { }: mkDerivation { pname = "network-ip"; - version = "0.3"; - sha256 = "0lwgixrcxnr9xl4ayrk1p4k15ryw02ighc7ylrmkamyzly2i0872"; + version = "0.3.0.2"; + sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf"; libraryHaskellDepends = [ base data-default-class data-dword data-endian data-serializer data-textual hashable parsers text-printer type-hint @@ -136754,7 +136981,6 @@ self: { homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-multicast" = callPackage @@ -136852,7 +137078,9 @@ self: { }) {}; "network-service" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, network }: + ({ mkDerivation, base, base64-bytestring, bytestring, network + , network-simple + }: mkDerivation { pname = "network-service"; version = "0.1.0.0"; @@ -136862,6 +137090,9 @@ self: { libraryHaskellDepends = [ base base64-bytestring bytestring network ]; + executableHaskellDepends = [ + base base64-bytestring bytestring network network-simple + ]; homepage = "https://github.com/angerman/network-service"; description = "Provide a service at the data type level"; license = stdenv.lib.licenses.mit; @@ -136989,14 +137220,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network-transport_0_5_1" = callPackage + "network-transport_0_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , transformers }: mkDerivation { pname = "network-transport"; - version = "0.5.1"; - sha256 = "0ilbiksf1g4bg5h9ppd0a5z5a05miv850dyxayk916gjywqfgxi9"; + version = "0.5.2"; + sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -137046,6 +137277,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-composed_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, network-transport }: + mkDerivation { + pname = "network-transport-composed"; + version = "0.2.1"; + sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3"; + libraryHaskellDepends = [ base bytestring network-transport ]; + homepage = "http://haskell-distributed.github.com"; + description = "Compose network transports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-inmemory" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network-transport, network-transport-tests, stm @@ -137086,6 +137330,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-tcp_0_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-accessor + , network, network-transport, network-transport-tests + }: + mkDerivation { + pname = "network-transport-tcp"; + version = "0.6.0"; + sha256 = "15p6y91gnk0xvysr3abcicwl343bq9bi1liaxcrwh2ffwws02kvp"; + libraryHaskellDepends = [ + base bytestring containers data-accessor network network-transport + ]; + testHaskellDepends = [ + base bytestring network network-transport network-transport-tests + ]; + 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 ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl , network-transport, random @@ -137103,11 +137367,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-tests_0_2_4_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl + , network-transport, random + }: + mkDerivation { + pname = "network-transport-tests"; + version = "0.2.4.1"; + sha256 = "1j3sfr8d0fjp7qiqw94rcfwk8hrb55w8vz7cmw891cjjdlf00nb3"; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers mtl network-transport + random + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Unit tests for Network.Transport implementations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers - , criterion, data-accessor, distributed-process, exceptions - , network-transport, network-transport-tests, random, semigroups - , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell + , criterion, data-accessor, distributed-process + , distributed-process-tests, exceptions, network, network-transport + , network-transport-tests, random, semigroups, stm, stm-chans + , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell }: mkDerivation { pname = "network-transport-zeromq"; @@ -137120,9 +137403,13 @@ self: { network-transport random semigroups stm stm-chans transformers zeromq4-haskell ]; + executableHaskellDepends = [ + base binary bytestring criterion distributed-process + ]; testHaskellDepends = [ - base network-transport network-transport-tests tasty tasty-hunit - zeromq4-haskell + base bytestring containers distributed-process-tests network + network-transport network-transport-tests stm stm-chans tasty + tasty-hunit test-framework zeromq4-haskell ]; benchmarkHaskellDepends = [ base binary bytestring criterion distributed-process @@ -137130,6 +137417,7 @@ 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 @@ -137222,32 +137510,33 @@ self: { ]; description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural" = callPackage - ({ mkDerivation, ad, array, attoparsec, base, bytestring, criterion - , deepseq, directory, doctest, filepath, ghc-typelits-natnormalise - , Glob, hspec, JuicyPixels, kan-extensions, lens, monad-par - , monad-par-extras, MonadRandom, mtl, parallel, pipes - , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection - , STMonadTrans, text, transformers, typelits-witnesses, vector + ({ mkDerivation, ad, ansi-terminal, array, attoparsec, base + , bytestring, containers, criterion, deepseq, directory, doctest + , filepath, ghc-typelits-natnormalise, Glob, hspec, JuicyPixels + , kan-extensions, lens, monad-par, monad-par-extras, MonadRandom + , mtl, parallel, pipes, pipes-bytestring, pipes-safe, pipes-zlib + , profunctors, random, reflection, STMonadTrans, text, transformers + , typelits-witnesses, vector, vector-sized }: mkDerivation { pname = "neural"; - version = "0.3.0.0"; - sha256 = "10bix58l46067dqdggwpkpkcdd4g20vwnxk32v5r2wp31r1ky1gh"; + version = "0.3.0.1"; + sha256 = "0smv57gd2k24hmh7qj1kdd7x76mgc6bjbjl7cmrncxwibz98j41v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ad array base bytestring deepseq directory filepath + ad array base bytestring containers deepseq directory filepath ghc-typelits-natnormalise hspec kan-extensions lens monad-par monad-par-extras MonadRandom mtl parallel pipes pipes-bytestring - pipes-safe profunctors reflection STMonadTrans text transformers - typelits-witnesses vector + pipes-safe profunctors random reflection STMonadTrans text + transformers typelits-witnesses vector vector-sized ]; executableHaskellDepends = [ - array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text + ansi-terminal array attoparsec base JuicyPixels MonadRandom pipes + pipes-zlib text ]; testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; benchmarkHaskellDepends = [ base criterion ]; @@ -137345,8 +137634,9 @@ self: { "newt" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, containers - , directory, filemanip, filepath, mtl, process, safe, text - , Unixutils + , directory, filemanip, filepath, HUnit, mtl, process, QuickCheck + , safe, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, Unixutils, uuid }: mkDerivation { pname = "newt"; @@ -137358,7 +137648,11 @@ self: { array base bytestring cmdargs containers directory filemanip filepath mtl process safe text Unixutils ]; - executableHaskellDepends = [ base cmdargs containers mtl ]; + executableHaskellDepends = [ + base cmdargs containers directory filepath HUnit mtl process + QuickCheck safe test-framework test-framework-hunit + test-framework-quickcheck2 Unixutils uuid + ]; description = "A trivially simple app to create things from simple templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -137403,6 +137697,18 @@ self: { testHaskellDepends = [ base hspec HUnit ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "newtype-generics_0_5_1" = callPackage + ({ mkDerivation, base, hspec, HUnit, transformers }: + mkDerivation { + pname = "newtype-generics"; + version = "0.5.1"; + sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base hspec HUnit ]; + description = "A typeclass and set of functions for working with newtypes, with generics support"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137414,6 +137720,7 @@ self: { pname = "newtype-th"; version = "0.3.3"; sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell-src-meta newtype syb template-haskell ]; @@ -137472,24 +137779,7 @@ self: { }) {}; "nfc" = callPackage - ({ mkDerivation, base, bytestring, c2hs, nfc }: - mkDerivation { - pname = "nfc"; - version = "0.0.1"; - sha256 = "0cfp2784jfxa1694s59q6cmacym2x6qxgysqc36jdkxarki4cksj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ nfc ]; - libraryToolDepends = [ c2hs ]; - homepage = "https://github.com/centromere/nfc#readme"; - description = "libnfc bindings"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {nfc = null;}; - - "nfc_0_1_0" = callPackage - ({ mkDerivation, base, bytestring, c2hs, nfc }: + ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }: mkDerivation { pname = "nfc"; version = "0.1.0"; @@ -137499,6 +137789,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nfc ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base base16-bytestring bytestring ]; homepage = "https://github.com/centromere/nfc#readme"; description = "libnfc bindings"; license = stdenv.lib.licenses.publicDomain; @@ -137531,8 +137822,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.4.1.0"; - sha256 = "0vlcvvgl6sncgw03ks20b115jlznlv4f1n9fnzwzignws09hyf6y"; + version = "0.6.0.0"; + sha256 = "0bs0jxxgrq29b14mcslyqa29znbhlx6kwq93jzr995alhn7g92px"; libraryHaskellDepends = [ async base binary bytestring template-haskell unix ]; @@ -137740,12 +138031,12 @@ self: { pname = "nix-eval"; version = "0.3.3.0"; sha256 = "1c8hg66s66hkn7f31ynw0km4bpdzhv0zdslzkpycvd36m3jm1wjb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hindent process strict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage @@ -137777,6 +138068,7 @@ self: { sha256 = "1zjak2py3q59mafh68ds5b9yai425hylc7p0x9ccrhid0y3rpl5y"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson ansi-terminal base bytestring classy-prelude containers curl data-default data-fix directory hnix lifted-base MissingH @@ -137896,6 +138188,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nmis-parser" = callPackage + ({ mkDerivation, base, containers, megaparsec, Nmis }: + mkDerivation { + pname = "nmis-parser"; + version = "0.1.0.1"; + sha256 = "0fgh0x2b468j3pxx5nqkvq1wavgap9q7hdnypmdqn5v5jp45l36z"; + libraryHaskellDepends = [ base containers megaparsec ]; + testHaskellDepends = [ base Nmis ]; + homepage = "https://github.com/v0d1ch/nmis-parser#readme"; + description = "NMIS file parser"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {Nmis = null;}; + "nntp" = callPackage ({ mkDerivation, base, bytestring, monad-loops, mtl, network , old-locale, parsec, time @@ -137959,6 +138265,7 @@ self: { homepage = "https://github.com/mrkgnao/noether#readme"; description = "Math in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nofib-analyse" = callPackage @@ -138051,6 +138358,7 @@ self: { pname = "nomyx-core"; version = "1.0.0"; sha256 = "0cdr4k2919a8bjmqm4agpiqp9jiijldwya28ql8bg345ypfh91d2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson base blaze-html blaze-markup bytestring DebugTraceHelpers deepseq directory either-unwrap exceptions @@ -138076,6 +138384,7 @@ self: { pname = "nomyx-language"; version = "1.0.0"; sha256 = "1g9rg0h2nfyc4i1hvlmmnfchz3hhh0pax5x654yqkcdhqbsh04hk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers DebugTraceHelpers ghc imprevu lens monad-loops mtl old-locale random safe shortcut text time @@ -138095,6 +138404,7 @@ self: { pname = "nomyx-library"; version = "1.0.0"; sha256 = "1sb47asxrqg510kgh9mxpkcmczwzcbzd90bm7nmbaas9cn1wxmql"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ghc lens mtl nomyx-language old-locale safe shortcut time time-recurrence @@ -138140,6 +138450,7 @@ self: { pname = "nomyx-web"; version = "1.0.0"; sha256 = "1nmckv3mv3zj14l7l3485lx8bw5g40psv8kn4ldg2grdsrf26z9q"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base blaze-html blaze-markup bytestring filepath happstack-authenticate happstack-server hscolour HTTP http-types @@ -138196,8 +138507,8 @@ self: { ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { pname = "non-negative"; - version = "0.1.1"; - sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7"; + version = "0.1.1.2"; + sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; libraryHaskellDepends = [ base QuickCheck utility-ht ]; testHaskellDepends = [ base QuickCheck utility-ht ]; homepage = "http://code.haskell.org/~thielema/non-negative/"; @@ -138254,7 +138565,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization" = callPackage @@ -138266,10 +138576,11 @@ self: { libraryHaskellDepends = [ base primitive vector ]; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization-ad" = callPackage - ({ mkDerivation, ad, base, nonlinear-optimization, primitive + ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive , reflection, vector }: mkDerivation { @@ -138281,9 +138592,11 @@ self: { libraryHaskellDepends = [ ad base nonlinear-optimization primitive reflection vector ]; + executableHaskellDepends = [ base csv ]; homepage = "https://github.com/msakai/nonlinear-optimization-ad"; description = "Wrapper of nonlinear-optimization package for using with AD package"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "noodle" = callPackage @@ -138321,10 +138634,8 @@ self: { }: mkDerivation { pname = "normalization-insensitive"; - version = "2.0.0.1"; - sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p"; - revision = "1"; - editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x"; + version = "2.0.1"; + sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -138336,7 +138647,6 @@ self: { homepage = "https://github.com/ppelleti/normalization-insensitive"; description = "Normalization insensitive string comparison"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "normalize-imports" = callPackage @@ -138450,6 +138760,7 @@ self: { sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec attoparsec-conduit base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers @@ -138488,7 +138799,6 @@ 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 @@ -138497,6 +138807,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; + revision = "1"; + editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -138581,6 +138893,7 @@ self: { sha256 = "0gp7032dgchm3mwlzj66cpcdgndi0mj2l4xxq4k4ayflfpcwrg3a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers monad-loops mtl pretty z3 ]; @@ -138653,6 +138966,7 @@ self: { pname = "null-canvas"; version = "0.2.7"; sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers filepath scotty split stm text transformers wai-extra warp @@ -138783,7 +139097,6 @@ self: { homepage = "https://github.com/roelvandijk/numerals"; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numerals-base" = callPackage @@ -138832,6 +139145,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numeric-ode" = callPackage + ({ mkDerivation, ad, base, Chart, Chart-cairo, colour + , data-accessor, data-default-class, diagrams-cairo, diagrams-lib + , diagrams-rasterific, foldl, JuicyPixels, lens, linear, mtl + , mwc-probability, mwc-random, numhask, parallel, parsec, plots + , primitive, protolude, reflection, tdigest, template-haskell, text + , vector, vector-space + }: + mkDerivation { + pname = "numeric-ode"; + version = "0.0.0.0"; + sha256 = "04296pcakc7nb2ydc84cq2vy1x7frqfdxc17slda1p325n8b4map"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base foldl lens linear mwc-probability mwc-random numhask + parallel parsec primitive protolude reflection tdigest + template-haskell text vector + ]; + executableHaskellDepends = [ + base Chart Chart-cairo colour data-accessor data-default-class + diagrams-cairo diagrams-lib diagrams-rasterific JuicyPixels linear + mtl plots vector vector-space + ]; + homepage = "https://github.com/qnikst/numeric-ode"; + description = "Ode solvers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numeric-prelude" = callPackage ({ mkDerivation, array, base, containers, deepseq, non-negative , parsec, QuickCheck, random, storable-record, utility-ht @@ -138879,6 +139222,7 @@ self: { sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga"; revision = "1"; editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base ]; homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest"; description = "Math and quantum mechanics"; @@ -138927,21 +139271,17 @@ self: { }) {}; "numhask" = callPackage - ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit - , protolude, QuickCheck, singletons, tasty, tasty-hunit - , tasty-quickcheck, vector + ({ mkDerivation, adjunctions, base, distributive, doctest + , protolude, QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "numhask"; - version = "0.0.4"; - sha256 = "0iyjx8yrbsalycy4qf13jm3q1gn1kpmk0l2r0j38zv2gr199p7df"; + version = "0.0.9"; + sha256 = "16ss7lqwvmsgwgrj1smvdr5zzj33svi1mj1k5lhik1mm6dhd1c9x"; libraryHaskellDepends = [ - adjunctions base distributive protolude QuickCheck singletons - vector - ]; - testHaskellDepends = [ - base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + 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; @@ -138949,24 +139289,42 @@ self: { }) {}; "numhask-range" = callPackage - ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens - , linear, numhask, protolude, QuickCheck, smallcheck, tasty - , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, containers, foldl, formatting, lens, linear + , numhask, protolude, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "numhask-range"; - version = "0.0.2"; - sha256 = "0ackcr1brczhnn66700i1dc3bj506vp79r4dzr7i40dyi19mk9fw"; + version = "0.0.4"; + sha256 = "06crxqgsryw7iixjm0rcsq49xgzirx6qm74iw6bx85a48f1snzqx"; libraryHaskellDepends = [ base containers foldl formatting lens linear numhask protolude QuickCheck ]; + testHaskellDepends = [ base numhask tasty tasty-quickcheck ]; + homepage = "https://github.com/tonyday567/numhask-range"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "numhask-range_0_1_0" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , doctest, formatting, numhask, protolude, QuickCheck + , semigroupoids, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "numhask-range"; + version = "0.1.0"; + sha256 = "1z5h7vmbq0jx8rcvxd8b9y1w1lnh3hv9mcykajwddjmrk2rxynnp"; + libraryHaskellDepends = [ + adjunctions base containers distributive formatting numhask + protolude QuickCheck semigroupoids + ]; testHaskellDepends = [ - base HUnit numhask protolude QuickCheck smallcheck tasty - tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck + base doctest numhask tasty tasty-quickcheck ]; homepage = "https://github.com/tonyday567/numhask-range"; - description = "see readme.md"; + description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -139051,8 +139409,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "0.2.2"; - sha256 = "1sp8z8nyxhqywcdyxiyw9yz0mnrbyvgnjg5wr2p5371z3dwbhz8n"; + version = "0.2.4"; + sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139076,7 +139434,6 @@ 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-contrib" = callPackage @@ -139099,7 +139456,6 @@ 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-ghcid" = callPackage @@ -139117,7 +139473,6 @@ self: { homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvvm" = callPackage @@ -139181,6 +139536,7 @@ self: { sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers glade glib gtk mtl parsec random ]; @@ -139190,30 +139546,6 @@ self: { }) {}; "oanda-rest-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, Decimal - , hlint, hspec, http-conduit, HUnit, lens, old-locale, scientific - , text, thyme, vector - }: - mkDerivation { - pname = "oanda-rest-api"; - version = "0.3.0.0"; - sha256 = "00vnbyvqgfly7d72kr21yvd0fjjvw7pm12lc306v5qm29m53cmxy"; - revision = "1"; - editedCabalFile = "1mficg3gm6q9pf3344hs8k8c0azdq0cyximrq3ny3b4gl4j3kns4"; - libraryHaskellDepends = [ - aeson base bytestring containers Decimal http-conduit lens - old-locale scientific text thyme vector - ]; - testHaskellDepends = [ - aeson base bytestring containers Decimal hlint hspec http-conduit - HUnit lens old-locale scientific text thyme vector - ]; - homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; - description = "Client to the OANDA REST API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "oanda-rest-api_0_4_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens , old-locale, resourcet, scientific, text, thyme, transformers @@ -139236,7 +139568,6 @@ 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 @@ -139321,11 +139652,13 @@ self: { homepage = "https://github.com/jwaldmann/haskell-obdd"; description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oberon0" = callPackage ({ mkDerivation, array, AspectAG, base, containers, ghc-prim, HList - , mtl, murder, template-haskell, transformers, uu-parsinglib, uulib + , language-c, mtl, murder, template-haskell, transformers + , uu-parsinglib, uulib }: mkDerivation { pname = "oberon0"; @@ -139337,6 +139670,10 @@ self: { array AspectAG base containers ghc-prim HList mtl murder template-haskell transformers uu-parsinglib uulib ]; + executableHaskellDepends = [ + AspectAG base containers HList language-c murder uu-parsinglib + uulib + ]; doHaddock = false; homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "Oberon0 Compiler"; @@ -139425,32 +139762,8 @@ self: { }: mkDerivation { pname = "octane"; - version = "0.18.3"; - sha256 = "05gljx1br9zk2i26rvz15dcl03x7n2xvrwmlz7917673068scm95"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bimap binary bytestring containers data-default-class - file-embed overloaded-records rattletrap text - ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls - ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "octane_0_19_0" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers - , data-default-class, file-embed, http-client, http-client-tls - , overloaded-records, rattletrap, text - }: - mkDerivation { - pname = "octane"; - version = "0.19.0"; - sha256 = "1qdz8y7jacj6yq61icdyqw2fr741nwq1p9yyns6shbv6c9z9zy51"; + version = "0.20.2"; + sha256 = "09z69sl782i7ky4dr9aw1ikjaqpwsp0b92x3m2pqlzg4bdfz7s7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139608,8 +139921,8 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "3.0.0"; - sha256 = "064pflgipy6a28ajz57k2fh4pqz8gsyxc83ig5iiks0yy2av6f9f"; + version = "3.1.0"; + sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text @@ -139617,6 +139930,7 @@ self: { homepage = "http://github.com/ogma-project/ogmarkup"; description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -139668,8 +139982,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.3.0.0"; - sha256 = "0k5gknbp54pqbk66cx900lqdrxn0fzfpcpafpfmvz4r49parrj7w"; + version = "0.3.0.1"; + sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139677,7 +139991,8 @@ self: { http-client-tls jose-jwt network network-uri text time tls ]; testHaskellDepends = [ - base bytestring hspec http-client http-client-tls http-types text + aeson base bytestring exceptions hspec http-client http-client-tls + http-types jose-jwt network-uri text time ]; homepage = "https://github.com/krdlab/haskell-oidc-client"; description = "OpenID Connect 1.0 library for RP"; @@ -139791,6 +140106,7 @@ self: { sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory filepath pretty time ]; @@ -139932,7 +140248,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "one-time-password" = callPackage @@ -139979,6 +140294,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "online" = callPackage + ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector + , vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.0"; + sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh"; + libraryHaskellDepends = [ + base foldl numhask protolude tdigest vector vector-algorithms + ]; + homepage = "https://github.com/tonyday567/online"; + description = "online statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -140030,17 +140362,15 @@ self: { "opaleye" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void + , 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.3.0"; - sha256 = "0wrxfqd1f6m8pb8bpx3n7s2gbw3r0dx2ryw2f5a0nnvwv5cagvbc"; - revision = "2"; - editedCabalFile = "1nzwk9mpgnwqmdna35mn0q4b50x1hch9q1pfdqdsz87b9308fb1q"; + version = "0.5.4.0"; + sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -140048,8 +140378,9 @@ self: { uuid void ]; testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time + 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"; @@ -140165,6 +140496,7 @@ self: { sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath HTTP mtl network old-time parsec pretty process syb texmath @@ -140215,7 +140547,6 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-union" = callPackage @@ -140231,7 +140562,6 @@ self: { homepage = "https://github.com/bfopa/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-witness" = callPackage @@ -140240,8 +140570,8 @@ self: { }: mkDerivation { pname = "open-witness"; - version = "0.4"; - sha256 = "086b984ys88962f320zl287a5yhirgxi75l2xnzrb9xr2d196nsv"; + version = "0.4.0.1"; + sha256 = "04a10cv0iddnvp5my4h00bmmpc2mxz6c5gih5p4iyc7bdq6m0w07"; libraryHaskellDepends = [ base constraints hashable random template-haskell transformers witness @@ -140250,7 +140580,6 @@ self: { homepage = "https://github.com/AshleyYakeley/open-witness"; description = "open witnesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opench-meteo" = callPackage @@ -140263,6 +140592,7 @@ self: { 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 @@ -140291,6 +140621,8 @@ self: { pname = "opencv"; version = "0.0.1.1"; sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn"; + revision = "1"; + editedCabalFile = "1gql71xhyd3ns0a7cigjgdpar7x0b0bwr9kvi17gfs91ggiw7684"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -140324,6 +140656,8 @@ self: { pname = "opencv-extra"; version = "0.1.0.0"; sha256 = "1ah6jipanqag0vk4fjd35rr5xi479w2iym0ix6wd9g9zswb89k8j"; + revision = "1"; + editedCabalFile = "0pqkh3lqmgspg6h38jff8g4w7s28k4l6r17d7xkrfrghhaxl47mp"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -140496,7 +140830,6 @@ self: { homepage = "http://github.com/elliottt/hsopenid"; description = "An implementation of the OpenID-2.0 spec."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openpgp" = callPackage @@ -140663,7 +140996,6 @@ self: { libraryHaskellDepends = [ base directory HsOpenSSL time unix ]; description = "Create OpenSSL keypairs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssl-streams" = callPackage @@ -140683,7 +141015,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -140977,7 +141308,6 @@ self: { homepage = "https://github.com/emilaxelsson/operational-alacarte"; description = "A version of Operational suitable for extensible EDSLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "operational-class" = callPackage @@ -141020,34 +141350,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.1"; - sha256 = "0mc3qymh6i8w79s6spm0dnndr7aydny6fy3krfxzfm6qch4nw3yb"; - 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; - }) {}; - - "opml-conduit_0_6_0_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -141059,6 +141361,7 @@ self: { 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 @@ -141073,7 +141376,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 @@ -141292,38 +141594,21 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative, semigroups - , system-filepath, text, time, transformers, void + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , semigroups, system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.1.5"; - sha256 = "1xg6c7h6h8q64gwskh7l4h7qn7w4y0ixf88grgk23xdficgmsyms"; + version = "1.2.2"; + sha256 = "110jil2n945x30d8wgdrgs7di310z9hdnzhw5c1zq2jfh3b54ygz"; libraryHaskellDepends = [ - base bytestring optparse-applicative semigroups system-filepath - text time transformers void + 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_1" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative, semigroups - , system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.2.1"; - sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml"; - libraryHaskellDepends = [ - base bytestring optparse-applicative semigroups system-filepath - text time transformers void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -141365,6 +141650,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-version" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "optparse-version"; + version = "0.3.0.0"; + sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x"; + libraryHaskellDepends = [ base optparse-applicative ]; + homepage = "https://github.com/shmish111/optparse-version"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orc" = callPackage ({ mkDerivation, base, deepseq, monadIO, mtl, process, random, stm }: @@ -141416,6 +141712,7 @@ self: { pname = "orchid"; version = "0.0.8"; sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers encoding extensible-exceptions fclabels filestore hscolour mtl nano-md5 parsec process QuickCheck salvia @@ -141436,6 +141733,7 @@ self: { sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base extensible-exceptions mtl network orchid Pipe salvia salvia-extras stm @@ -141626,7 +141924,6 @@ self: { ]; description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orgstat" = callPackage @@ -141639,8 +141936,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.0.3"; - sha256 = "1cxqndv7ffrqb749czz5x7g59q7nmq4xbnyaaajf5q27wmqfiwi8"; + version = "0.0.4"; + sha256 = "1229av0i3j69wcnzpxz21z3j02sr2wl491swidfqzp9ifjk4w5l3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141683,6 +141980,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "orizentic" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec, jwt + , mtl, optparse-applicative, random, text, time, uuid + }: + mkDerivation { + pname = "orizentic"; + version = "0.1.0.0"; + sha256 = "0dyq7n1zxhz23l3jxbryrsvpqrb6yjnc30zph6ik1r0k6nfm2931"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers jwt mtl random text time uuid + ]; + executableHaskellDepends = [ + aeson base bytestring jwt mtl optparse-applicative text time + ]; + testHaskellDepends = [ base hspec jwt mtl time ]; + homepage = "https://github.com/luminescent-dreams/orizentic#readme"; + description = "Token-based authentication and authorization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "os-release" = callPackage ({ mkDerivation, base, containers, hlint, hspec, parsec, process , regex-compat, temporary, transformers @@ -141727,6 +142047,7 @@ self: { libraryHaskellDepends = [ base colour gloss random ]; description = "Implements an osculatory packing (kissing circles) algorithm and display"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osdkeys" = callPackage @@ -141817,6 +142138,7 @@ self: { pname = "osx-ar"; version = "0.11"; sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for OS X static archive format"; license = stdenv.lib.licenses.bsd3; @@ -141844,12 +142166,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "otp-authenticator" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, bytestring + , containers, cryptonite, dependent-sum, filepath, h-gpgme + , haskeline, microlens, one-time-password, optparse-applicative + , sandi, singletons, text, time, transformers, trifecta + , type-combinators, unix, uri-encode, witherable, yaml + }: + mkDerivation { + pname = "otp-authenticator"; + version = "0.1.0.1"; + sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors binary bytestring containers cryptonite + dependent-sum filepath h-gpgme haskeline microlens + one-time-password optparse-applicative sandi singletons text time + transformers trifecta type-combinators unix uri-encode witherable + yaml + ]; + executableHaskellDepends = [ + aeson base binary bytestring h-gpgme text yaml + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mstksg/otp-authenticator"; + description = "OTP Authenticator (a la google) command line client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ottparse-pretty" = callPackage ({ mkDerivation, base, containers, parsec, split, uniplate }: mkDerivation { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; + revision = "1"; + editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141997,6 +142351,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packdeps_0_4_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, optparse-applicative, process, semigroups, split, tar + , text, time + }: + mkDerivation { + pname = "packdeps"; + version = "0.4.4"; + sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath split tar text + time + ]; + executableHaskellDepends = [ + base Cabal containers optparse-applicative process semigroups + ]; + 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 ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -142006,6 +142384,7 @@ self: { pname = "packed-dawg"; version = "0.2.0.8"; sha256 = "1z6a75i0ma7cs8hsiqz9pqwycrw61ph4rvc1w6iczbjmmjgns13r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary deepseq mtl unordered-containers vector vector-binary-instances @@ -142094,7 +142473,6 @@ 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 @@ -142160,6 +142538,7 @@ self: { sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring conduit conduit-extra directory process resourcet safe terminfo text transformers unix @@ -142198,8 +142577,8 @@ self: { ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: mkDerivation { pname = "pagination"; - version = "0.1.1"; - sha256 = "017bws1ws4zq6058p6wxkxk6fjhxjrc20vm2nb6pizks0227pi5s"; + version = "0.2.1"; + sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -142207,20 +142586,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pagination_0_2_0" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: - mkDerivation { - pname = "pagination"; - version = "0.2.0"; - sha256 = "04jzwg9r0f8rza9zkzqfynx76snfw54kppfk9z5bjgqw6pqpx2jh"; - libraryHaskellDepends = [ base deepseq exceptions ]; - testHaskellDepends = [ base exceptions hspec QuickCheck ]; - homepage = "https://github.com/mrkkrp/pagination"; - description = "Framework-agnostic pagination boilerplate"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -142261,6 +142626,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "palette_0_1_0_5" = callPackage + ({ mkDerivation, array, base, colour, containers }: + mkDerivation { + pname = "palette"; + version = "0.1.0.5"; + sha256 = "04lqmd0c02fp3x57gbga9qf05f4a6hr8p2ywlasm0dkr740m6d3l"; + libraryHaskellDepends = [ array base colour containers ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Utilities for choosing and creating color schemes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "palindromes" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -142299,6 +142677,7 @@ self: { pname = "panda"; version = "2009.4.1"; sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cgi containers data-default directory filepath gravatar haskell98 hcheat kibro MissingH mps network old-locale old-time @@ -142332,6 +142711,7 @@ self: { configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base base64-bytestring binary blaze-html blaze-markup bytestring cmark containers data-default deepseq directory @@ -142363,19 +142743,21 @@ self: { "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , 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.10.4.1"; - sha256 = "0lfyqz9pqi599p9invp6llk1dvlj2zzks3yw6fmbzy9im24hlsvf"; + version = "0.10.5.1"; + sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9"; revision = "1"; - editedCabalFile = "00cvvdiwpl8cw840smdfxbdnmmjf4m86nck344a797iv9rmvdq0j"; + 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 @@ -142383,8 +142765,9 @@ self: { xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml + 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 @@ -142396,7 +142779,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_10_5_1" = callPackage + "pandoc-citeproc_0_11_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -142405,10 +142788,11 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.10.5.1"; - sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9"; + version = "0.11.1"; + sha256 = "0si9xc1f1rhli2pqanvbran150mnj465a5d5psd4jxc82y5bha2f"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 @@ -142416,8 +142800,9 @@ self: { xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml + 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 @@ -142455,10 +142840,11 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.5.0"; - sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl"; + version = "0.2.6.0"; + sha256 = "1mbv2840l6kjc878f6miar3vfbgx2mwllxaryjlj9y6s6001185b"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers data-accessor data-accessor-template data-accessor-transformers data-default directory filepath mtl @@ -142484,12 +142870,12 @@ self: { sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; executableHaskellDepends = [ base csv pandoc pandoc-types ]; 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-filter-graphviz" = callPackage @@ -142520,6 +142906,7 @@ self: { sha256 = "1hv8jw6aymlx6hvm1xq9ccsh2vi1y340xnhrysglpggvarim3dnd"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory pandoc pandoc-types text ]; @@ -142581,7 +142968,6 @@ self: { homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-placetable" = callPackage @@ -142594,6 +142980,7 @@ self: { sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring explicit-exception http-conduit pandoc-types spreadsheet utf8-string @@ -142626,6 +143013,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-sidenote" = callPackage + ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }: + mkDerivation { + pname = "pandoc-sidenote"; + version = "0.19.0.0"; + sha256 = "0vz8w1dgzm0hipwfz5a1m41xkjdindr3373x6ip6vqv9h2gzzbb3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ]; + executableHaskellDepends = [ base pandoc-types ]; + homepage = "https://github.com/jez/pandoc-sidenote#readme"; + description = "Convert Pandoc Markdown-style footnotes into sidenotes"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-stylefrommeta" = callPackage ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc , pandoc-types @@ -142667,6 +143069,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_17_1" = 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.1"; + sha256 = "0sqk4sjpyl9k54kaxrk52in2sqhy62cakhca9k5i9c6gjhqh0rrb"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -142710,6 +143134,7 @@ self: { sha256 = "0cnz4n2vywj4w9cnj7kh6jml6k29li9wnaifnwn69b6883043iwm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers IfElse mtl SDL SDL-gfx SDL-ttf transformers Yampa @@ -142728,6 +143153,7 @@ self: { pname = "pango"; version = "0.13.3.1"; sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ array base cairo containers directory glib mtl pretty process text @@ -142817,29 +143243,28 @@ self: { "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base , papa-base-export, papa-base-implement, papa-bifunctors - , papa-bifunctors-export, papa-bifunctors-implement, papa-export - , papa-implement, papa-lens, papa-lens-export, papa-lens-implement - , papa-semigroupoids, papa-semigroupoids-export - , papa-semigroupoids-implement, QuickCheck, template-haskell + , papa-bifunctors-export, papa-bifunctors-implement, papa-lens + , papa-lens-export, papa-lens-implement, papa-semigroupoids + , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x + , papa-x-export, papa-x-implement, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.2.1"; - sha256 = "11jklw09xgsd75q85yivsgdab82kg0s98nnarlbid5q433gszs8v"; + version = "0.3.0"; + sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors - papa-bifunctors-export papa-bifunctors-implement papa-export - papa-implement papa-lens papa-lens-export papa-lens-implement - papa-semigroupoids papa-semigroupoids-export - papa-semigroupoids-implement + papa-bifunctors-export papa-bifunctors-implement papa-lens + papa-lens-export papa-lens-implement papa-semigroupoids + papa-semigroupoids-export papa-semigroupoids-implement papa-x + papa-x-export papa-x-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; + homepage = "https://github.com/qfpl/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-base" = callPackage @@ -142849,53 +143274,49 @@ self: { }: mkDerivation { pname = "papa-base"; - version = "0.2.0"; - sha256 = "1hvkjjjwh1m3d3mck5z1szr2f2g4agj20hvrcxwm3iig3nqz04cb"; + version = "0.3.0"; + sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-export" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + , semigroups, template-haskell }: mkDerivation { pname = "papa-base-export"; - version = "0.2.0"; - sha256 = "0jm98mfs339paah260idshsdz1f4hqfnz0c520f7dsvipks81v0z"; - revision = "1"; - editedCabalFile = "1y18rf9q5b6h03870wvlqj53l86r0ad25wm4mv035z1h1c6qmaqn"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z"; + libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-export"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, directory, doctest, filepath + , papa-base-export, QuickCheck, semigroups, template-haskell }: mkDerivation { pname = "papa-base-implement"; - version = "0.2.0"; - sha256 = "0787w4r79aa94nwihzwvc9vash6bqlrg3mkw760ssygl8p5f9834"; - revision = "1"; - editedCabalFile = "1rb6bm8frga4fh865lrwhwpafgi7x8fq4cshb1j869fj0hzfig70"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx"; + libraryHaskellDepends = [ base papa-base-export semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-implement"; + homepage = "https://github.com/qfpl/papa"; description = "Useful base functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142907,15 +143328,15 @@ self: { }: mkDerivation { pname = "papa-bifunctors"; - version = "0.2.0"; - sha256 = "0gwqqf141gq20bf9p3gm3ki8x3xnqkgkbbjd5vgars8gj0scqmga"; + version = "0.3.0"; + sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142926,13 +143347,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-export"; - version = "0.2.0"; - sha256 = "0q1px6sr1pqc6q33mvys5wnbdz2ydma6dcn0fd2m58kvxcq53163"; + version = "0.3.0"; + sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142943,13 +143364,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-implement"; - version = "0.2.0"; - sha256 = "04qndk9sca9mrya3lqnb9678dflh2s09j5n8bfa8102hici29fic"; + version = "0.3.0"; + sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `bifunctors` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143021,15 +143442,15 @@ self: { }: mkDerivation { pname = "papa-lens"; - version = "0.2.0"; - sha256 = "1m9cladf481w4yql8d1wrahinzfwgdbiyl4mdvxa9ls9rivq54zb"; + version = "0.3.0"; + sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143040,13 +143461,13 @@ self: { }: mkDerivation { pname = "papa-lens-export"; - version = "0.2.0"; - sha256 = "1c8fydf4gi9zq6962f936n0g33cpjmxrr5wdazr7qja7jjdn3sm3"; + version = "0.3.0"; + sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `lens`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143057,13 +143478,13 @@ self: { }: mkDerivation { pname = "papa-lens-implement"; - version = "0.2.1"; - sha256 = "0bwwmsnq5a957p3gj9m9r0vx5a3vqyjbywqhl9m2plgzbwlqxfd9"; + version = "0.3.0"; + sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `lens` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143083,7 +143504,6 @@ 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 @@ -143136,7 +143556,6 @@ 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 @@ -143163,15 +143582,15 @@ self: { }: mkDerivation { pname = "papa-semigroupoids"; - version = "0.2.0"; - sha256 = "1gl9kp6c0h6abpx4lxb9lkksbxs5h0rdxjykc3g1fwgsljklk1ry"; + version = "0.3.0"; + sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143182,31 +143601,82 @@ self: { }: mkDerivation { pname = "papa-semigroupoids-export"; - version = "0.2.0"; - sha256 = "06b5pygdbvmkvfmd27gf6z16shiqkrybm5smijs1iilm7yd4ms8v"; + version = "0.3.0"; + sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `semigroupoids`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, template-haskell + , semigroupoids, semigroups, template-haskell }: mkDerivation { pname = "papa-semigroupoids-implement"; - version = "0.2.1"; - sha256 = "0zr8vx3vpkilwmwl73ll6ajs9by65sd6n96binrf0wf68jwb41rh"; - libraryHaskellDepends = [ base semigroupoids ]; + version = "0.3.0"; + sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd"; + libraryHaskellDepends = [ base semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; - description = "useful `bifunctors` functions reimplemented"; + homepage = "https://github.com/qfpl/papa"; + description = "useful `semigroupoids` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, papa-x-export + , papa-x-implement, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-x"; + version = "0.3.0"; + sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4"; + libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-export"; + version = "0.3.0"; + sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "export useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-implement"; + version = "0.3.0"; + sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "useful functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143229,8 +143699,29 @@ self: { }: mkDerivation { pname = "papillon"; - version = "0.1.0.3"; - sha256 = "1y9xcy5fz28c08kv6y8qc52bzlpzyipf6dy2ij81xjsl22s7fwc2"; + 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 + }: + mkDerivation { + pname = "papillon"; + version = "0.1.0.5"; + sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143281,6 +143772,7 @@ self: { homepage = "https://github.com/mitsuji/paprika#readme"; description = "The Haskell library and examples for the kids programming robot paprika"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "para" = callPackage @@ -143483,12 +143975,13 @@ self: { }) {}; "parconc-examples" = callPackage - ({ mkDerivation, abstract-par, accelerate, array, async, base - , binary, bytestring, containers, deepseq, directory + ({ mkDerivation, abstract-par, accelerate, accelerate-io, array + , async, base, binary, bytestring, containers, deepseq, directory , distributed-process, distributed-process-simplelocalnet - , distributed-static, filepath, http-conduit, monad-par, network - , network-uri, normaldistribution, parallel, random, repa, stm - , template-haskell, time, transformers, utf8-string, vector, xml + , distributed-static, fclabels, filepath, http-conduit, monad-par + , network, network-uri, normaldistribution, parallel, random, repa + , stm, template-haskell, time, transformers, utf8-string, vector + , xml }: mkDerivation { pname = "parconc-examples"; @@ -143497,12 +143990,12 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - abstract-par accelerate array async base binary bytestring - containers deepseq directory distributed-process - distributed-process-simplelocalnet distributed-static filepath - http-conduit monad-par network network-uri normaldistribution - parallel random repa stm template-haskell time transformers - utf8-string vector xml + abstract-par accelerate accelerate-io array async base binary + bytestring containers deepseq directory distributed-process + distributed-process-simplelocalnet distributed-static fclabels + filepath http-conduit monad-par network network-uri + normaldistribution parallel random repa stm template-haskell time + transformers utf8-string vector xml ]; homepage = "http://github.com/simonmar/parconc-examples"; description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; @@ -143606,7 +144099,6 @@ self: { libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-free" = callPackage @@ -143839,6 +144331,19 @@ self: { 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 { @@ -143896,17 +144401,17 @@ self: { "parsers" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal , cabal-doctest, charset, containers, directory, doctest, filepath - , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text - , transformers, unordered-containers + , mtl, parsec, QuickCheck, quickcheck-instances, scientific + , semigroups, text, transformers, unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.5"; - sha256 = "1azwy5wfjv75kjwcyrglq70dmc8f6a091bgyv0wsls4f5zv0qb3k"; + version = "0.12.7"; + sha256 = "032dgh0ydy4cbvnjhgp0krnqnvlibphvm30gvmqvpxk9l4pmn435"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base base-orphans charset containers mtl parsec - scientific text transformers unordered-containers + scientific semigroups text transformers unordered-containers ]; testHaskellDepends = [ attoparsec base bytestring containers directory doctest filepath @@ -144009,7 +144514,6 @@ self: { homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-lens" = callPackage @@ -144044,7 +144548,6 @@ 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-uri" = callPackage @@ -144092,6 +144595,7 @@ self: { pname = "passage"; version = "0.1"; sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory filepath GraphSCC monadLib mwc-random pretty primitive process random @@ -144186,6 +144690,7 @@ self: { pname = "patch-combinators"; version = "0.2.2"; sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A library for patching functions and data structures"; license = stdenv.lib.licenses.bsd3; @@ -144308,20 +144813,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_3_1" = callPackage + "path-io_1_3_3" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.3.1"; - sha256 = "166wxidsfyyv609bjfrn204k7lia02hgb4kmmbfv716dplywsb0q"; + version = "1.3.3"; + sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat ]; testHaskellDepends = [ - base exceptions hspec path transformers unix-compat + base directory exceptions hspec path transformers unix-compat ]; homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; @@ -144688,6 +145193,7 @@ self: { pname = "pcf"; version = "0.1.0.1"; sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bound c-dsl containers monad-gen mtl prelude-extras transformers void @@ -144791,8 +145297,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.8.1"; - sha256 = "1mqyjzccpj2ybwjhjx68bisn1zm9zwmf73hqkyqb5q5k2d7c2bvc"; + version = "0.1.8.1.1"; + sha256 = "1x3db1hab0qwpw9m4564x86qibzg8jl6cj2k88jii3ihcg580ahz"; libraryHaskellDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -144826,7 +145332,6 @@ 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 @@ -144842,8 +145347,8 @@ self: { }: mkDerivation { pname = "pdf-slave-server"; - version = "0.1.1.0"; - sha256 = "0vjajkb0hamn68klihk6i6xwc6qc8ann5miqh9w71vgmwc5ksz0g"; + version = "0.1.2.0"; + sha256 = "16s1wgbvs7j8fbw82wwz8qxgyvvvcqjb54q2sb5qwjmlijw0rdwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144856,7 +145361,7 @@ self: { unordered-containers uuid wreq yaml ]; executableHaskellDepends = [ - base optparse-applicative wai-extra warp + base lens optparse-applicative text wai-extra warp ]; homepage = "https://github.com/NCrashed/pdf-slave-server#readme"; description = "Web service for pdf-slave tool"; @@ -144878,7 +145383,6 @@ self: { homepage = "https://github.com/ncrashed/pdf-slave#readme"; description = "Template format definition for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-content" = callPackage @@ -144988,6 +145492,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdfname" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative + , pdfinfo, text + }: + mkDerivation { + pname = "pdfname"; + version = "0.3"; + sha256 = "01xy5rg2n1x2fpqwhnbrmxqqma40zxr8ac0mv06qnyidyggrsggz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative pdfinfo text + ]; + 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 ({ mkDerivation, base, directory, pdfinfo, process, temporary }: mkDerivation { @@ -145013,6 +145536,7 @@ self: { pname = "pdynload"; version = "0.0.3"; sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath ghc ghc-paths old-time process ]; @@ -145043,12 +145567,11 @@ self: { pname = "peano"; version = "0.1.0.1"; sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; - revision = "1"; - editedCabalFile = "0sf4iv77bgkr4n50ap27cxy9gkdx030dbg3f6wxk0rwa7sxdjkal"; + revision = "2"; + editedCabalFile = "10b0vjc7lnfkscg2c8hhqbvf1xdvgbr3njrs9b4ick91n44vjbhk"; libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -145073,6 +145596,7 @@ self: { sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base Cabal cmdargs containers deepseq derive grm mtl shake syb uniplate wl-pprint @@ -145092,6 +145616,7 @@ self: { pname = "pecoff"; version = "0.11"; sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for PE/COFF format"; license = stdenv.lib.licenses.bsd3; @@ -145130,6 +145655,7 @@ self: { base hashtables haskell-src-meta ListLike monad-control mtl template-haskell ]; + executableHaskellDepends = [ base ]; homepage = "http://tanakh.github.com/Peggy"; description = "The Parser Generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -145164,6 +145690,7 @@ self: { pname = "pem"; version = "0.2.2"; sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring mtl ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -145258,6 +145785,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "penrose" = callPackage + ({ mkDerivation, ad, aeson, base, containers, gloss, megaparsec + , old-time, random, text, websockets + }: + mkDerivation { + pname = "penrose"; + version = "0.1.0.2"; + sha256 = "0yva42b0av532a99kl0ldcfi229vs2m09w445r981i30xlilg5is"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ad aeson base containers gloss megaparsec old-time random text + websockets + ]; + homepage = "http://penrose.ink"; + description = "A system that automatically visualize mathematics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "peparser" = callPackage ({ mkDerivation, base, binary, bytestring, haskell98 }: mkDerivation { @@ -145331,6 +145878,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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; + }) {}; + "perfecthash" = callPackage ({ mkDerivation, array, base, bytestring, cmph, containers , criterion, deepseq, hspec, QuickCheck, random, time @@ -145373,7 +145944,6 @@ self: { homepage = "https://github.com/w3rs/period"; description = "Parse and format date periods, collapse and expand their text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "periodic" = callPackage @@ -145457,8 +146027,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.4.1.1"; - sha256 = "1mjp9ha14i3llp8xvlhrcp0x2vjqphdbgzf2pgw29qndnbigsqnx"; + version = "0.5.1.1"; + sha256 = "0n0ycgssq9aslbb024a59c3hgxbgwmd7cz8hz03ac07xdl7z9sc0"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -145469,33 +146039,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistable-record_0_5_0_1" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , quickcheck-simple, template-haskell, th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.5.0.1"; - sha256 = "0r0b23ixshsqqlqpg9jik5kkbdn5cxsr05bcmjwf3wcyrbl5c3g3"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql }: mkDerivation { pname = "persistable-types-HDBC-pg"; - version = "0.0.1.4"; - sha256 = "0nsnb4j6s2sjz66bagag039iv45ss6a3ggg25h3b7fnx2rcl7cnf"; + version = "0.0.1.5"; + sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949"; libraryHaskellDepends = [ base bytestring convertible HDBC persistable-record relational-query-HDBC text-postgresql @@ -145506,40 +146057,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, 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.6.1"; - sha256 = "0zjz827cljka8y54gljmkjg0pyxqgvag2hf5qzhclzbjgdp0z7n7"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger 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; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_7_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -145570,7 +146087,6 @@ self: { 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 ]; }) {}; @@ -145601,7 +146117,6 @@ self: { ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-cereal" = callPackage @@ -145730,7 +146245,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql" = callPackage @@ -145750,7 +146264,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -145778,6 +146291,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql-haskell_0_3_3" = 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.3"; + sha256 = "1dvdz1l5kpliy9h3l11vlrx9yis7a1a54fnj2c764pg6s5kp8rjq"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -145810,7 +146349,6 @@ self: { testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-postgresql" = callPackage @@ -145862,7 +146400,6 @@ self: { homepage = "https://github.com/jprider63/persistent-ratelimit"; description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-redis" = callPackage @@ -145925,6 +146462,7 @@ self: { homepage = "http://github.com/himura/persistent-relational-record"; description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-sqlite" = callPackage @@ -145944,6 +146482,7 @@ self: { 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 @@ -146077,6 +146616,7 @@ self: { sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base process ]; homepage = "http://www.cs.chalmers.se/~aarne/pesca/"; description = "Proof Editor for Sequent Calculus"; @@ -146095,6 +146635,7 @@ self: { pname = "peyotls"; version = "0.1.6.10"; sha256 = "0x1qrh1nz3fr662701d8r7l23flwiv6az2wwcx48bp0vrk08lwww"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ asn1-encoding asn1-types base bytable bytestring cipher-aes crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random @@ -146158,6 +146699,7 @@ self: { sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring HTTP ]; executableHaskellDepends = [ async base ini postgresql-simple random scotty text transformers @@ -146190,6 +146732,7 @@ self: { sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ async base ini postgresql-simple random scotty text transformers ]; @@ -146199,6 +146742,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pg-recorder" = callPackage + ({ mkDerivation, base, bytestring, contravariant, either, hasql + , hasql-pool, hspec, optparse-applicative, optparse-text + , postgresql-libpq, protolude, resource-pool, stringsearch, text + }: + mkDerivation { + pname = "pg-recorder"; + version = "0.2.0.0"; + sha256 = "1584c355alhwar346ag7pd5q0vrpl40fiqj66fbildamiqchjmvd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring contravariant either hasql hasql-pool + optparse-applicative optparse-text postgresql-libpq protolude + resource-pool stringsearch text + ]; + executableHaskellDepends = [ base protolude ]; + testHaskellDepends = [ + base hasql hasql-pool hspec postgresql-libpq protolude + resource-pool + ]; + homepage = "https://github.com/githubuser/pg-recorder#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pg-store" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck @@ -146256,8 +146826,10 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.8"; - sha256 = "127xgzx1j2d4flqykgb6vp57zjmyc6jkx8l2jak4df68wpcy1gwq"; + version = "10.9"; + sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; + revision = "3"; + editedCabalFile = "0ia214ixkjaz26j998visf4x25g12fwb5z6cpi31r7wz5lhz5z39"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146268,7 +146840,6 @@ self: { ]; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -146435,6 +147006,7 @@ self: { sha256 = "0s2m9y7zb0219dz547z5d4plgrnaqvwzsbvm5cw7mv8dq043zdf3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Cabal cmdargs conduit conduit-extra ConfigFile containers directory filepath gtk3 hslogger HStringTemplate @@ -146448,20 +147020,19 @@ self: { "phoityne-vscode" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit , conduit-extra, ConfigFile, containers, directory, filepath - , fsnotify, hslogger, HStringTemplate, MissingH, mtl, parsec - , process, resourcet, safe, split, text, transformers + , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet + , safe, split, text, transformers }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.14.0"; - sha256 = "1csz0h91yka230vab626dc5qqay00ircgfs2x5z4gj3s67wh5fg5"; + version = "0.0.15.0"; + sha256 = "1r4wbf6x19gzmz88f770si5mvrya9adgilgs76kc36ynlsz5jyrp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cmdargs conduit conduit-extra - ConfigFile containers directory filepath fsnotify hslogger - HStringTemplate MissingH mtl parsec process resourcet safe split - text transformers + ConfigFile containers directory filepath fsnotify hslogger MissingH + mtl parsec process resourcet safe split text transformers ]; homepage = "https://github.com/phoityne/phoityne-vscode"; description = "ghci debug viewer on Visual Studio Code"; @@ -146474,6 +147045,7 @@ self: { pname = "phone-metadata"; version = "0.0.1.5"; sha256 = "0zn98kf23rn9ay9n4gd2v2jpafppz6r2kxk5m9na6xm437gx5xmb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers hxt regex-pcre text ]; testHaskellDepends = [ base hspec ]; description = "Phonenumber Metadata - NOTE: this is now deprecated!"; @@ -146481,19 +147053,20 @@ self: { }) {}; "phone-numbers" = callPackage - ({ mkDerivation, base, bytestring, phonenumber }: + ({ mkDerivation, base, bytestring, c2hs, phonenumber, protobuf }: mkDerivation { pname = "phone-numbers"; - version = "0.1.0"; - sha256 = "10afhnlphgyxsmkv576c5gf5b78d3j2qs46s2crlgfav1y9crv0f"; + version = "0.1.1"; + sha256 = "09b5qp7c059wah6wddn71hk6ciijj07qylxh3xcff0qyvjqd18ya"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ phonenumber ]; + librarySystemDepends = [ phonenumber protobuf ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/christian-marie/phone-numbers"; description = "Haskell bindings to the libphonenumber library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {phonenumber = null;}; + }) {phonenumber = null; inherit (pkgs) protobuf;}; "phone-push" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring @@ -146626,6 +147199,7 @@ self: { sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ AES base binary byteable bytestring containers cryptohash HTTP io-streams mtl network parsec RSA transformers @@ -146671,6 +147245,7 @@ self: { sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock deepseq text unix unordered-containers ]; @@ -146823,16 +147398,16 @@ self: { }) {}; "pid1" = callPackage - ({ mkDerivation, base, process, unix }: + ({ mkDerivation, base, directory, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.0.1"; - sha256 = "1j25fgp44ww1iy2ybj3jy7frlf30ypvmnrwpm38qlm96ak46sfqn"; + version = "0.1.2.0"; + sha256 = "0xkz4vdh8cblpl8k2xmqs8vwv2c0vpxdbikcf2dnmzbg9fdvz5wy"; revision = "1"; - editedCabalFile = "0ii76hs4yg72w8pyynb7fbs80fw4knkfsv1gxqkagnm10hf3y8gk"; + editedCabalFile = "11yg5pjci1d6p5ml0ic4vqn70vjx8vvhqs20rahgfqhh8palkyw9"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base process unix ]; + libraryHaskellDepends = [ base directory process unix ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/fpco/pid1#readme"; description = "Do signal handling and orphan reaping for Unix PID1 init processes"; @@ -146873,6 +147448,7 @@ self: { sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base mtl parsec text ]; homepage = "http://www.mew.org/~kazu/proj/piki/"; description = "Yet another text-to-html converter"; @@ -146889,8 +147465,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.4"; - sha256 = "168yb6pgab0aildg0mj8707q7xyr4firf23a810y7nxy36mksk56"; + version = "0.9.12.5"; + sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -146967,6 +147543,7 @@ self: { sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring editor-open Hclip safe ]; @@ -147034,7 +147611,6 @@ self: { homepage = "https://github.com/jwiegley/pipes-async"; description = "A higher-level interface to using concurrency with pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-attoparsec" = callPackage @@ -147136,14 +147712,15 @@ self: { "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , transformers + , stringsearch, transformers }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.5"; - sha256 = "10snjd1abl954gbcl2vxn5vsj830k4sb1jxs8z3h372has13ls9c"; + version = "2.1.6"; + sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i"; libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse transformers + base bytestring pipes pipes-group pipes-parse stringsearch + transformers ]; description = "ByteString support for pipes"; license = stdenv.lib.licenses.bsd3; @@ -147158,6 +147735,7 @@ self: { pname = "pipes-bzip"; version = "0.2.0.4"; sha256 = "12mhs3ylqqkp4dvir67lgwg3izma88j5xpi7fc7jlvlka24vbnkp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring data-default mtl pipes pipes-safe ]; @@ -147173,28 +147751,13 @@ self: { }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes - }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.4.1"; - sha256 = "0q2k9kjl8fvqfkf20d5rr5ybh4p2vyaigi435v8ix5dfqj3m5wdw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring cacophony memory pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pipes-cacophony_0_5_0" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: mkDerivation { pname = "pipes-cacophony"; version = "0.5.0"; sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20"; + revision = "1"; + editedCabalFile = "1qv6h09y5pca3agkmn12lg9vlbm5j8s3dnrn98w9agj62jrvymzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cacophony pipes ]; @@ -147202,7 +147765,6 @@ self: { homepage = "https://github.com/centromere/pipes-cacophony#readme"; description = "Pipes for Noise-secured network connections"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-category" = callPackage @@ -147505,8 +148067,8 @@ self: { }: mkDerivation { pname = "pipes-group"; - version = "1.0.6"; - sha256 = "0rmpi9gb151gsmvx9f0q9vssd6fsf08ifxxynfp5jnv7lxmnzb87"; + version = "1.0.7"; + sha256 = "0p0bfc91ij481bybk99jpfczkkcz3v7mcr0y03kvhxddf575jhw6"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -147551,13 +148113,12 @@ self: { ({ mkDerivation, base, containers, heaps, pipes }: mkDerivation { pname = "pipes-interleave"; - version = "1.1.1"; - sha256 = "0l7g184ksrh9qy8ixh49iv13amiwh40v6bbx0gcgq451knfl4n17"; + version = "1.1.2"; + sha256 = "0anjd66z0z7813jcakqcagp4ml8q4dg6bvygy8mn2jqggm2bqs4d"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-io" = callPackage @@ -147623,8 +148184,8 @@ self: { }: mkDerivation { pname = "pipes-lzma"; - version = "0.1.1.1"; - sha256 = "09ndjxrfh55269gjpm61h65bk0xcv46dah8i0svxcdq4myc8d9r4"; + version = "0.1.1.2"; + sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring lzma pipes ]; @@ -147639,27 +148200,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.2.5.0"; - sha256 = "0s9nxpqhfybgh35308dj185zn6ah829gfaqfldsczvr1ri6rdkv9"; - 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_3_0_0" = callPackage ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl , pipes, pipes-category, pipes-concurrency, semigroups, stm , transformers @@ -147678,7 +148218,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 @@ -147859,10 +148398,8 @@ self: { }: mkDerivation { pname = "pipes-s3"; - version = "0.3.0.2"; - sha256 = "1rx45znf7ln23gd41fwgfzvqzgqw59w7ab7vnk175waayldbp2gx"; - revision = "1"; - editedCabalFile = "0w1bmf15k6jdiqpcfv8gk41zhh2kr33ch3r72g6rxh42akia99iy"; + version = "0.3.0.3"; + sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -148031,10 +148568,12 @@ self: { libraryHaskellDepends = [ base bytestring pipes pipes-safe semigroups zeromq4-haskell ]; + executableHaskellDepends = [ + base bytestring pipes pipes-safe semigroups zeromq4-haskell + ]; 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 @@ -148069,6 +148608,7 @@ self: { sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers haskeline haskeline-class mpppc mtl parsec text utf8-string @@ -148336,6 +148876,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "platinum-parsing" = callPackage + ({ mkDerivation, base, binary, clock, containers, data-hash + , directory, fgl, hspec, HStringTemplate, mtl, optparse-applicative + , parsec, text, vector, yaml + }: + mkDerivation { + pname = "platinum-parsing"; + version = "0.1.0.0"; + sha256 = "1xngg7w238ngfwj2sz8rgkjnbhlqiz3lqnl6k3akfn9s6cdgk82y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers fgl HStringTemplate mtl parsec text vector + ]; + executableHaskellDepends = [ + base binary clock containers data-hash directory fgl mtl + optparse-applicative text vector yaml + ]; + testHaskellDepends = [ base containers fgl hspec vector ]; + homepage = "https://github.com/chlablak/platinum-parsing"; + description = "General Framework for compiler development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "playlists" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath , hspec, optparse-applicative, text, word8 @@ -148358,7 +148923,6 @@ self: { homepage = "https://github.com/pjones/playlists"; description = "Library and executable for working with playlist files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "playlists-http" = callPackage @@ -148386,6 +148950,7 @@ self: { pname = "plist"; version = "0.0.6"; sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring hxt ]; description = "Generate and parse Mac OS X property list format"; license = stdenv.lib.licenses.bsd3; @@ -148486,13 +149051,13 @@ self: { pname = "plot-gtk-ui"; version = "0.3.0.2"; sha256 = "1nhq0l687dhphnxkd0zh3z96551b91d7js625l4fyn40g5099s77"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour fixed-vector gtk hmatrix plot text vector ]; 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 @@ -148517,6 +149082,7 @@ self: { sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base colour gtk hmatrix plot text vector ]; @@ -148526,6 +149092,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "plot-light" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg + , colour, hspec, mtl, palette, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "plot-light"; + version = "0.2.7"; + sha256 = "0w1mbhws7fs0kld61fd9f9xyvfpzsjhh6ic6ny89gka4421p002s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-svg colour mtl palette scientific text time + ]; + executableHaskellDepends = [ + attoparsec attoparsec-time base blaze-svg colour palette scientific + text time + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/plot-light"; + description = "A lightweight plotting library, exporting to SVG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plotfont" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { @@ -148559,8 +149149,8 @@ self: { ({ mkDerivation, base, hspec, optparse-applicative, process }: mkDerivation { pname = "ploton"; - version = "0.1.0.0"; - sha256 = "0iv4ngwf7zj20wglpa2klj5a39nfqmwbh7s1kivrlia1mi0xck3d"; + version = "0.3.0.0"; + sha256 = "1c045pc42bangg2rlclc91ad78ynjbc5lccmc33hjswcxynv6lj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optparse-applicative process ]; @@ -148625,7 +149215,6 @@ 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 @@ -148693,7 +149282,6 @@ self: { executableHaskellDepends = [ base bytestring linear vector ]; description = "PLY file loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "png-file" = callPackage @@ -148721,6 +149309,7 @@ self: { pname = "pngload"; version = "0.1"; sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring haskell98 mtl parsec zlib ]; @@ -148735,6 +149324,7 @@ self: { pname = "pngload-fixed"; version = "1.0"; sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring mtl parsec zlib ]; description = "Pure Haskell loader for PNG images"; license = stdenv.lib.licenses.bsd3; @@ -149112,7 +149702,6 @@ self: { libraryHaskellDepends = [ base constraints ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poly-control" = callPackage @@ -149264,7 +149853,6 @@ self: { homepage = "https://github.com/kawu/polysoup"; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polytypeable" = callPackage @@ -149438,7 +150026,6 @@ 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 @@ -149531,6 +150118,7 @@ self: { pname = "pop3-client"; version = "0.1.4"; sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl network ]; homepage = "https://github.com/tmrudick/haskell-pop3-client/"; description = "POP3 Client Library"; @@ -149543,6 +150131,7 @@ self: { pname = "popenhs"; version = "1.0.0"; sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory haskell98 unix ]; homepage = "http://www.haskell.org/~petersen/haskell/popenhs/"; description = "popenhs is a popen-like library for Haskell"; @@ -149559,6 +150148,7 @@ self: { pname = "poppler"; version = "0.14.1"; sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl @@ -149721,7 +150311,6 @@ self: { homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) acl;}; "posix-error-codes" = callPackage @@ -149881,34 +150470,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, conversion, conversion-bytestring, conversion-text - , criterion, foldl, json-ast, loch-th, placeholders - , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase - , scientific, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.9.3"; - sha256 = "012xd34nq18vdlwccqypyjslhr1iqnah6ic9kprjfsawri60mhgx"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring foldl loch-th - placeholders scientific text time transformers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - homepage = "https://github.com/nikita-volkov/postgresql-binary"; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -149937,7 +150498,6 @@ 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 @@ -150054,6 +150614,7 @@ self: { sha256 = "0kxg5z0s82ipcmynpxisq0a3rbhg630rk0xgyrqjcimxh7094n2y"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base blaze-builder bytestring bytestring-builder directory filepath ghc-prim mtl old-locale postgresql-simple process text @@ -150111,6 +150672,7 @@ self: { sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base basic-prelude postgresql-simple shelly text ]; @@ -150121,7 +150683,6 @@ 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 @@ -150166,7 +150727,6 @@ self: { ]; description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -150175,8 +150735,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.9.0"; - sha256 = "0skjc5ivcrhi0f49p0j2f0k69qfv4argvkz5mvd8kn5q381jyp80"; + version = "0.1.11.0"; + sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150211,31 +150771,21 @@ self: { 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-queue" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base - , bytestring, data-default, exceptions, hspec, hspec-discover - , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async - , lifted-base, monad-control, optparse-generic, pg-transact - , postgresql-simple, postgresql-simple-opts, random, resource-pool - , text, time, transformers, uuid + ({ 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 }: mkDerivation { pname = "postgresql-simple-queue"; - version = "0.1.0.1"; - sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9"; - isLibrary = true; - isExecutable = true; + version = "0.5.0.1"; + sha256 = "0nzl7yknva09gwrmnvk4swlkgdksbcxw83bk4cacnmm2n42y3h8a"; libraryHaskellDepends = [ - aeson base bytestring data-default exceptions lifted-async - lifted-base monad-control optparse-generic pg-transact - postgresql-simple postgresql-simple-opts random resource-pool text - time transformers uuid - ]; - executableHaskellDepends = [ - aeson amazonka amazonka-ses base lens lifted-base text + aeson base bytestring exceptions monad-control pg-transact + postgresql-simple random text time transformers ]; testHaskellDepends = [ aeson async base bytestring hspec hspec-discover @@ -150420,23 +150970,25 @@ self: { "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base - , base64-bytestring, bytestring, configurator, containers, either - , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json - , http-types, jwt, lens, lens-aeson, optparse-applicative - , postgresql-libpq, protolude, retry, stm, stm-containers, text - , time, transformers, unix, unordered-containers, wai - , wai-app-static, wai-extra, wai-websockets, warp, websockets + , base64-bytestring, bytestring, configurator, containers + , contravariant, either, hasql, hasql-pool, heredoc, hspec + , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson + , optparse-applicative, postgresql-libpq, protolude, retry, stm + , stm-containers, stringsearch, text, time, transformers, unix + , unordered-containers, wai, wai-app-static, wai-extra + , wai-websockets, warp, websockets }: mkDerivation { pname = "postgrest-ws"; - version = "0.3.2.0"; - sha256 = "04jj51fhssw4fa050qa8pk559m38kc8mharswidxph52vi6jv051"; + version = "0.4.0.0"; + sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring either hasql hasql-pool http-types jwt lens - lens-aeson postgresql-libpq protolude retry stm stm-containers text - time unordered-containers wai wai-websockets websockets + aeson base bytestring contravariant either hasql hasql-pool + http-types jwt lens lens-aeson postgresql-libpq protolude retry stm + stm-containers stringsearch text time unordered-containers wai + wai-websockets websockets ]; executableHaskellDepends = [ ansi-wl-pprint auto-update base base64-bytestring bytestring @@ -150455,8 +151007,8 @@ self: { "postie" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cprng-aes - , data-default-class, mtl, network, pipes, pipes-parse - , stringsearch, tls, transformers, uuid + , data-default-class, mtl, network, pipes, pipes-bytestring + , pipes-parse, stringsearch, tls, transformers, uuid }: mkDerivation { pname = "postie"; @@ -150468,6 +151020,9 @@ self: { attoparsec base bytestring cprng-aes data-default-class mtl network pipes pipes-parse stringsearch tls transformers uuid ]; + executableHaskellDepends = [ + base bytestring data-default-class pipes pipes-bytestring tls + ]; description = "SMTP server library to receive emails from within Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150479,14 +151034,15 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.1.1"; - sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw"; + version = "0.2.0"; + sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers http-client-tls http-types network-api-support text ]; + executableHaskellDepends = [ base text ]; homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; @@ -150527,7 +151083,6 @@ self: { homepage = "http://github.com/peti/postmaster"; description = "Postmaster ESMTP Server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potato-tool" = callPackage @@ -150573,7 +151128,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powermate" = callPackage @@ -150589,7 +151143,6 @@ self: { homepage = "https://github.com/ppelleti/powermate"; description = "bindings for Griffin PowerMate USB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerpc" = callPackage @@ -150710,16 +151263,16 @@ self: { homepage = "https://github.com/gdevanla/pptable#readme"; description = "Pretty Print containers in a tabular format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pqc" = callPackage - ({ mkDerivation, base, QuickCheck, random, stm }: + ({ mkDerivation, base, ChasingBottoms, QuickCheck, random, stm }: mkDerivation { pname = "pqc"; version = "0.8"; sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4"; libraryHaskellDepends = [ base QuickCheck random stm ]; + testHaskellDepends = [ base ChasingBottoms ]; homepage = "http://hub.darcs.net/shelarcy/pqc"; description = "Parallel batch driver for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -150730,8 +151283,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "pqueue"; - version = "1.3.2.2"; - sha256 = "0daha45lb7k372nv3nd29lbl7qmz4yp7hwa4p2w0yp1j8mwvbd97"; + version = "1.3.2.3"; + sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; @@ -150764,6 +151317,7 @@ self: { sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring data-default directory json mps ]; @@ -150804,8 +151358,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.44"; - sha256 = "03x71m1sgq5l70xkmlvi8v3805xa39fbg9py54sqfdyk2rg56zyy"; + version = "0.0.49"; + sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150988,9 +151542,10 @@ self: { }) {}; "prefork" = callPackage - ({ mkDerivation, base, cab, containers, data-default, directory - , filepath, hspec, process, stm, system-argv0, system-filepath - , unix + ({ mkDerivation, async, base, blaze-builder, bytestring, cab + , cmdargs, containers, data-default, directory, filepath, hspec + , http-types, network, process, stm, system-argv0, system-filepath + , unix, wai, warp }: mkDerivation { pname = "prefork"; @@ -151002,6 +151557,10 @@ self: { base containers data-default process stm system-argv0 system-filepath unix ]; + executableHaskellDepends = [ + async base blaze-builder bytestring cmdargs containers http-types + network stm unix wai warp + ]; testHaskellDepends = [ base cab containers directory filepath hspec process stm unix ]; @@ -151028,7 +151587,6 @@ self: { homepage = "https://github.com/jxv/pregame"; description = "Prelude for applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "preliminaries" = callPackage @@ -151051,7 +151609,6 @@ self: { homepage = "http://github.com/kerscher/preliminaries"; description = "A larger alternative to the Prelude"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prelude-compat" = callPackage @@ -151228,7 +151785,6 @@ self: { homepage = "https://github.com/chrisdone/present"; description = "Make presentations for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "press" = callPackage @@ -151302,12 +151858,18 @@ self: { }) {}; "pretty-compact" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , criterion, deepseq, pretty, text, unordered-containers, wl-pprint + }: mkDerivation { pname = "pretty-compact"; - version = "2.0"; - sha256 = "09nyx24b15qgk6cn71m05q56kfcvm2582wywf8b9d1h0k4bhic0k"; - libraryHaskellDepends = [ base containers ]; + version = "3.0"; + sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8"; + libraryHaskellDepends = [ base base-compat containers ]; + benchmarkHaskellDepends = [ + aeson base base-compat bytestring criterion deepseq pretty text + unordered-containers wl-pprint + ]; description = "Pretty-printing library"; license = "GPL"; }) {}; @@ -151340,7 +151902,6 @@ self: { homepage = "https://github.com/jml/pretty-error"; description = "Pretty error messages for runtime invariants"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-hex" = callPackage @@ -151375,6 +151936,7 @@ self: { sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base filepath ghc-prim haskell-lexer pretty ]; @@ -151386,8 +151948,8 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, criterion - , doctest, Glob, mtl, parsec, text, transformers + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , criterion, doctest, Glob, mtl, parsec, text, transformers }: mkDerivation { pname = "pretty-simple"; @@ -151398,12 +151960,12 @@ self: { libraryHaskellDepends = [ ansi-terminal base containers mtl parsec text transformers ]; + executableHaskellDepends = [ aeson base bytestring text ]; testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/cdepillabout/pretty-simple"; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -151464,25 +152026,26 @@ self: { }) {}; "prettyprinter" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion - , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, transformers }: mkDerivation { pname = "prettyprinter"; - version = "1.1"; - sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y"; - revision = "1"; - editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy"; + version = "1.1.1"; + sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base template-haskell text ]; testHaskellDepends = [ - base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit + base bytestring doctest pgp-wordlist tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ - ansi-wl-pprint base criterion mtl random text transformers + ansi-wl-pprint base containers criterion deepseq mtl QuickCheck + random text transformers ]; homepage = "http://github.com/quchen/prettyprinter"; description = "A modern, easy to use, well-documented, extensible prettyprinter"; @@ -151494,8 +152057,10 @@ self: { }: mkDerivation { pname = "prettyprinter-ansi-terminal"; - version = "1.1"; - sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj"; + version = "1.1.1.1"; + sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl"; + revision = "1"; + editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf"; libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/quchen/prettyprinter"; @@ -151547,6 +152112,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-convert-ansi-wl-pprint" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest + , prettyprinter, prettyprinter-ansi-terminal, text + }: + mkDerivation { + pname = "prettyprinter-convert-ansi-wl-pprint"; + version = "1.1"; + sha256 = "03565w1qvqgdr1g2nwj3d2xpqbx04xm45pjfkb9d6jb2fww2v65q"; + revision = "1"; + editedCabalFile = "1c4zcscmvq0vbdgnp7n0avv8si5jshl4kw2qd1lqmhr28kj8x45f"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ base doctest ]; + 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 ({ mkDerivation, base, prettyprinter, vty }: mkDerivation { @@ -151559,12 +152145,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "preview" = callPackage + ({ mkDerivation, base, containers, pretty, strict-data, text + , util-plus + }: + mkDerivation { + pname = "preview"; + version = "0.1.0.4"; + sha256 = "0z8dz0frc43jnm65iybvpcn2689c3q2iy3zdqjs623clwsvrmh3b"; + libraryHaskellDepends = [ + base containers pretty strict-data text util-plus + ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "The method of previewing data (instead of wholly show-ing it)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-array" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "prim-array"; - version = "0.2"; - sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9"; + version = "0.2.1"; + sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; @@ -151627,21 +152229,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "primitive"; - version = "0.6.1.0"; - sha256 = "1j1q7l21rdm8kfs93vibr3xwkkhqis181w2k6klfhx5g5skiywwk"; - revision = "1"; - editedCabalFile = "0gb8lcn6bd6ilfln7ah9jmqq6324vgkrgdsnz1qvlyj3bi2w5ivf"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ base ghc-prim ]; - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6_2_0" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -151654,7 +152241,6 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-simd" = callPackage @@ -151684,6 +152270,7 @@ self: { sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ConfigFile containers directory happstack happstack-helpers happstack-server happstack-state hsp MissingH mtl old-locale @@ -151705,6 +152292,7 @@ self: { sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base ConfigFile directory HTTP mtl network parsec utf8-string XMPP ]; @@ -151729,7 +152317,6 @@ 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 @@ -151873,6 +152460,7 @@ self: { pname = "probability"; version = "0.2.5.1"; sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -151932,14 +152520,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_0_0" = callPackage + "process_1_6_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.0.0"; - sha256 = "02ysv3ygfa97w9yqr9m5ks8yg49rpjmwdx1hq8bl83cawjkwjd1m"; + version = "1.6.1.0"; + sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -152213,25 +152801,6 @@ self: { }) {}; "product-profunctors" = callPackage - ({ mkDerivation, base, contravariant, profunctors, tagged - , template-haskell - }: - mkDerivation { - pname = "product-profunctors"; - version = "0.7.1.0"; - sha256 = "0d6kp4dpdhi0jsmajdyp2c1bxgzrph8imb4jnq1jajrkv7ms004q"; - revision = "1"; - editedCabalFile = "1rds0bhac5f45nsa0riv3b730vmxqkmh0s305bic32a4mljd3ajn"; - libraryHaskellDepends = [ - base contravariant profunctors tagged template-haskell - ]; - testHaskellDepends = [ base profunctors ]; - homepage = "https://github.com/tomjaguarpaw/product-profunctors"; - description = "product-profunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "product-profunctors_0_8_0_3" = callPackage ({ mkDerivation, base, contravariant, profunctors, tagged , template-haskell }: @@ -152246,7 +152815,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prof2dot" = callPackage @@ -152276,6 +152844,7 @@ self: { sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers filepath haskell-src-exts semigroups uniplate zenc ]; @@ -152315,6 +152884,7 @@ self: { sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers filepath ghc-prof js-jquery scientific text unordered-containers vector @@ -152343,10 +152913,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.2"; - sha256 = "1905xv9y2sx1iya0zlrx7nxhlwap5vn144nxg7s8zsj58xff59w7"; - revision = "1"; - editedCabalFile = "1q0zva60kqb560fr0ii0gm227sg6q7ddbhriv64l6nfv509vw32k"; + version = "5.2.1"; + sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -152400,6 +152968,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base io-reactive ]; + executableHaskellDepends = [ base ]; description = "Progressbar API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -152456,6 +153025,75 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) proj;}; + "project-m36" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, Cabal, cassava, conduit, containers, criterion + , cryptohash-sha256, data-interval, deepseq, deepseq-generics + , directory, distributed-process, distributed-process-async + , distributed-process-client-server, distributed-process-extras + , either, extended-reals, filepath, ghc, ghc-boot, ghc-paths, Glob + , gnuplot, hashable, hashable-time, haskeline, http-api-data, HUnit + , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network + , network-transport, network-transport-tcp, old-locale + , optparse-applicative, parallel, path-pieces, random + , random-shuffle, resourcet, semigroups, stm, stm-containers + , template-haskell, temporary, text, time, transformers, unix + , unordered-containers, uuid, uuid-aeson, vector + , vector-binary-instances, websockets + }: + mkDerivation { + pname = "project-m36"; + version = "0.1"; + sha256 = "0g816q602vjkk0ix8wxwlc0w7fx9xaid9qiib9811y7ad4v9zkih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring cassava + conduit containers cryptohash-sha256 data-interval deepseq + deepseq-generics directory distributed-process + distributed-process-async distributed-process-client-server + distributed-process-extras either extended-reals filepath ghc + ghc-boot ghc-paths Glob gnuplot hashable hashable-time haskeline + http-api-data list-t monad-parallel MonadRandom mtl + network-transport network-transport-tcp old-locale + optparse-applicative parallel path-pieces random-shuffle resourcet + stm stm-containers temporary text time transformers unix + unordered-containers uuid vector vector-binary-instances + ]; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring Cabal + cassava conduit containers data-interval deepseq deepseq-generics + directory either filepath ghc ghc-paths gnuplot hashable + hashable-time haskeline http-api-data HUnit list-t megaparsec + MonadRandom mtl network-transport-tcp optparse-applicative parallel + path-pieces random semigroups stm stm-containers template-haskell + temporary text time transformers unordered-containers uuid + uuid-aeson vector vector-binary-instances websockets + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring Cabal + cassava conduit containers data-interval deepseq deepseq-generics + directory either filepath gnuplot hashable hashable-time haskeline + http-api-data HUnit list-t megaparsec MonadRandom mtl network + network-transport network-transport-tcp optparse-applicative + parallel path-pieces random semigroups stm stm-containers + template-haskell temporary text time transformers + unordered-containers uuid uuid-aeson vector vector-binary-instances + websockets + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring Cabal cassava + containers criterion data-interval deepseq deepseq-generics + directory filepath gnuplot hashable hashable-time haskeline HUnit + megaparsec mtl parallel stm stm-containers temporary text time + unordered-containers uuid vector vector-binary-instances + ]; + homepage = "https://github.com/agentm/project-m36"; + description = "Relational Algebra Engine"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "project-template" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , conduit-extra, containers, directory, filepath, hspec, mtl @@ -152594,31 +153232,6 @@ self: { }) {}; "prometheus-client" = callPackage - ({ mkDerivation, atomic-primops, base, bytestring, containers - , criterion, doctest, hspec, mtl, QuickCheck, random - , random-shuffle, stm, time, transformers, utf8-string - }: - mkDerivation { - pname = "prometheus-client"; - version = "0.1.1"; - sha256 = "0jsa68r8flkhn29yk2qi9b9a3s5yqxzd1ivwydgzrm5izq96x34z"; - libraryHaskellDepends = [ - atomic-primops base bytestring containers mtl stm time transformers - utf8-string - ]; - testHaskellDepends = [ - atomic-primops base bytestring containers doctest hspec mtl - QuickCheck random-shuffle stm time transformers utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion random utf8-string - ]; - homepage = "https://github.com/fimad/prometheus-haskell"; - description = "Haskell client library for http://prometheus.io."; - license = stdenv.lib.licenses.asl20; - }) {}; - - "prometheus-client_0_2_0" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, doctest, hspec, mtl, QuickCheck, random , random-shuffle, stm, transformers, utf8-string @@ -152641,23 +153254,9 @@ self: { homepage = "https://github.com/fimad/prometheus-haskell"; description = "Haskell client library for http://prometheus.io."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-metrics-ghc" = callPackage - ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: - mkDerivation { - pname = "prometheus-metrics-ghc"; - version = "0.1.1"; - sha256 = "1wkyd28g4dklah0g4sf0bp64nb5zr2n3ld9bgp573cbfjlkcyc4w"; - libraryHaskellDepends = [ base prometheus-client utf8-string ]; - testHaskellDepends = [ base doctest prometheus-client ]; - homepage = "https://github.com/fimad/prometheus-haskell"; - description = "Metrics exposing GHC runtime information for use with prometheus-client"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "prometheus-metrics-ghc_0_2_0" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { pname = "prometheus-metrics-ghc"; @@ -152668,7 +153267,6 @@ self: { homepage = "https://github.com/fimad/prometheus-haskell"; description = "Metrics exposing GHC runtime information for use with prometheus-client"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "promise" = callPackage @@ -152736,8 +153334,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.3.0"; - sha256 = "1walyz9x0rxa9n77kr0w7gpm2vnydxq70ii782ygzy0izymhnx39"; + version = "4.7.6"; + sha256 = "0nqhhgrcjq8zbnvarrgn2ijk7pmyb2blzh1896jxij828zq9rddd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152834,7 +153432,7 @@ self: { }) {}; "proteaaudio" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: + ({ mkDerivation, base, bytestring, c2hs, filepath, libpulseaudio }: mkDerivation { pname = "proteaaudio"; version = "0.7.0.1"; @@ -152844,9 +153442,9 @@ self: { libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libpulseaudio ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base bytestring filepath ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libpulseaudio;}; "proto-lens" = callPackage @@ -152865,6 +153463,24 @@ self: { 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 + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -152874,15 +153490,14 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.0.3"; - sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39"; + version = "0.1.1.1"; + sha256 = "1jdp2axwvmdifssqq1i4ik1dv7zn0sdvj6jy45bi0nxyr5mqzhlm"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; homepage = "https://github.com/google/proto-lens"; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-combinators" = callPackage @@ -152909,6 +153524,30 @@ self: { 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 + }: + mkDerivation { + pname = "proto-lens-combinators"; + version = "0.1.0.8"; + sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz"; + 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-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text @@ -152925,19 +153564,35 @@ self: { 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 + }: + mkDerivation { + pname = "proto-lens-descriptors"; + version = "0.2.2.0"; + sha256 = "1vjvr931ylnmpclizbrhqsx0x5jbmcbir0s53zpvm0f0vnwlwgqb"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-optparse" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.0.3"; - sha256 = "16wk5paba9p7rz1z614d9byszygkqvxca78zwxyzjgvyjw1yssyl"; + version = "0.1.0.4"; + sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; homepage = "https://github.com/google/proto-lens"; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage @@ -152954,6 +153609,24 @@ self: { 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 + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + 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-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts @@ -152977,6 +153650,31 @@ self: { ]; 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 + , proto-lens-descriptors, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.3"; + sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -153059,8 +153757,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.0"; - sha256 = "0sgybwg7js8dmzibr6cxn0p1n0m8kc9a3xqdbz7l8d4ili4q4khw"; + version = "2.4.3"; + sha256 = "1spxilp6zk30ijcr3vqgnzbznc0g3050cy9258931vz2zfkjc6kd"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -153070,30 +153768,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers_2_4_2" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.2"; - sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.0"; - sha256 = "1x1xnb3ldgic9y6hskr4h7xdd4lxql2r5fcmsw366b0w631vr57q"; + version = "2.4.3"; + sha256 = "1wwn4lwzl0l8bbw99hdh9xizc39hvjr9cxc5sww8f4zh2vbyw99p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -153110,6 +153791,7 @@ self: { pname = "protocol-buffers-descriptor-fork"; version = "2.0.16"; sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers-fork ]; @@ -153154,6 +153836,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text + , transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.2"; + sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat safe stm text transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -153178,6 +153879,7 @@ self: { pname = "proton-haskell"; version = "0.7"; sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath ]; testHaskellDepends = [ base containers directory filepath HUnit test-framework @@ -153223,18 +153925,6 @@ self: { }) {}; "proxied" = callPackage - ({ mkDerivation, base, generic-deriving, tagged }: - mkDerivation { - pname = "proxied"; - version = "0.2"; - sha256 = "02zf3ix122w1yxkv1hhxl9rf8b052yd3c0s2m933sdzmn9bs3wvn"; - libraryHaskellDepends = [ base generic-deriving tagged ]; - homepage = "https://github.com/RyanGlScott/proxied"; - description = "Make functions consume Proxy instead of undefined"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proxied_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "proxied"; @@ -153244,7 +153934,6 @@ self: { homepage = "https://github.com/RyanGlScott/proxied"; description = "Make functions consume Proxy instead of undefined"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proxy-kindness" = callPackage @@ -153366,29 +154055,6 @@ self: { }) {}; "psqueues" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.2.3"; - sha256 = "1dd6xv1wjxj1xinx155b14hijw8fafrg4096srzdzj7xyqq7qxbd"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_3_0" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue , QuickCheck, random, tagged, test-framework, test-framework-hunit @@ -153409,7 +154075,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -153437,12 +154102,12 @@ self: { sha256 = "1svyfvpqarmfy634s61l1pg7wc9y35bn753zq3vs1rvbw9lmxpj5"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring hedis optparse-generic pipes pipes-bytestring text ]; description = "Pipe stdin to a redis pub/sub channel"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffix" = callPackage @@ -153451,8 +154116,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20170109"; - sha256 = "0i0qkj8xjwksx5sf3px4a06jyay73ikpnsszixch8dmr9rn8p30v"; + version = "0.20170508"; + sha256 = "0nb9ykmzwhm0lrn22g26rv19vxb2b4aifm98x2zk7rs8w6ha4vv4"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -153461,14 +154126,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20170508" = callPackage + "publicsuffix_0_20170802" = callPackage ({ mkDerivation, base, criterion, filepath, hspec, random , template-haskell }: 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 ]; @@ -153583,6 +154248,7 @@ self: { sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers directory MissingH random-fu safe text time vector @@ -153616,7 +154282,6 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-DrIFT" = callPackage @@ -153629,6 +154294,7 @@ self: { sha256 = "0y1y2fbawbypzzrqdj66vh7f7xc6a9bb82bhdmrj5axmi6c5nn0h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers hashable hashtables HsSyck mtl old-time pretty random stm utf8-string @@ -153648,6 +154314,7 @@ self: { pname = "pugs-HsSyck"; version = "0.41"; sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; description = "Fast, lightweight YAML loader and dumper"; license = "unknown"; @@ -153720,6 +154387,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; + executableHaskellDepends = [ base ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; license = stdenv.lib.licenses.lgpl3; }) {inherit (pkgs) libpulseaudio;}; @@ -153798,7 +154466,6 @@ 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 @@ -153918,8 +154585,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.11.5"; - sha256 = "1yqfgmxb8210dzffg4img8f2nzfvys3g583j2948lj03y9q170y1"; + version = "0.11.6"; + sha256 = "0cl4lyx9b1fk4sf94nj6zjj1n5s7wr56ygrxyi0ac7fbav8r42w0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153962,29 +154629,10 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, hspec, hspec-expectations-pretty-diff, lens - , mtl, text, transformers - }: - mkDerivation { - pname = "purescript-bridge"; - version = "0.10.1.0"; - sha256 = "08v2b4n3zpbwdz8v41scjpvwha3xnk0g6vgd58ki98h1gyvr4pqs"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving lens mtl text - transformers - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations-pretty-diff text - ]; - description = "Generate PureScript data types from Haskell data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "purescript-bridge_0_11_0_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers @@ -154002,7 +154650,6 @@ self: { ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -154039,6 +154686,7 @@ 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 @@ -154129,8 +154777,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.2.0.0"; - sha256 = "1r57l48xzfraa85lrkx9i8dmlrjicavz0fxr8l6c28iisj6db8js"; + version = "0.4.0.0"; + sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -154164,8 +154812,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.1.0.4"; - sha256 = "0lbj13vi1g49xiaqsd492j6lrg7ddjf3w8hz5z48a9cy2w6wylkx"; + version = "1.2.0.1"; + sha256 = "0cm2g49vpsfq92dik89vahkcjz8a17ihx973mhpg70cx3plpz8g8"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types text time transformers unordered-containers @@ -154177,18 +154825,17 @@ self: { homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pusher-http-haskell_1_2_0_1" = callPackage + "pusher-http-haskell_1_3_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptohash, hashable, hspec, http-client, http-types, QuickCheck , text, time, transformers, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.2.0.1"; - sha256 = "0cm2g49vpsfq92dik89vahkcjz8a17ihx973mhpg70cx3plpz8g8"; + version = "1.3.0.0"; + sha256 = "1pppzhr6507y1fl2w3w876bhwbbm5mvss4qfavrbhzi9ycqk2hrp"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types text time transformers unordered-containers @@ -154211,8 +154858,8 @@ self: { }: mkDerivation { pname = "pusher-ws"; - version = "0.1.0.0"; - sha256 = "0gdbxrvcnhr0y229i9k5rc9fp73fvrnvsj77mw8pibnq2djfqx5s"; + version = "0.1.0.1"; + sha256 = "0i5659wljhaindimm8b6khibr8mcmcr5iaags2a33zjb67gjbsd7"; libraryHaskellDepends = [ aeson base bytestring containers deepseq hashable http-conduit lens lens-aeson network scientific stm text time transformers @@ -154221,7 +154868,6 @@ self: { homepage = "https://github.com/barrucadu/pusher-ws"; description = "Implementation of the Pusher WebSocket protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pushme" = callPackage @@ -154302,6 +154948,7 @@ self: { sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers diagrams-lib diagrams-svg filepath hashable linear mtl optparse-applicative parsec SVGFonts text @@ -154362,28 +155009,26 @@ self: { "pvss" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite - , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory - , tasty, tasty-quickcheck + , cryptonite-openssl, deepseq, foundation, hourglass, integer-gmp + , memory, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "pvss"; - version = "0.1"; - sha256 = "16gwq23d7p34n23ydi82lxz7cjvwdc684s36915fb2hm8k60n57s"; - revision = "1"; - editedCabalFile = "03nx4w2b6i2wn4x4ggbizc4k9y5bkjq4ihli5ln8bs60slz84srd"; + version = "0.2.0"; + sha256 = "130249k3gly9msd8x514qlq0gjqi60hjps2176j83ifa0d818h74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring cryptonite cryptonite-openssl deepseq - integer-gmp memory + foundation integer-gmp memory ]; executableHaskellDepends = [ - base cryptonite deepseq hourglass memory + base cryptonite deepseq hourglass memory vector ]; testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; homepage = "https://github.com/input-output-hk/pvss-haskell#readme"; description = "Public Verifiable Secret Sharing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "pwstore-cli" = callPackage @@ -154448,6 +155093,7 @@ self: { sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers mtl parsec ]; homepage = "http://community.moertel.com/ss/space/PXSL"; description = "Parsimonious XML Shorthand Language--to-XML compiler"; @@ -154529,6 +155175,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qchas" = callPackage + ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }: + mkDerivation { + pname = "qchas"; + version = "1.0.1.0"; + sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam"; + libraryHaskellDepends = [ base hmatrix random ]; + testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; + homepage = "https://github.com/ardeleanasm/qchas#readme"; + description = "A library for implementing Quantum Algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qd" = callPackage ({ mkDerivation, base, floatshow, qd }: mkDerivation { @@ -154562,6 +155221,7 @@ self: { pname = "qed"; version = "0.0"; sha256 = "1klsh6hvbvphhf3nr21856hqfcc4ysbrl6sz2z9rvvvpwbl24918"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq directory exceptions extra filepath haskell-src-exts transformers uniplate @@ -154614,8 +155274,8 @@ self: { }: mkDerivation { pname = "qm-interpolated-string"; - version = "0.1.0.0"; - sha256 = "1ycys6ak809vyjgzjp2ra1ndnsficzdjs7kq7xaks0k50sscf7dd"; + version = "0.1.1.0"; + sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -154623,6 +155283,7 @@ 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; }) {}; "qr-imager" = callPackage @@ -154674,6 +155335,7 @@ self: { pname = "qrcode"; version = "0.1.2"; sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl vector ]; description = "QR Code library in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -154849,14 +155511,18 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, hashable, path-pieces, text }: + ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text + , vector + }: mkDerivation { pname = "quantification"; - version = "0.1"; - sha256 = "0z7mwqpl83l8ss1ji8xna8z1s5nd78164ni9wmfiszhp4ghg2vpi"; - libraryHaskellDepends = [ aeson base hashable path-pieces text ]; + version = "0.2"; + sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; + libraryHaskellDepends = [ + aeson base ghc-prim hashable path-pieces text vector + ]; homepage = "https://github.com/andrewthad/quantification#readme"; - description = "Data types and typeclasses to deal with universally and existentially quantified types"; + description = "Rage against the quantification"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154905,6 +155571,7 @@ self: { sha256 = "16qk4m6jgf4phmc0zxw11as9rlvspxpqza5k318bra9f9ybn253y"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal ansigraph base bytestring directory http-conduit terminal-size text @@ -154948,6 +155615,7 @@ self: { sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cmdargs cond containers directory iproute MissingH network safe scotty text transformers wai wai-extra @@ -154988,6 +155656,7 @@ self: { libraryHaskellDepends = [ ansi-terminal base readline terminal-size ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/yamadapc/haskell-questioner.git"; description = "A package for prompting values from the command-line"; license = stdenv.lib.licenses.mit; @@ -155072,8 +155741,9 @@ self: { "quickbooks" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring - , email-validate, fast-logger, http-client, http-client-tls - , http-types, interpolate, old-locale, text, thyme, yaml + , doctest, email-validate, fast-logger, http-client + , http-client-tls, http-types, interpolate, old-locale, text, thyme + , yaml }: mkDerivation { pname = "quickbooks"; @@ -155084,6 +155754,7 @@ self: { http-client http-client-tls http-types interpolate old-locale text thyme yaml ]; + testHaskellDepends = [ base doctest ]; description = "QuickBooks API binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155128,7 +155799,6 @@ self: { libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-instances" = callPackage @@ -155177,18 +155847,6 @@ self: { }) {}; "quickcheck-io" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck }: - mkDerivation { - pname = "quickcheck-io"; - version = "0.1.4"; - sha256 = "179qcy15yxgllsjc2czm2jsxaryfd6mcsr07ac43kc3i11cm0dvb"; - libraryHaskellDepends = [ base HUnit QuickCheck ]; - homepage = "https://github.com/hspec/quickcheck-io#readme"; - description = "Use HUnit assertions as QuickCheck properties"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quickcheck-io_0_2_0" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "quickcheck-io"; @@ -155198,7 +155856,6 @@ self: { homepage = "https://github.com/hspec/quickcheck-io#readme"; description = "Use HUnit assertions as QuickCheck properties"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-poly" = callPackage @@ -155243,12 +155900,17 @@ self: { }) {}; "quickcheck-property-monad" = callPackage - ({ mkDerivation, base, either, QuickCheck, transformers }: + ({ mkDerivation, base, directory, doctest, either, filepath + , QuickCheck, transformers + }: mkDerivation { pname = "quickcheck-property-monad"; version = "0.2.4"; sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c"; libraryHaskellDepends = [ base either QuickCheck transformers ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck + ]; homepage = "http://github.com/bennofs/quickcheck-property-monad/"; description = "A monad for generating QuickCheck properties without Arbitrary instances"; license = stdenv.lib.licenses.bsd3; @@ -155337,8 +155999,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.0.1"; - sha256 = "166mavvz2rsi0clxhv9vkqdiyiird0xj8mdlfbav664qn5mn2yx5"; + version = "0.1.0.2"; + sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -155358,22 +156020,21 @@ self: { homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, constraints, containers - , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm + ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io + , QuickCheck, random, stm }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.0.0"; - sha256 = "0022zqwncc263dcvcck06faqxqyqq2vj57zbnqk63hjpikghkk9d"; + version = "0.1.0"; + sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6"; libraryHaskellDepends = [ - ansi-wl-pprint base constraints containers mtl parallel-io - QuickCheck random singletons stm + ansi-wl-pprint base containers mtl parallel-io QuickCheck random + stm ]; - testHaskellDepends = [ base hspec mtl QuickCheck random ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -155446,7 +156107,6 @@ self: { homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples"; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicklz" = callPackage @@ -155468,7 +156128,8 @@ self: { }) {}; "quickpull" = callPackage - ({ mkDerivation, base, directory, filepath, QuickCheck }: + ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck + }: mkDerivation { pname = "quickpull"; version = "0.4.2.2"; @@ -155476,7 +156137,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath QuickCheck ]; - executableHaskellDepends = [ base directory filepath QuickCheck ]; + executableHaskellDepends = [ + barecheck base directory filepath QuickCheck + ]; testHaskellDepends = [ base directory filepath QuickCheck ]; homepage = "http://www.github.com/massysett/quickpull"; description = "Generate Main module with QuickCheck tests"; @@ -155541,7 +156204,6 @@ self: { homepage = "https://github.com/SamuelSchlesinger/Quickterm"; description = "An interface for describing and executing terminal applications"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicktest" = callPackage @@ -155759,7 +156421,6 @@ self: { ]; description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-interleave" = callPackage @@ -155811,6 +156472,7 @@ self: { sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal async base bytestring containers directory dlist exceptions filepath hex mtl network network-simple parsec process @@ -155884,7 +156546,6 @@ self: { executableHaskellDepends = [ base ]; description = "A library and program to create QIF files from Rabobank CSV exports"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rad" = callPackage @@ -155932,7 +156593,6 @@ self: { homepage = "https://github.com/klangner/radium"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium-formula-parser" = callPackage @@ -156022,6 +156682,7 @@ self: { sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers llvm-general llvm-general-pure mtl ]; @@ -156156,6 +156817,7 @@ self: { homepage = "https://github.com/ciez/raketka"; description = "distributed-process node"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rakhana" = callPackage @@ -156197,6 +156859,7 @@ self: { pname = "rallod"; version = "0.0.1"; sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; homepage = "http://github.com/moonmaster9000/rallod"; description = "'$' in reverse"; @@ -156299,8 +156962,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.0"; - sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd"; + version = "0.1.1"; + sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh"; libraryHaskellDepends = [ base bytestring mwc-random ]; benchmarkHaskellDepends = [ async base bytestring criterion entropy ghc-prim mwc-random @@ -156505,7 +157168,6 @@ self: { homepage = "https://bitbucket.org/kpratt/random-variate"; description = "\"Uniform RNG => Non-Uniform RNGs\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "randomgen" = callPackage @@ -156665,12 +157327,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rank1dynamic_0_4_0" = callPackage + ({ mkDerivation, base, binary, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "rank1dynamic"; + version = "0.4.0"; + sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rank2classes" = callPackage ({ mkDerivation, base, doctest, template-haskell, transformers }: mkDerivation { pname = "rank2classes"; - version = "0.1"; - sha256 = "1izr3nrbrrcf4496m0p5fpvd9h6gzgirb6q76kvn4chd4p45j0iz"; + version = "0.2"; + sha256 = "017vz33qafc1synzccl3p3cws010vg03l13i5y5igfs8f1rf5l80"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/blamario/grampa/tree/master/rank2classes"; @@ -156956,10 +157636,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.3.2.1"; - sha256 = "1pxgazmyl9ky08vx2nnf5k7bw183ljpvzggvddrdlpwzczm8fzki"; - revision = "1"; - editedCabalFile = "19w6f01qc1ahwfsqnqb6ajsgv4wqy5vfy54f6x15z1pivnyw37sk"; + version = "0.3.3"; + sha256 = "0jqdqf3y61z98sxdziqhafgsf5m01a00gkfdnv1w4vd6zli8xpaa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156989,18 +157667,18 @@ self: { "ratel" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-client-tls, http-types, tasty - , tasty-hspec, text, uuid + , containers, filepath, http-client, http-client-tls, http-types + , tasty, tasty-hspec, text, uuid }: mkDerivation { pname = "ratel"; - version = "0.3.3"; - sha256 = "1qny1ayb6qac1f6zbm76w4bgvwqiznbq9a96dqnpkyj33dd0s8f3"; + version = "0.3.5"; + sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid ]; - testHaskellDepends = [ base tasty tasty-hspec ]; + testHaskellDepends = [ base filepath tasty tasty-hspec ]; homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; @@ -157022,6 +157700,23 @@ 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 { @@ -157047,40 +157742,14 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, bimap, binary - , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, tasty, tasty-hspec, template-haskell, temporary, text - , vector - }: - mkDerivation { - pname = "rattletrap"; - version = "2.1.5"; - sha256 = "1givs2mpphav0j33iv4jxyvsfhh05jly4jwdj1sbxm1hvw3p23gf"; - 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 tasty tasty-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_2_2_4" = 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.2.4"; - sha256 = "19x353fks41555k7zax7i9h68hy8q420x071srn0q4bmsbzcpz1i"; + version = "2.5.0"; + sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157095,6 +157764,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rattletrap_2_5_2" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, binary-bits + , bytestring, containers, data-binary-ieee754, filepath, hspec + , template-haskell, temporary, text, vector + }: + mkDerivation { + pname = "rattletrap"; + version = "2.5.2"; + sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 template-haskell text vector + ]; + executableHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 template-haskell text vector + ]; + testHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 filepath hspec template-haskell temporary text + vector + ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit , network, random, text, time, unordered-containers, uuid @@ -157173,21 +157872,6 @@ self: { }) {}; "rawfilepath" = callPackage - ({ mkDerivation, base, bytestring, unix }: - mkDerivation { - pname = "rawfilepath"; - version = "0.1.1"; - sha256 = "0rlck0lv1002y0q5cjdlc4msr2nr36q8ml32r6ffbv5bfxhhlp7w"; - revision = "1"; - editedCabalFile = "14y624s1l381hqzy3v47xwbjwbkhzn6kqrrj1lj8sp9q0z8pdi9r"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base bytestring ]; - homepage = "https://github.com/xtendo-org/rawfilepath#readme"; - description = "Use RawFilePath instead of FilePath"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "rawfilepath_0_2_4" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "rawfilepath"; @@ -157198,7 +157882,6 @@ self: { homepage = "https://github.com/xtendo-org/rawfilepath#readme"; description = "Use RawFilePath instead of FilePath"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rawr" = callPackage @@ -157289,7 +157972,6 @@ self: { homepage = "http://paychandoc.runeks.me/"; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bitcoin-payment-protocol = null;}; @@ -157301,6 +157983,7 @@ self: { sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bio bytestring containers ]; homepage = "http://malde.org/~ketil/"; description = "Mask nucleotide (EST) sequences in Fasta format"; @@ -157331,8 +158014,10 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2"; - sha256 = "0i88w7yg1q6fbkqfkvmnxxg9wg90sxv6c0shb8hvx0afz1mfhrz3"; + version = "0.2.1"; + sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; + revision = "1"; + editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -157370,6 +158055,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rdf_0_1_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , dlist, fgl, text, transformers + }: + mkDerivation { + pname = "rdf"; + version = "0.1.0.2"; + sha256 = "0vqznprx5r7lqyj8b850pfyy7mvin55l1v4krmi1wyacynv977c8"; + libraryHaskellDepends = [ + attoparsec base bytestring deepseq dlist fgl text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + homepage = "https://github.com/traviswhitaker/rdf"; + description = "Representation and Incremental Processing of RDF Data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rdf4h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network @@ -157476,6 +158181,7 @@ self: { aeson base bytestring deepseq mtl template-haskell text time unordered-containers ]; + executableHaskellDepends = [ aeson base deepseq text time ]; homepage = "https://bitbucket.org/wuzzeb/react-flux"; description = "A binding to React based on the Flux application architecture for GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -157501,6 +158207,7 @@ self: { pname = "react-haskell"; version = "2.0.1"; sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base deepseq lens-family monads-tf text transformers unordered-containers void @@ -157596,7 +158303,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 @@ -157678,6 +158384,7 @@ self: { sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using threepenny-gui"; @@ -157694,13 +158401,13 @@ self: { configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cabal-macosx reactive-banana wx wxcore ]; homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -157778,7 +158485,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 @@ -157797,7 +158503,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 @@ -157865,7 +158570,6 @@ self: { homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "read-editor" = callPackage @@ -157883,19 +158587,6 @@ self: { }) {}; "read-env-var" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "read-env-var"; - version = "0.1.0.1"; - sha256 = "1r9g1wfwzjwbg87imf3zjlnzyxkfqxn47wcjgp7vl4dfa752r5i1"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/read-env-var#readme"; - description = "Functions for safely reading environment variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "read-env-var_1_0_0_0" = callPackage ({ mkDerivation, base, doctest, exceptions, Glob, transformers }: mkDerivation { pname = "read-env-var"; @@ -157906,7 +158597,6 @@ self: { homepage = "https://github.com/cdepillabout/read-env-var#readme"; description = "Functions for safely reading environment variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "read-io" = callPackage @@ -158078,8 +158768,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.0.8"; - sha256 = "1gdqrzbpqpm5vl7hnh7q875hsazibqw1lfwnkzqs2gv6w3wa3lw4"; + version = "1.0.8.1"; + sha256 = "111wslzm76qrabpdbsnpb3sydbd3vc71d3mf088klkgbb0k2arxp"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -158091,6 +158781,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_1" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.1"; + sha256 = "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -158249,7 +158962,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -158287,7 +158999,24 @@ self: { homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "recursion-schemes-ext" = callPackage + ({ mkDerivation, base, composition-prelude, criterion, deepseq + , hspec, recursion-schemes, template-haskell + }: + mkDerivation { + pname = "recursion-schemes-ext"; + version = "0.1.1.1"; + sha256 = "10jyylpbcahxp64gnvb1pplvkrgga65nj4lapws5kl52jw1bf5z4"; + libraryHaskellDepends = [ + base composition-prelude deepseq recursion-schemes template-haskell + ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; + description = "Amateur addenda to recursion-schemes"; + license = stdenv.lib.licenses.bsd3; }) {}; "recursive-line-count" = callPackage @@ -158681,8 +159410,8 @@ self: { }: mkDerivation { pname = "references"; - version = "0.3.2.1"; - sha256 = "093nsbnr5vax4h0ki51xqa0gaf58fr09q3rmksxqcghzgphj0h0q"; + version = "0.3.2.2"; + sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary"; libraryHaskellDepends = [ array base containers directory either filepath instance-control mtl template-haskell text transformers uniplate @@ -158695,7 +159424,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 @@ -158763,6 +159491,7 @@ self: { pname = "reflection-without-remorse"; version = "0.9.5"; sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base type-aligned ]; homepage = "https://github.com/atzeus/reflection-without-remorse"; description = "Efficient free and operational monads"; @@ -158979,6 +159708,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-sdl2" = callPackage + ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }: + mkDerivation { + pname = "reflex-sdl2"; + version = "0.1.0.0"; + sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dependent-sum mtl ref-tf reflex sdl2 + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/schell/reflex-sdl2#readme"; + description = "SDL2 and reflex FRP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -159042,8 +159789,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.1"; - sha256 = "1ansv8d0qy4n7yfbld25bi4vgsgdd3j3smcaqdgbylbjq066z83g"; + version = "0.2.5.2"; + sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -159073,6 +159820,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; + executableHaskellDepends = [ + base data-default exceptions lens mtl + ]; homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; license = stdenv.lib.licenses.bsd3; @@ -159090,7 +159840,6 @@ self: { homepage = "https://github.com/oreshinya/refty"; description = "Formatted JSON generator for API server inspired by normalizr"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refurb" = callPackage @@ -159119,7 +159868,6 @@ 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 @@ -159141,7 +159889,6 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -159315,7 +160062,6 @@ 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 @@ -159441,6 +160187,7 @@ self: { sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers mtl regex-base regex-posix ]; @@ -159485,8 +160232,8 @@ self: { ({ mkDerivation, base, regex-tdfa, template-haskell }: mkDerivation { pname = "regex-tdfa-quasiquoter"; - version = "0.2.0.0"; - sha256 = "0qc35kxwc2pbjridiiwyi1xzcx3f02fy1lpqv7rpwddpjxi6mqca"; + version = "0.2.1.0"; + sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f"; libraryHaskellDepends = [ base regex-tdfa template-haskell ]; homepage = "http://github.com/erisco/regex-tdfa-quasiquoter"; description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; @@ -159531,6 +160278,7 @@ self: { sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers mtl regex-base regex-tdfa ]; @@ -159600,7 +160348,6 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -159627,6 +160374,7 @@ self: { sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers data-default parsec regex-base regexdot toolshed @@ -159639,7 +160387,6 @@ self: { homepage = "http://functionalley.eu/RegExChar/regExChar.html"; description = "A POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexdot" = callPackage @@ -159656,7 +160403,6 @@ self: { homepage = "http://functionalley.eu/RegExDot/regExDot.html"; description = "A polymorphic, POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexp-tries" = callPackage @@ -159694,6 +160440,7 @@ self: { pname = "regexpr-symbolic"; version = "0.5"; sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html"; description = "Regular expressions via symbolic manipulation"; @@ -159927,7 +160674,6 @@ self: { homepage = "https://github.com/kerkomen/rei"; description = "Process lists easily"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reified-records" = callPackage @@ -159951,6 +160697,7 @@ self: { sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc ]; executableHaskellDepends = [ base ghc ]; homepage = "http://www.cs.mu.oz.au/~bjpop/code.html"; @@ -159973,7 +160720,6 @@ self: { homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relacion" = callPackage @@ -160005,7 +160751,6 @@ self: { homepage = "https://github.com/iostat/relapse#readme"; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relation" = callPackage @@ -160037,6 +160782,7 @@ self: { homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8"; description = "PostgreSQL v8.x driver for haskell-relational-record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query" = callPackage @@ -160047,8 +160793,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.8.4.0"; - sha256 = "0bvh4g7k3k0fkgbk99l5prcvxbcsj3v518lg5gpzd6aifvzzyq3q"; + version = "0.9.4.1"; + sha256 = "05x6v4587qhv6a82r9kdgsg0bcpgvjfihv17iv2hn98cl2f0m2cc"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text th-reify-compat time @@ -160062,30 +160808,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_9_1_0" = 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.1.0"; - sha256 = "1nv2kl2nzp3xawyhiwlh35a2z1x1hwa5fcqha78d2hnk2rd8036c"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query @@ -160094,8 +160816,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.0.3"; - sha256 = "1z7lpkns3bllm8sjwhv7105np1gq5bfrv52gwkpm39kbiakh0h6s"; + version = "0.6.4.0"; + sha256 = "1mybp5nq0l4c9b4as16878c02z282ml3gxisnkrwb80y1xrgdfd2"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -160106,45 +160828,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_6_2_0" = 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.2.0"; - sha256 = "0w9qk25idc9cbis27948jw9hcyib63q4byp8dd8xrqcx4jir5xr3"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-record" = callPackage - ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.7.1"; - sha256 = "0b3srpwid2v8c43i6dzs91ir0wvnm5ic5kr11inhav4hvh90gyhq"; - libraryHaskellDepends = [ - base 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_1_8_0" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, relational-query , relational-query-HDBC @@ -160160,13 +160844,12 @@ 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 ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell + , relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; @@ -160179,45 +160862,27 @@ self: { relational-query relational-query-HDBC relational-schemas template-haskell ]; + executableHaskellDepends = [ + base relational-query template-haskell time + ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage - ({ mkDerivation, base, bytestring, containers, persistable-record - , relational-query, template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.3.1"; - sha256 = "1gaif7af90wrkqf0dhikmd8mn3xwbbf5k5pg63fkmdr17xvkfcfi"; - revision = "2"; - editedCabalFile = "0m53lnymdd6w6zrlv3nlf7fn0ki7z164mph0r80fyl5abb0bns8g"; - libraryHaskellDepends = [ - base bytestring containers persistable-record 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_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: mkDerivation { pname = "relational-schemas"; - version = "0.1.3.3"; - sha256 = "1hqbx82cz4a2kmirlxild4n2rxw1xhj840ibyhzs5ppl325ibbrs"; + version = "0.1.4.0"; + sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -160262,6 +160927,7 @@ self: { editedCabalFile = "10d2p9pdplwhavfimsa893wzcps7fhfaxgcqwblrqm5xmybc3825"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring Cabal containers data-default directory filepath ghcid http-types mime-types process scotty text @@ -160548,10 +161214,8 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.4.1.2"; - sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p"; - revision = "1"; - editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k"; + version = "3.4.1.3"; + sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -160564,12 +161228,13 @@ self: { ({ mkDerivation, base, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.4.1.1"; - sha256 = "0a3yhia6wb4blc8zyzd2pw6k7hfpamv08d64qplq181dp887kl64"; + version = "3.4.1.2"; + sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87"; libraryHaskellDepends = [ base repa vector ]; 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 @@ -160656,6 +161321,8 @@ self: { pname = "repa-examples"; version = "3.4.1.1"; sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039"; + revision = "1"; + editedCabalFile = "0acl57w635zi1il4r4jxzp3r1kd0zdqdiihinpbla5vnp3a5zg13"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160686,7 +161353,6 @@ self: { ]; description = "Perform fft with repa via FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -160717,12 +161383,15 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; + revision = "1"; + editedCabalFile = "0z0wbaz7svqdzjpmx7d9wwfjl31w0i29pcc1v11r26f9avw3g9qi"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; 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 @@ -160795,12 +161464,14 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hsndfile repa ]; + executableHaskellDepends = [ + base hsndfile hsndfile-vector repa vector + ]; testHaskellDepends = [ base directory filepath hsndfile hsndfile-vector repa vector ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-stream" = callPackage @@ -161051,6 +161722,7 @@ self: { 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 @@ -161067,27 +161739,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req_0_3_0" = callPackage + "req_0_4_0" = 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, retry, text, time, transformers - , unordered-containers + , http-types, monad-control, mtl, QuickCheck, retry, text, time + , transformers, transformers-base, unordered-containers }: mkDerivation { pname = "req"; - version = "0.3.0"; - sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m"; + version = "0.4.0"; + sha256 = "1ahs0ig9xi2i6470q6vdc011pk2l0sp39jr1n3f9a0mp5l0m7n0s"; + 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 retry text time - transformers + http-client http-client-tls http-types monad-control mtl retry text + time transformers transformers-base ]; testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types mtl - QuickCheck retry text time unordered-containers + data-default-class hspec hspec-core http-client http-types + monad-control mtl QuickCheck retry text time unordered-containers ]; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; @@ -161121,14 +161794,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req-conduit_0_2_0" = callPackage + "req-conduit_0_2_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh }: mkDerivation { pname = "req-conduit"; - version = "0.2.0"; - sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg"; + version = "0.2.1"; + sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; + revision = "1"; + editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -161186,6 +161861,18 @@ self: { 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_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.1"; + sha256 = "17x606gm0mfy7xgfy1dby8gxs4jzspnrlchv1d93rjqklr2wsyyv"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -161238,15 +161925,16 @@ self: { }) {}; "resin" = callPackage - ({ mkDerivation, base, ghc-prim, semigroupoids }: + ({ mkDerivation, base, ghc-prim, ralist, semigroupoids }: mkDerivation { pname = "resin"; - version = "0.1.0.2"; - sha256 = "1vhki81r2a4pbpl94zx45wr7hw950ibs6asim27pzh1nyakw9pbg"; - libraryHaskellDepends = [ base ghc-prim semigroupoids ]; + version = "0.2.0.2"; + sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j"; + libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ]; homepage = "http://github.com/cartazio/resin"; description = "High performance variable binders"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resistor-cube" = callPackage @@ -161488,8 +162176,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "012l03am5hqhykn4apg5yhjaz4zv8mwqpq6x97crraf1gxad0q6p"; - revision = "7"; - editedCabalFile = "0fg93xwv8m86dp074kvihk3x2lywpmb4wsxrgd0g74vf00sb0y6n"; + revision = "8"; + editedCabalFile = "12ia5ic2cas82h3dksdy4hzmcw42f13wqwqw0ilbn50q85j2k4pf"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -161539,10 +162227,9 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.20.0.0"; - sha256 = "0hnmd37c6n61gkqi3assspkmh15q93id7yaq30vp65zr6rhliac1"; - revision = "8"; - editedCabalFile = "1x18sva575kcg9gg4brf17zbvvkzs0qi2rgkab5ijr4pnmhpwc62"; + version = "0.20.0.1"; + sha256 = "0fa4mz7drfy60lcg1j73qajy00byvhy759x195prj4nvbrsn5x31"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -161565,8 +162252,8 @@ self: { pname = "rest-happstack"; version = "0.3.1.1"; sha256 = "1xjg745ydnw1mybkx2239wrj0jh9sy5mgx11gqwrbfcn5kmhckvr"; - revision = "1"; - editedCabalFile = "1b2f7y8zsxz5h6bjmm86fwfkz8yrjx9vbkkh2xmqg4409q7zvrm8"; + revision = "2"; + editedCabalFile = "0yr1407fds0h73ijw6iivqq15ybiz3n6s555vxgaay4j4k4pkax9"; libraryHaskellDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -161601,8 +162288,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; - revision = "6"; - editedCabalFile = "12ynmj96mhqdp060zydyj3jma6zwv7jphg0x2ljk5402prlxagr1"; + revision = "7"; + editedCabalFile = "14jqqpxxs7vkrf6syycrg2ymh79gl83z13kq261alw5gy8yjnszv"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -161620,8 +162307,8 @@ self: { pname = "rest-types"; version = "1.14.1.1"; sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p"; - revision = "3"; - editedCabalFile = "0psp44114ca8cmcg0gbn64j4q6vkiyagrvgc957j80mfcy93xz92"; + revision = "4"; + editedCabalFile = "04s5xcjycbw9fqhmpx0kmy5wmkpgcs84vam68w428rb7y64099mb"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -161728,9 +162415,9 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, binary - , bytestring, containers, criterion, data-default, doctest, mtl - , network, scientific, text, time, unordered-containers + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , binary, bytestring, containers, criterion, data-default, doctest + , mtl, network, scientific, text, time, unordered-containers , utf8-string, vector }: mkDerivation { @@ -161744,6 +162431,7 @@ self: { data-default mtl network scientific text time unordered-containers utf8-string vector ]; + executableHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ aeson async base criterion text ]; homepage = "http://github.com/atnnn/haskell-rethinkdb"; @@ -161759,10 +162447,8 @@ self: { }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.23"; - sha256 = "0hq4q9xb6aila7y3ia948mizlha6saj1cqj1smprxd1vag5s7rff"; - revision = "1"; - editedCabalFile = "1vgv2zfdkpxbrg8nssas8x85cbmah8d59ks9744hd7zc461kgfzl"; + version = "0.0.24"; + sha256 = "06fhrip547mgv0nqjsiilbdhc0nphqqwy3qacxw36macvg6mhsbb"; libraryHaskellDepends = [ aeson base binary bytestring containers hashable mtl network old-locale scientific stm template-haskell text time @@ -161972,6 +162658,7 @@ self: { pname = "rex"; version = "0.5.2"; sha256 = "0xliw2glqyfr9cvi50rvb0frhmp3ysri9glx3c8x96rkf0xg27kf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers haskell-src-exts haskell-src-meta pcre-light template-haskell @@ -161991,6 +162678,7 @@ self: { sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers datetime HTTP json mtl nano-md5 xhtml ]; @@ -162044,6 +162732,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; + executableHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -162058,6 +162747,7 @@ self: { sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base call containers lens mtl objective split ]; @@ -162140,6 +162830,7 @@ self: { pname = "ridley"; version = "0.3.1.2"; sha256 = "15hc1j0bkdb0wbivxl73rgrk4hl598d96yv0fhpsgls74alarniq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers ekg-core ekg-prometheus-adapter inline-c katip microlens microlens-th mtl process prometheus raw-strings-qq @@ -162239,6 +162930,7 @@ self: { homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riot" = callPackage @@ -162472,7 +163164,6 @@ 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 @@ -162662,6 +163353,7 @@ self: { homepage = "https://github.com/hexresearch/roc-cluster#readme"; description = "ROC online clustering algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roc-cluster-demo" = callPackage @@ -162680,6 +163372,7 @@ self: { homepage = "https://github.com/ncrashed/roc-cluster-demo#readme"; description = "Gloss interactive demo for roc-cluster package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rocksdb-haskell" = callPackage @@ -162702,7 +163395,6 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -162781,20 +163473,19 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , monad-control, network, text, vector + , monad-control, network, resourcet, text, vector }: mkDerivation { pname = "rollbar"; - version = "0.3.1"; - sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1"; + version = "1.0.0"; + sha256 = "01rljwfb7cgw544pk6iwmxlxzid51q7ig8f5y8v9i75vskqkip7j"; libraryHaskellDepends = [ - aeson base basic-prelude http-conduit monad-control network text - vector + aeson base basic-prelude http-conduit monad-control network + resourcet text vector ]; - homepage = "https://github.com/docmunch/rollbar-haskell"; + homepage = "https://github.com/azara/rollbar-haskell"; description = "error tracking through rollbar.com"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roller" = callPackage @@ -163071,13 +163762,13 @@ self: { }) {}; "rot13" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck }: + ({ mkDerivation, base, bytestring, hspec, QuickCheck, text }: mkDerivation { pname = "rot13"; - version = "0.1.0.2"; - sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.2.0.1"; + sha256 = "1p6lrjgigzbjigsyfsmx3kxrzm1aws3i708yl4xyh73arhcd89p0"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base bytestring hspec QuickCheck text ]; homepage = "https://github.com/kvanberendonck/codec-rot13"; description = "Fast ROT13 cipher for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -163145,7 +163836,6 @@ self: { ]; description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundtrip-aeson" = callPackage @@ -163179,7 +163869,6 @@ self: { libraryHaskellDepends = [ base mtl parsec roundtrip ]; description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundtrip-xml" = callPackage @@ -163300,6 +163989,7 @@ self: { sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ appar base blaze-builder bytestring c10k containers dns domain-auth hslogger iproute parsec unix @@ -163379,6 +164069,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rset" = callPackage + ({ mkDerivation, base, QuickCheck, safe }: + mkDerivation { + pname = "rset"; + version = "1.0.0"; + sha256 = "1d1r9hp38mhl1jmmqhn42al7gd0nsqk5d5msqrzjwxdyj884y3pq"; + libraryHaskellDepends = [ base safe ]; + testHaskellDepends = [ base QuickCheck safe ]; + homepage = "https://github.com/lovasko/rset"; + description = "Range set"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rspp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -163406,38 +164110,9 @@ self: { homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, 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.0.0"; - sha256 = "0p2z6kijgja3kwz8avmfqmj7dj52p8g3h9scrsyz26ppdmy502ip"; - revision = "1"; - editedCabalFile = "19gpfrihchggkn8cxc002fgyl71n676mjh5xszhr1mh9idfzqmiz"; - 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-extra 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 2.0 standard."; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "rss-conduit_0_3_1_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , containers, data-default, hlint, lens-simple, mono-traversable , QuickCheck, quickcheck-instances, resourcet, safe @@ -163446,8 +164121,34 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.3.1.1"; - sha256 = "16pghxkk9pyskhp73sz43nw84w7qw62sdlwqpsrrfs2wr2ab71bd"; + 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; + }) {}; + + "rss-conduit_0_3_2_0" = 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.2.0"; + sha256 = "0ps0ynn0d0nz4m556i5w39bwx4m6wfsv3c9a269rkq821z844f3n"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep @@ -163492,23 +164193,23 @@ self: { "rtcm" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring - , conduit, conduit-combinators, conduit-extra, lens, random - , resourcet, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , conduit, conduit-combinators, conduit-extra, lens, lens-aeson + , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell , text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.1.11"; - sha256 = "0nngz9b2w2ppssg4361jf445grff4x1k7p2ark2c8bbg4afayn6h"; + version = "0.2.5"; + sha256 = "1idqvlva12ndm4nbjhigz6z8r7y8lr25yck6fxilkls766rdv61m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base64-bytestring basic-prelude binary binary-bits - bytestring lens template-haskell text word24 + bytestring lens lens-aeson template-haskell text word24 ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra resourcet + conduit-combinators conduit-extra ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty @@ -163517,7 +164218,6 @@ self: { homepage = "http://github.com/swift-nav/librtcm"; description = "RTCM Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtld" = callPackage @@ -163565,7 +164265,6 @@ self: { homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtorrent-rpc" = callPackage @@ -163645,7 +164344,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -163665,7 +164364,6 @@ 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 @@ -163696,7 +164394,6 @@ self: { homepage = "http://code.mathr.co.uk/ruff"; description = "relatively useful fractal functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruin" = callPackage @@ -163870,6 +164567,7 @@ self: { sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary bytestring parsec ]; testHaskellDepends = [ base binary bytestring parsec QuickCheck test-framework @@ -163892,11 +164590,11 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; + executableHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base parsec QuickCheck text ]; homepage = "https://github.com/aisamanra/s-cargot"; description = "A flexible, extensible s-expression library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "s-expression" = callPackage @@ -163953,27 +164651,9 @@ self: { homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-exceptions" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hspec, transformers - , void - }: - mkDerivation { - pname = "safe-exceptions"; - version = "0.1.5.0"; - sha256 = "068srl44q66iv939fhk3mxalmxdn7348f6xh46pwg5mjj4vfrvvh"; - revision = "1"; - editedCabalFile = "0m0m2bj8xmiqj1qxkl00p0fndn6aw54a4yf2kx2qhijgzc4f1hwl"; - libraryHaskellDepends = [ base deepseq exceptions transformers ]; - testHaskellDepends = [ base hspec void ]; - homepage = "https://github.com/fpco/safe-exceptions#readme"; - description = "Safe, consistent, and easy exception handling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "safe-exceptions_0_1_6_0" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, transformers , void }: @@ -163986,7 +164666,6 @@ self: { homepage = "https://github.com/fpco/safe-exceptions#readme"; description = "Safe, consistent, and easy exception handling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-exceptions-checked" = callPackage @@ -164081,6 +164760,7 @@ self: { pname = "safe-length"; version = "0.1.0.0"; sha256 = "0yc9q5p7w955ywglvz6mhbpgqd3d39j91v994y3k25xrlbj5a494"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-core QuickCheck should-not-typecheck @@ -164098,8 +164778,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.2"; - sha256 = "0dhncpfhirz7l5jincav8zyixb8387k85kkjh4y17bc9cp1yca63"; + version = "0.3"; + sha256 = "0whd73vlkxzfr9rb9xfimxms56xzm0f1ninny16b4w6fg91ccqp5"; libraryHaskellDepends = [ aeson base binary cereal constraints deepseq hashable store ]; @@ -164108,9 +164788,8 @@ self: { store tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/k0001/safe-money"; - description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals"; + description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -164240,8 +164919,8 @@ self: { }: mkDerivation { pname = "safeio"; - version = "0.0.2.0"; - sha256 = "0ajz4hd3dycy10abngccqdbkj1356d2sggsnrlc34s370381hi9w"; + version = "0.0.3.0"; + sha256 = "0rknn8rlxyj32a0vrx0wjfma9w0zhs3vg1jyksn71drxch7jvwqs"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory filepath resourcet unix @@ -164356,8 +165035,8 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.0.0.5"; - sha256 = "07cmij425h4gp327kivvxj3j4i1xwn5mqvjlkh98i88y06nc5w64"; + version = "0.0.1.0"; + sha256 = "1vsanah757hvzs1yp36944gvhh6li3xmispk3xvjddmjzdlgzn0g"; libraryHaskellDepends = [ base bytestring profunctors ]; librarySystemDepends = [ libsodium ]; testHaskellDepends = [ @@ -164422,6 +165101,7 @@ self: { sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base c10k fclabels filestore monads-fd network salvia salvia-extras salvia-protocol salvia-sessions salvia-websocket stm threadmanager @@ -164551,7 +165231,9 @@ self: { }) {}; "samtools" = callPackage - ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: + ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc + , vector, zlib + }: mkDerivation { pname = "samtools"; version = "0.2.4.3"; @@ -164561,6 +165243,9 @@ self: { libraryHaskellDepends = [ base bytestring seqloc vector ]; librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring filepath process seqloc vector + ]; executableSystemDepends = [ zlib ]; executableToolDepends = [ c2hs ]; homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; @@ -164606,7 +165291,8 @@ self: { }) {}; "samtools-iteratee" = callPackage - ({ mkDerivation, base, bytestring, iteratee, samtools, transformers + ({ mkDerivation, base, bytestring, iteratee, monads-tf, samtools + , transformers }: mkDerivation { pname = "samtools-iteratee"; @@ -164617,6 +165303,9 @@ self: { libraryHaskellDepends = [ base bytestring iteratee samtools transformers ]; + executableHaskellDepends = [ + base bytestring iteratee monads-tf samtools transformers + ]; description = "Iteratee interface to SamTools library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -164629,8 +165318,8 @@ self: { }: mkDerivation { pname = "sandi"; - version = "0.4.0"; - sha256 = "1smf3bq44qni4zbgxpw7cy7b9g95fbrr73j8njjf6139naj9bj20"; + version = "0.4.1"; + sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -164891,25 +165580,24 @@ self: { "sbp" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-combinators, conduit-extra, data-binary-ieee754, lens - , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, unordered-containers - , yaml + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.7"; - sha256 = "1dd0m01dbjfjjrv79lnm853ldqkjsmv490a66912v58p51c7qvni"; + version = "2.2.12"; + sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens monad-loops template-haskell text - unordered-containers + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text unordered-containers ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra resourcet yaml + conduit-extra yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -164918,7 +165606,6 @@ self: { homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -164939,63 +165626,35 @@ self: { ]; description = "SBP to UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbv" = callPackage - ({ mkDerivation, array, async, base, base-compat, containers - , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc - , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, data-binary-ieee754, deepseq, directory, doctest + , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty + , process, QuickCheck, random, syb, tasty, tasty-golden + , tasty-hunit, template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "5.14"; - sha256 = "0zlf683rgpn8dcm1wrwy01s2i35px0rlhprw713jl5kic2wp3p4j"; - isLibrary = true; - isExecutable = true; + version = "7.1"; + sha256 = "0gxx84b7dzhymizwna8fzaaz2gimzch650jk1xssn5da2gqfan7g"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base base-compat containers crackNum - data-binary-ieee754 deepseq directory filepath ghc mtl old-time - pretty process QuickCheck random syb - ]; - executableHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit process syb + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath generic-deriving ghc mtl pretty process + QuickCheck random syb template-haskell time ]; testHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit syb + base bytestring data-binary-ieee754 directory doctest filepath Glob + hlint mtl random syb tasty tasty-golden tasty-hunit + template-haskell ]; + testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "sbv_6_1" = callPackage - ({ mkDerivation, array, async, base, base-compat, containers - , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc - , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb - }: - mkDerivation { - pname = "sbv"; - version = "6.1"; - sha256 = "1a8wa2pgzd6z5bnndb6adzxcxyq1b6qlxwh8apjynqzbrhhjspn5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat containers crackNum - data-binary-ieee754 deepseq directory filepath ghc mtl old-time - pretty process QuickCheck random syb - ]; - executableHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit process syb - ]; - testHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit syb - ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc @@ -165004,8 +165663,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.8"; - sha256 = "17zdx09aa4ikz7fmvdljq4130bx51wbkan97sn086nqqbkgm3v3i"; + version = "0.10"; + sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -165024,6 +165683,7 @@ self: { pname = "sc3-rdu"; version = "0.15"; sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hsc3 hsc3-db ]; homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; @@ -165195,6 +165855,7 @@ self: { sha256 = "0dh23v8kx2qnf392afznv3iixvwr4220my9nnlxgz1mhn77d51ln"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal base bytestring mtl optparse-applicative scrypt vector @@ -165206,6 +165867,7 @@ 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 @@ -165361,6 +166023,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "schematic_0_1_5_0" = 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.5.0"; + sha256 = "1zlpr0mp3qczylyn26chcndmvyn33pb36xh3d339mrbyalvrb5v7"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, containers, criterion, data-default @@ -165381,6 +166069,7 @@ self: { editedCabalFile = "0ddlmg6f7y70f1yi351q1d46mgxzs8h53969jmhdhj6al860grxv"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring binary blaze-html blaze-markup bytestring containers data-default directory extensible-exceptions @@ -165421,14 +166110,16 @@ self: { editedCabalFile = "065ij08gi9ymyqqa7lmj5d57zqk4rax72kzhm2qbvn00h3g6d81k"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath hs-bibutils mtl old-locale parsec rfc5051 scholdoc scholdoc-types split syb tagsoup text time vector xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath - scholdoc-types syb text yaml + aeson aeson-pretty attoparsec base bytestring containers directory + filepath process scholdoc scholdoc-types syb temporary text vector + yaml ]; testHaskellDepends = [ aeson base bytestring directory filepath process scholdoc @@ -165442,8 +166133,8 @@ self: { "scholdoc-texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, parsec, process, scholdoc-types, split, syb, temporary, text - , utf8-string, xml + , mtl, network-uri, parsec, process, scholdoc-types, split, syb + , temporary, text, utf8-string, xml }: mkDerivation { pname = "scholdoc-texmath"; @@ -165454,6 +166145,7 @@ self: { libraryHaskellDepends = [ base containers mtl parsec scholdoc-types syb xml ]; + executableHaskellDepends = [ network-uri ]; testHaskellDepends = [ base bytestring directory filepath process split temporary text utf8-string xml @@ -165534,18 +166226,16 @@ self: { "scientific" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, vector + , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text }: mkDerivation { pname = "scientific"; - version = "0.3.4.15"; - sha256 = "1gsmpn3563k90nrai0jdjfvkxjjaxs7bxxsfbdpmw4xvbp2lmp9n"; - revision = "2"; - editedCabalFile = "1pxj3l4rm04l8rllv15sabspkw5nqhkhf38dsd2cyvr1n6669dd9"; + version = "0.3.5.1"; + sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms text vector + integer-gmp integer-logarithms primitive text ]; testHaskellDepends = [ base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml @@ -165568,6 +166258,7 @@ self: { sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths ghc-syb hslogger json multiset time uniplate @@ -165661,6 +166352,7 @@ self: { sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk MonadCatchIO-transformers mtl old-locale scope time zoom-cache @@ -165935,6 +166627,7 @@ self: { editedCabalFile = "0aasfcbs8cc729xvwnk8hgskv2sxg6c928gf8jifadgwgsqwahfr"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base scotty text transformers ]; executableHaskellDepends = [ base scotty text transformers ]; license = stdenv.lib.licenses.mit; @@ -165974,6 +166667,7 @@ self: { sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary containers deepseq directory mtl packed-dawg parallel split @@ -166110,6 +166804,7 @@ self: { sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base cmdargs containers directory filepath json mtl parsec pretty process safe tagsoup time uniplate utf8-string @@ -166167,6 +166862,7 @@ self: { sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring exceptions linear StateVar text transformers vector ]; @@ -166176,18 +166872,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2-cairo" = callPackage - ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }: + "sdl2_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: mkDerivation { - pname = "sdl2-cairo"; - version = "0.1.0.2"; - sha256 = "11jaf13wklxbd5ndbwpbimnjwgf8k4wd7dbc979ng4j3qb0asdp5"; + pname = "sdl2"; + version = "2.3.0"; + sha256 = "0av74p5m93c3g490pcz9042f9sfjknxbh5cvwvakhcfrkvfdlva4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; - description = "Render with Cairo on SDL textures. Includes optional convenience drawing API."; - license = stdenv.lib.licenses.mit; + 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; hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + + "sdl2-cairo" = callPackage + ({ mkDerivation, base, cairo, linear, sdl2 }: + mkDerivation { + pname = "sdl2-cairo"; + version = "0.2"; + sha256 = "1diz8irrrc7mvy5fnm679xpl3dyy9ynr7a6d900yi3dn0zamq939"; + libraryHaskellDepends = [ base cairo linear sdl2 ]; + description = "Render with Cairo on SDL textures"; + license = stdenv.lib.licenses.mit; }) {}; "sdl2-cairo-image" = callPackage @@ -166267,7 +166981,6 @@ self: { executableHaskellDepends = [ base sdl2 text ]; description = "Bindings to SDL2_image"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-mixer" = callPackage @@ -166414,8 +167127,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.0.2"; - sha256 = "0a9cbmwy1i3ij0nzgzm340klds4f4b4f7aqb4q7h7sl6j096zg3h"; + version = "0.1.1.0"; + sha256 = "01famrx8xvfd8byikhliyrfhml91j264bnq456sxxwkmzs7gpy1n"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -166453,19 +167166,6 @@ self: { }) {}; "search-algorithms" = callPackage - ({ mkDerivation, base, containers, doctest, hspec }: - mkDerivation { - pname = "search-algorithms"; - version = "0.1.0"; - sha256 = "0sk3mgchhz885sbgyg4a7732jnlsqzv5c7mnx7pcpz5f8nhz14sc"; - 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_2_0" = callPackage ({ mkDerivation, base, containers, doctest, hspec }: mkDerivation { pname = "search-algorithms"; @@ -166476,7 +167176,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 @@ -166516,6 +167215,7 @@ self: { sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; homepage = "http://github.com/pgavin/secdh"; @@ -166588,7 +167288,6 @@ self: { homepage = "http://github.com/haskoin/secp256k1-haskell#readme"; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "secret-santa" = callPackage @@ -166662,7 +167361,6 @@ self: { homepage = "http://code.google.com/p/secure-hs/"; description = "Secure point-to-point connectivity library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "secureUDP" = callPackage @@ -166713,8 +167411,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.9.0"; - sha256 = "0c69aaalxi4b42y6y9y12wcxxyjnb3arc196kj0c1q6xdwh9fpk4"; + version = "0.1.10.1"; + sha256 = "1yx8gxi9bha95ss2i1hvbv8vlywxgi3a6rxjig44jz5w2s0zlp5h"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -166730,8 +167428,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.5.1"; - sha256 = "1462rcvyf79p80b17hkgkgb2jfzhkdq8vj0y001jy5wzl6gs7b8d"; + version = "0.1.6.0"; + sha256 = "0zf77mavhxn64mag6cgf6xch54qknl1yhack5nylf5xlwhpmrgsx"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -166746,8 +167444,8 @@ self: { }: mkDerivation { pname = "selda-sqlite"; - version = "0.1.5.1"; - sha256 = "1r81qidwqp5smi3h7awrbxhvlclm5dgvrmi56irghvh960h720j3"; + version = "0.1.6.0"; + sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -166768,6 +167466,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "selections" = callPackage + ({ mkDerivation, base, bifunctors, comonad, profunctors }: + mkDerivation { + pname = "selections"; + version = "0.2.0.0"; + sha256 = "000hdwdp56pc67j1iw0mc6m74dfim67g16ib4yr7vyilq8rfccb0"; + libraryHaskellDepends = [ base bifunctors comonad profunctors ]; + homepage = "https://github.com/ChrisPenner/selections#readme"; + description = "Combinators for operating with selections over an underlying functor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "selectors" = callPackage ({ mkDerivation, alex, array, base, containers, happy , template-haskell, text, xml-conduit @@ -166920,43 +167630,27 @@ self: { }) {}; "semigroupoids" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , containers, contravariant, directory, distributive, doctest - , filepath, semigroups, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.1"; - sha256 = "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive semigroups tagged transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroupoids_5_2" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, Cabal , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, semigroups, tagged, transformers, transformers-compat + , doctest, hashable, semigroups, tagged, transformers + , transformers-compat, unordered-containers }: mkDerivation { pname = "semigroupoids"; - version = "5.2"; - sha256 = "1g4ifzwsdpbkq50xrpd03vbdb75s5nwwmvb8xy2jpp509j0ghmyr"; + version = "5.2.1"; + sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; + revision = "1"; + editedCabalFile = "1lb59k2hdz9kbhmpw7bzc0n9pb5x3b9ysglp69dn4yf5xxjw03wx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant - distributive semigroups tagged transformers transformers-compat + distributive hashable semigroups tagged transformers + transformers-compat unordered-containers ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -166982,18 +167676,6 @@ self: { }) {}; "semigroups" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; - version = "0.18.2"; - sha256 = "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroups_0_18_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; @@ -167003,7 +167685,6 @@ self: { homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroups-actions" = callPackage @@ -167020,7 +167701,10 @@ self: { }) {}; "semiring" = callPackage - ({ mkDerivation, base, Boolean, containers, monoids }: + ({ mkDerivation, base, Boolean, containers, HUnit, monoids + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: mkDerivation { pname = "semiring"; version = "0.3"; @@ -167028,6 +167712,10 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Boolean containers monoids ]; + executableHaskellDepends = [ + base Boolean containers HUnit monoids QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; homepage = "http://github.com/srush/SemiRings/tree/master"; description = "Semirings, ring-like structures used for dynamic programming applications"; license = stdenv.lib.licenses.bsd3; @@ -167179,23 +167867,45 @@ self: { "sensu-run" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process - , temporary, text, time, vector, wreq + , temporary, text, time, unix, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.1.1.3"; - sha256 = "1zhhnddp81p42z243i10kma5jic283gqlg190lfifsg8kdg3yms1"; + 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 vector wreq + 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" = 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"; + sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring filepath http-client http-types lens network + optparse-applicative process temporary text time unix unix-compat + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { @@ -167246,23 +167956,24 @@ self: { "separated" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, papa, parsec, QuickCheck, semigroupoids, semigroups + , lens, parsec, QuickCheck, semigroupoids, semigroups , template-haskell }: mkDerivation { pname = "separated"; - version = "0.1.2"; - sha256 = "0hq4b6pvhwgqxskylyqg2952gj8nblbx7zcgj4rds10qlkaxhp4m"; + version = "0.2.3"; + sha256 = "0lxl7i0j27nn43a6p7ayxd1rr48h31zj0bviw0nd49fsd9l5c0iq"; + revision = "1"; + editedCabalFile = "0k1z3a9yr9aq7cnm7kfk5yiclhq95nqlgnzzz5ksj010qmnsb6zj"; libraryHaskellDepends = [ - base bifunctors lens papa semigroupoids semigroups + base bifunctors lens semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell ]; - homepage = "https://github.com/data61/separated"; + 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 @@ -167300,7 +168011,6 @@ self: { libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid_0_1_0" = callPackage @@ -167349,6 +168059,7 @@ self: { homepage = "https://github.com/LukeHoersten/seqid-streams"; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqloc" = callPackage @@ -167394,7 +168105,7 @@ self: { attoparsec base biocore bytestring cmdtheline conduit conduit-extra filepath hashable iteratee lifted-base monads-tf pretty QuickCheck random resourcet seqloc transformers transformers-base - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ attoparsec base biocore bytestring conduit conduit-extra directory @@ -167413,6 +168124,7 @@ self: { pname = "sequence"; version = "0.9.8"; sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers transformers ]; homepage = "https://github.com/atzeus/sequence"; description = "A type class for sequences and various sequence data structures"; @@ -167430,6 +168142,7 @@ self: { libraryHaskellDepends = [ base bytestring containers ghc transformers ]; + executableHaskellDepends = [ base bytestring containers ]; homepage = "https://github.com/lukemaurer/sequent-core"; description = "Alternative Core language for GHC plugins"; license = stdenv.lib.licenses.bsd3; @@ -167458,6 +168171,7 @@ self: { sha256 = "1dcinp03kbj94kw1lkkyz0gh4k7nw96l9c9782v0sdq0v5i525j9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers mtl nlp-scores pretty split text vector @@ -167519,6 +168233,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serialise" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring + , base64-bytestring, binary, bytestring, cborg, cereal + , cereal-vector, containers, criterion, deepseq, directory + , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive + , QuickCheck, quickcheck-instances, scientific, store, tar, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector, zlib + }: + mkDerivation { + pname = "serialise"; + version = "0.1.0.0"; + sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3"; + libraryHaskellDepends = [ + array base bytestring cborg containers ghc-prim half hashable + old-locale primitive text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring base64-bytestring binary + bytestring cborg containers deepseq directory filepath ghc-prim + half hashable QuickCheck quickcheck-instances scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson array base binary bytestring cborg cereal cereal-vector + containers criterion deepseq directory filepath ghc-prim half + old-locale pretty store tar text time vector zlib + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A binary serialisation library for Haskell values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "serialize-instances" = callPackage ({ mkDerivation, base, cereal, hashable, semigroups , unordered-containers @@ -167550,39 +168297,35 @@ self: { }) {}; "serokell-util" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal - , base, base16-bytestring, base64-bytestring, binary - , binary-orphans, bytestring, cereal, cereal-vector, clock - , containers, data-msgpack, deepseq, directory, either, exceptions - , extra, filepath, formatting, hashable, hspec, lens, log-warper - , monad-control, mtl, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, safecopy, scientific, semigroups, stm - , template-haskell, text, text-format, time-units, transformers - , universum, unordered-containers, vector, yaml + ({ mkDerivation, acid-state, aeson, ansi-terminal, base + , base16-bytestring, base64-bytestring, bytestring, clock + , containers, deepseq, directory, exceptions, extra, filepath + , formatting, hashable, hspec, lens, log-warper, monad-control, mtl + , optparse-applicative, parsec, QuickCheck, quickcheck-instances + , safecopy, scientific, semigroups, stm, template-haskell, text + , text-format, time-units, transformers, universum + , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.1.5.3"; - sha256 = "05iwdmwq6fg4bq1nmmi19dax3rnjjxwbn6l5ff9fbs794qzmb704"; + version = "0.4.0"; + sha256 = "1hql9cmw43cq9dsrkd0qwy1ycj6srsc2sr32grcfvh2j350k2m0p"; libraryHaskellDepends = [ - acid-state aeson aeson-extra ansi-terminal base base16-bytestring - base64-bytestring binary binary-orphans bytestring cereal - cereal-vector clock containers data-msgpack deepseq directory - either exceptions extra filepath formatting hashable lens - log-warper monad-control mtl optparse-applicative parsec QuickCheck + acid-state aeson ansi-terminal base base16-bytestring + base64-bytestring bytestring clock containers deepseq directory + exceptions extra filepath formatting hashable lens log-warper + monad-control mtl optparse-applicative parsec QuickCheck quickcheck-instances safecopy scientific semigroups stm template-haskell text text-format time-units transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base binary bytestring cereal data-msgpack hspec QuickCheck - quickcheck-instances safecopy scientific text text-format - unordered-containers vector + aeson base bytestring hspec QuickCheck quickcheck-instances + safecopy scientific text text-format unordered-containers vector ]; homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serpentine" = callPackage @@ -167647,34 +168390,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , case-insensitive, directory, doctest, filemanip, filepath, hspec - , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, string-conversions, text, url - , vault - }: - mkDerivation { - pname = "servant"; - version = "0.9.1.1"; - sha256 = "1yp5qj255ym64zl5lkabiwqlijcq7pid1k4m2smxy1xbfvv74czv"; - revision = "1"; - editedCabalFile = "0kfy554fwl2skdb6cagrpbypg7jv15rf6bspyivdqr34dvpr7gm9"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring case-insensitive - http-api-data http-media http-types mmorph mtl network-uri - string-conversions text vault - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring directory doctest - filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_11" = 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 @@ -167703,7 +168418,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -167712,10 +168426,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.2"; - sha256 = "1g9y1fqyd7v1cmwjid5i83qji2a4c514hmpz7ypz6zvd4ppj5v9l"; - revision = "1"; - editedCabalFile = "1sj4qyaf75nf1mciddga30b8ddrwv94184cz751n9abxidl18r49"; + version = "0.3.0.3"; + sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167760,8 +168472,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.7.0"; - sha256 = "0j0hfal64qjdbif9a6vy7dv4zn0pmkspn0pwafhsyh5adgqkrhxa"; + version = "0.3.0.0"; + sha256 = "085xfhrim0y067yab3pwgiilk7zzdg8b7dz3i08f4cfd633an8km"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -167777,8 +168489,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.7.1"; - sha256 = "1y5ha76j81biyzzgl9r26i0hkx1j3yslidzyl5h8xz55y712m16d"; + version = "0.3.0.0"; + sha256 = "048rrakd4v9nhgnqdwk4hwdb4mrailpkmf0ip1zmav18rg9ij3c7"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -167802,37 +168514,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.4"; - sha256 = "1jnlbljv6d484jzx9vympirmzvvqi2b1638b4155868vnz8sfjby"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring cereal cookie - cryptonite data-default exceptions http-api-data http-types memory - mtl servant servant-server tagged time transformers wai - ]; - testHaskellDepends = [ - base bytestring cereal cryptonite data-default deepseq hspec - QuickCheck servant-server time - ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite servant-server - ]; - description = "Authentication via encrypted cookies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-auth-cookie_0_5_0_4" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , cereal, cookie, criterion, cryptonite, data-default, deepseq - , exceptions, hspec, http-api-data, http-types, memory, mtl - , QuickCheck, servant, servant-server, tagged, time, transformers - , wai - }: - mkDerivation { - pname = "servant-auth-cookie"; - version = "0.5.0.4"; - sha256 = "0h9m9mzq2b5k5l3zp42cs45k5wi42bqvsp3lp2p1z1fb9as4cw2v"; + version = "0.5.0.5"; + sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167849,7 +168532,6 @@ self: { ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-docs" = callPackage @@ -167921,6 +168603,8 @@ self: { pname = "servant-auth-server"; version = "0.3.0.0"; sha256 = "1rs51w929hlwsgrg5ajcv3cp09hnk37p1n5s2ydmja22m4ba93ak"; + revision = "1"; + editedCabalFile = "077qvaxqcnhvyl1d1318hyx9ckjd3z5n48vq0bqma0z7wqlzqs2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167948,6 +168632,7 @@ self: { 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 @@ -167968,6 +168653,7 @@ self: { 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 @@ -167986,7 +168672,6 @@ 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 @@ -168027,7 +168712,6 @@ 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 @@ -168115,20 +168799,6 @@ self: { }) {}; "servant-cassava" = callPackage - ({ mkDerivation, base, cassava, http-media, servant, vector }: - mkDerivation { - pname = "servant-cassava"; - version = "0.8"; - sha256 = "1yz4vhj7b210mgk6wjkj0gg5vzz4092jxybvwizjri1gvkvqb6sx"; - revision = "2"; - editedCabalFile = "0yl56hhm4isxli1srv3jvisyzic3fj5j786mikbvx1q0vv946r2b"; - libraryHaskellDepends = [ base 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_9" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, vector }: @@ -168136,20 +168806,22 @@ self: { pname = "servant-cassava"; version = "0.9"; sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3"; + revision = "1"; + editedCabalFile = "04rzz2a310q4jkr94j7j7scmyvc0ms7vw285jq2dv2r9g7gwdb3s"; 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-checked-exceptions" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob - , hspec-wai, http-media, profunctors, servant, servant-client - , servant-docs, servant-server, tagged, tasty, tasty-hspec - , tasty-hunit, text, wai + , hspec-wai, http-api-data, http-client, http-media + , natural-transformation, optparse-applicative, profunctors + , servant, servant-client, servant-docs, servant-server, tagged + , tasty, tasty-hspec, tasty-hunit, text, wai, warp }: mkDerivation { pname = "servant-checked-exceptions"; @@ -168161,6 +168833,11 @@ self: { aeson base bytestring deepseq http-media profunctors servant servant-client servant-docs servant-server tagged text ]; + executableHaskellDepends = [ + aeson base http-api-data http-client natural-transformation + optparse-applicative servant servant-client servant-docs + servant-server text wai warp + ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai servant servant-server tasty tasty-hspec tasty-hunit wai @@ -168171,36 +168848,6 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, deepseq, exceptions, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe - , servant, servant-server, string-conversions, text, transformers - , transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.9.1.1"; - sha256 = "0967k5xnphiq6p7s9a8qxgvzzj77nsbipinyzxvb1jlf3am5y23f"; - revision = "1"; - editedCabalFile = "1ic2m9pm1id250dszlh4dy5pxf5kza7ps8vnc3wfpmhxn78p5b6k"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - exceptions http-api-data http-client http-client-tls http-media - http-types mtl network-uri safe servant string-conversions text - transformers transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring deepseq hspec http-api-data - http-client http-media http-types HUnit network QuickCheck servant - servant-server text transformers transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, deepseq, exceptions, generics-sop , hspec, http-api-data, http-client, http-client-tls, http-media @@ -168231,7 +168878,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -168264,6 +168910,7 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-db-postgresql" = callPackage @@ -168282,6 +168929,10 @@ self: { base bytestring containers postgresql-query postgresql-simple servant servant-db text ]; + executableHaskellDepends = [ + base bytestring monad-logger postgresql-query servant-db time + transformers-base + ]; testHaskellDepends = [ base bytestring derive hspec HUnit monad-logger optparse-applicative postgresql-query QuickCheck @@ -168294,19 +168945,19 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring + ({ 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 }: mkDerivation { pname = "servant-docs"; - version = "0.9.1.1"; - sha256 = "0ydwd3jqbhss0i0l67ib082pscsq7qn88qhy49an74mabk90ahkw"; + version = "0.10.0.1"; + sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring case-insensitive + aeson aeson-pretty base base-compat bytestring case-insensitive control-monad-omega hashable http-media http-types lens servant string-conversions text unordered-containers ]; @@ -168319,10 +168970,9 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "servant-docs_0_10_0_1" = callPackage + "servant-docs_0_11" = 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 @@ -168330,8 +168980,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.10.0.1"; - sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k"; + version = "0.11"; + sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168398,11 +169048,13 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens - , servant, servant-foreign, text, wl-pprint-text + ({ mkDerivation, aeson, base, Diff, directory, elm-export, hspec + , HUnit, interpolate, lens, mockery, process, servant + , servant-foreign, text, wl-pprint-text }: mkDerivation { pname = "servant-elm"; @@ -168413,8 +169065,10 @@ self: { libraryHaskellDepends = [ base elm-export lens servant servant-foreign text wl-pprint-text ]; + executableHaskellDepends = [ base elm-export servant text ]; testHaskellDepends = [ - aeson base Diff elm-export hspec HUnit servant text + aeson base Diff directory elm-export hspec HUnit interpolate + mockery process servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; @@ -168446,18 +169100,6 @@ self: { }) {}; "servant-foreign" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: - mkDerivation { - pname = "servant-foreign"; - version = "0.9.1.1"; - sha256 = "1jn9lwyvv7iv2yg0qj9702f41271835d3j39k80g6gkvr53az6ys"; - libraryHaskellDepends = [ base http-types lens servant text ]; - testHaskellDepends = [ base hspec ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_10_1" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; @@ -168467,7 +169109,18 @@ self: { testHaskellDepends = [ base hspec servant ]; 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 { + pname = "servant-generic"; + version = "0.1.0.0"; + sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6"; + libraryHaskellDepends = [ base servant servant-server ]; + testHaskellDepends = [ base servant servant-server text warp ]; + description = "Specify Servant APIs with records"; + license = stdenv.lib.licenses.mit; }) {}; "servant-github" = callPackage @@ -168494,17 +169147,18 @@ self: { }) {}; "servant-github-webhook" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto - , github, http-types, servant, servant-server, string-conversions - , text, transformers, wai, warp + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, github, http-types, memory, servant, servant-server + , string-conversions, text, transformers, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.0.2"; - sha256 = "1fbrc1i76hllrl61j262yxbibgsd6fkwcwl588mhxf48j0cfpp06"; + version = "0.3.1.0"; + sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring Crypto github http-types - servant servant-server string-conversions text transformers wai + aeson base base16-bytestring bytestring cryptonite github + http-types memory servant servant-server string-conversions text + transformers wai ]; testHaskellDepends = [ aeson base bytestring servant-server transformers wai warp @@ -168512,7 +169166,6 @@ self: { 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 @@ -168544,9 +169197,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-iCalendar" = callPackage + ({ mkDerivation, base, data-default, http-media, iCalendar, servant + }: + mkDerivation { + pname = "servant-iCalendar"; + version = "0.1.0.1"; + sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; + libraryHaskellDepends = [ + base data-default http-media iCalendar servant + ]; + homepage = "https://github.com/fgaz/servant-iCalendar#readme"; + description = "Servant support for iCalendar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage - ({ mkDerivation, base, charset, hspec, hspec-expectations - , language-ecmascript, lens, servant, text + ({ mkDerivation, aeson, base, charset, filepath, hspec + , hspec-expectations, language-ecmascript, lens, servant + , servant-server, stm, text, transformers, warp }: mkDerivation { pname = "servant-jquery"; @@ -168555,6 +169224,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; + executableHaskellDepends = [ + aeson base filepath servant servant-server stm transformers warp + ]; testHaskellDepends = [ base hspec hspec-expectations language-ecmascript lens servant ]; @@ -168565,9 +169237,10 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec + ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text + , servant, servant-foreign, servant-server, stm, text, transformers + , warp }: mkDerivation { pname = "servant-js"; @@ -168580,6 +169253,10 @@ self: { libraryHaskellDepends = [ base base-compat charset lens servant servant-foreign text ]; + executableHaskellDepends = [ + aeson base filepath lens servant servant-server stm transformers + warp + ]; testHaskellDepends = [ base base-compat hspec hspec-expectations language-ecmascript lens QuickCheck servant text @@ -168625,36 +169302,6 @@ self: { }) {}; "servant-mock" = callPackage - ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp - }: - mkDerivation { - pname = "servant-mock"; - version = "0.8.1.1"; - sha256 = "0z8rsw995k8lkp4bpw4r8bcrnq7ljazznfh0dglcc2s6k5c1ldyp"; - revision = "1"; - editedCabalFile = "0kfv4nbzbny7wx5d7pgc3f2jgm9xq6zabldfdm8215bh5x3sfh90"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-types QuickCheck servant servant-server - transformers wai - ]; - executableHaskellDepends = [ - aeson base QuickCheck servant-server warp - ]; - testHaskellDepends = [ - aeson base bytestring-conversion hspec hspec-wai QuickCheck servant - servant-server wai - ]; - 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-mock_0_8_2" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server , transformers, wai, warp @@ -168681,7 +169328,6 @@ self: { 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 @@ -168693,6 +169339,8 @@ self: { pname = "servant-multipart"; version = "0.10.0.1"; sha256 = "1wba440qlcjw6h6k8qiycsfq26snfkmy0p45d51li704s4m3idcv"; + revision = "1"; + editedCabalFile = "1li09340kh4ak1nnqk0qxnwx2yngqwk3fj1c0824yrib29c65973"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168706,7 +169354,6 @@ self: { homepage = "https://github.com/haskell-servant/servant-multipart#readme"; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-named" = callPackage @@ -168745,16 +169392,17 @@ self: { }) {}; "servant-pandoc" = callPackage - ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types - , servant-docs, text, unordered-containers + ({ mkDerivation, base, bytestring, case-insensitive, http-media + , lens, pandoc-types, servant-docs, string-conversions, text + , unordered-containers }: mkDerivation { pname = "servant-pandoc"; - version = "0.4.1.2"; - sha256 = "0dv25j7jz2pn5ykv9jihk2qrhqqdawx19637aa76k5rv93lc5379"; + version = "0.4.1.4"; + sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j"; libraryHaskellDepends = [ - base bytestring http-media lens pandoc-types servant-docs text - unordered-containers + base bytestring case-insensitive http-media lens pandoc-types + servant-docs string-conversions text unordered-containers ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; @@ -168795,31 +169443,6 @@ self: { }) {}; "servant-purescript" = 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.6.0.0"; - sha256 = "0p1811l1szdw5cb1pm1xkfgqm157yqkpva1p3g22dbj1kzjdjv76"; - 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-purescript_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -168841,7 +169464,6 @@ self: { 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 @@ -168852,8 +169474,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.2.0.0"; - sha256 = "1701mcr99hg4zlsh95ri4nrx1iws1ns2f9gi55dzbyay429czlfg"; + version = "0.4.0.0"; + sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -168864,9 +169486,10 @@ self: { }) {}; "servant-py" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, charset - , hspec, hspec-expectations, lens, QuickCheck, servant - , servant-foreign, text + ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring + , charset, filepath, hspec, hspec-expectations, lens, QuickCheck + , servant, servant-blaze, servant-foreign, servant-server, stm + , text, wai, warp }: mkDerivation { pname = "servant-py"; @@ -168877,6 +169500,10 @@ self: { libraryHaskellDepends = [ aeson base bytestring charset lens servant servant-foreign text ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring filepath servant servant-blaze + servant-foreign servant-server stm text wai warp + ]; testHaskellDepends = [ aeson base base-compat bytestring hspec hspec-expectations lens QuickCheck servant servant-foreign text @@ -168964,6 +169591,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_3_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.3.0.0"; + sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + 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 ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -168985,42 +169628,6 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, containers, directory, doctest - , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data - , http-types, mtl, network, network-uri, parsec, QuickCheck, safe - , servant, should-not-typecheck, split, string-conversions - , system-filepath, temporary, text, transformers - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.9.1.1"; - sha256 = "1ldxj6653818gsk9az8mfwvphhnh3z6wgr8igf57l7yfgraq61hy"; - revision = "1"; - editedCabalFile = "0wcpfg1v36jp5flf82dr5z27avff4gml9ag1znkgahxbsix17m8g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck safe servant should-not-typecheck - string-conversions temporary text transformers transformers-compat - wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, Cabal, cabal-doctest, containers , directory, doctest, exceptions, filemanip, filepath, hspec @@ -169057,7 +169664,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-smsc-ru" = callPackage @@ -169127,12 +169733,12 @@ self: { ({ mkDerivation, base, blaze-html, bytestring, containers , directory, doctest, filepath, Glob, hspec-wai, http-media , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai + , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp }: mkDerivation { pname = "servant-static-th"; - version = "0.1.0.3"; - sha256 = "150y6pj4n85cmv3p3h5pkkyvgv85dv0kf4zmh6iddav340gg26wx"; + version = "0.1.0.5"; + sha256 = "1i1xyn14nc2jg1b6y926pz3dp4hlgg54q3lzzg9zza1jnh6ncjrp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169140,6 +169746,7 @@ self: { semigroups servant servant-blaze servant-server template-haskell text ]; + executableHaskellDepends = [ base servant-server wai warp ]; testHaskellDepends = [ base blaze-html bytestring directory doctest filepath Glob hspec-wai servant servant-blaze servant-server tasty tasty-hspec @@ -169160,8 +169767,10 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.5.0.3"; - sha256 = "0al40x2hiam4nv8zxw8ysc2vs5r5y72dqa604i2n44jwaryg8c05"; + version = "0.6.0.0"; + sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; + revision = "1"; + editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169175,7 +169784,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-subscriber_0_6_0_1" = callPackage @@ -169207,31 +169815,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory - , doctest, filepath, hspec, http-media, insert-ordered-containers - , lens, QuickCheck, servant, swagger2, text, time - , unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.1.2"; - sha256 = "0zn4r325mp1aqcg6gq2lvwizvypaabqdsnsx5v8gx29117gmr98s"; - revision = "2"; - editedCabalFile = "10f0f010wkz3q834c9nfnv9dg0m4hbz21r3zy39dnvjm4zjyfk0v"; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media insert-ordered-containers - lens QuickCheck servant swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base directory doctest filepath hspec lens - QuickCheck servant swagger2 text time - ]; - homepage = "https://github.com/haskell-servant/servant-swagger"; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_3" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal , cabal-doctest, directory, doctest, filepath, hspec, http-media , insert-ordered-containers, lens, QuickCheck, servant, swagger2 @@ -169239,8 +169822,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.3"; - sha256 = "0hf3psdcbnj0mj73zdfhv0l4p432hxzj1i9m66al3kd3k7rz79pk"; + version = "1.1.3.1"; + sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -169253,7 +169836,6 @@ self: { homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -169265,8 +169847,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.3.2.2.8"; - sha256 = "0daqlhwy48098wp2hjsnam7d29fj6zqxmdckqfc8z0xfs07ppbg8"; + version = "0.2.4.3.0.20"; + sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -169282,6 +169864,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-websockets" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , exceptions, resourcet, servant-server, text, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "servant-websockets"; + version = "1.0.0"; + sha256 = "05y9yyrg5c99xdlyfzwddylrklpspabijdd08f5c75bhdi2i4cb2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring conduit exceptions resourcet + servant-server text wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ + aeson base conduit servant-server text wai warp websockets + ]; + homepage = "https://github.com/moesenle/servant-websockets#readme"; + description = "Small library providing WebSocket endpoints for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -169386,7 +169991,6 @@ 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 @@ -169475,7 +170079,6 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using persistent and an RDBMS"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-backend-redis" = callPackage @@ -169498,7 +170101,6 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-frontend-snap" = callPackage @@ -169737,7 +170339,6 @@ self: { homepage = "http://bitbucket.org/robertmassaioli/setdown"; description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setenv" = callPackage @@ -169759,6 +170360,8 @@ self: { pname = "setgame"; version = "1.1"; sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l"; + revision = "1"; + editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random vty ]; @@ -169795,7 +170398,6 @@ self: { ]; description = "A Haskell implementation of setoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setops" = callPackage @@ -169876,6 +170478,7 @@ self: { sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers dlist ghc-prim mtl vector ]; @@ -169916,7 +170519,6 @@ self: { homepage = "https://github.com/esmolanka/sexp-grammar"; description = "Invertible parsers for S-expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -169935,7 +170537,9 @@ self: { }) {}; "sexpr" = callPackage - ({ mkDerivation, base, base64-string, binary, bytestring, pretty }: + ({ mkDerivation, base, base64-string, binary, bytestring, pretty + , QuickCheck, random + }: mkDerivation { pname = "sexpr"; version = "0.2.1"; @@ -169945,6 +170549,7 @@ self: { libraryHaskellDepends = [ base base64-string binary bytestring pretty ]; + executableHaskellDepends = [ QuickCheck random ]; description = "S-expression printer and parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -169967,7 +170572,6 @@ self: { homepage = "https://github.com/dzhus/sext#readme"; description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfml-audio" = callPackage @@ -170136,6 +170740,7 @@ self: { sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson async base binary bytestring conduit-combinators conduit-extra containers cryptohash HsOpenSSL iproute network @@ -170200,6 +170805,7 @@ self: { 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 @@ -170298,7 +170904,6 @@ 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 @@ -170363,14 +170968,18 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, directory, shake }: + ({ mkDerivation, base, basic-prelude, deepseq, directory + , regex-compat, shake + }: mkDerivation { pname = "shakers"; - version = "0.0.25"; - sha256 = "0svgrvp054vs00hx5pcdlmpc375c4r926nla4fgk1jax6ghbaw72"; + version = "0.0.31"; + sha256 = "134v3rzyhf5yv417dp90f9phgm4mdbhc5sv9l44jdbhplnmahh2m"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base basic-prelude directory shake ]; + libraryHaskellDepends = [ + base basic-prelude deepseq directory regex-compat shake + ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; @@ -170404,6 +171013,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_14" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -170496,6 +171132,7 @@ self: { pname = "shana"; version = "2009.12.1"; sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory regex-posix ]; homepage = "http://github.com/nfjinjing/hack/tree/master"; description = "treat haskell functions as unix pipes"; @@ -170548,7 +171185,6 @@ self: { homepage = "https://github.com/anton-k/sharc"; description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra."; license = stdenv.lib.licenses.bsd3; - broken = true; }) {}; "shared-buffer" = callPackage @@ -170659,27 +171295,6 @@ self: { }) {}; "shell-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , control-monad-loop, directory, filepath, monad-control, monads-tf - , process, resourcet, semigroups, split, template-haskell, text - , transformers, transformers-base, unix - }: - mkDerivation { - pname = "shell-conduit"; - version = "4.5.2"; - sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra control-monad-loop - directory filepath monad-control monads-tf process resourcet - semigroups split template-haskell text transformers - transformers-base unix - ]; - homepage = "https://github.com/chrisdone/shell-conduit"; - description = "Write shell scripts with Conduit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shell-conduit_4_6_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , control-monad-loop, directory, filepath, hspec , hspec-expectations, monad-control, monads-tf, process, resourcet @@ -170738,6 +171353,7 @@ self: { sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html"; @@ -170779,7 +171395,6 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Simple interface for shell scripting in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellmate-extras" = callPackage @@ -170799,7 +171414,6 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelltestrunner" = callPackage @@ -170856,6 +171470,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_6_8_4" = 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.4"; + sha256 = "1s69ifnamzjd121rf7k5idxzbwhc4ap8msxjhfsya04kwzjcixyj"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -171106,19 +171751,6 @@ self: { }) {}; "show-prettyprint" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: - mkDerivation { - pname = "show-prettyprint"; - version = "0.1.2.1"; - sha256 = "1zwvaa91r4scfxxlbqzfi335bqb3jrgbkkq38dysny52fg6mn565"; - libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/quchen/show-prettyprint#readme"; - description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "show-prettyprint_0_2" = callPackage ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter , trifecta }: @@ -171135,7 +171767,6 @@ self: { homepage = "https://github.com/quchen/show-prettyprint#readme"; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-type" = callPackage @@ -171158,6 +171789,7 @@ self: { sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base glade gtk random ]; description = "A simple gtk based Russian Roulette game"; license = stdenv.lib.licenses.bsd3; @@ -171293,7 +171925,6 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -171318,6 +171949,7 @@ self: { sha256 = "1m0f5n2dz02mvd2hlsv3gdq8y4xqba7dmyqn2x123sbvm9yvj584"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers directory fgl filepath glib gtk hxt mtl parsec process text unix @@ -171340,6 +171972,7 @@ self: { pname = "sifflet-lib"; version = "2.2.1"; sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers directory fgl filepath glib gtk hxt mtl parsec process unix @@ -171371,7 +172004,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Thom polynomials of second order Thom-Boardman singularities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "sign" = callPackage @@ -171398,8 +172030,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "signal"; - version = "0.1.0.3"; - sha256 = "1iwa707xd4g4lycdjr72ygrjy68gyqyvhvl2bbxswgpfxy5i1x8x"; + version = "0.1.0.4"; + sha256 = "1rbnblp2d9cw54jnxjcfjhp0bizvcdcxg9y1b4ky0iskny9dvgy4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base unix ]; @@ -171496,6 +172128,7 @@ self: { sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring directory filepath http-types mime-types monad-control mtl simple-templates @@ -171612,7 +172245,6 @@ self: { homepage = "http://github.com/jwiegley/simple-conduit"; description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-config" = callPackage @@ -171673,8 +172305,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.9.0.0"; - sha256 = "1wrdqzwzi9gjjixg3rhkvc1lpi6br07inl0k6ngbrd8shxipwsa3"; + version = "0.9.0.1"; + sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -171684,7 +172316,6 @@ self: { homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-eval" = callPackage @@ -171799,26 +172430,6 @@ self: { }) {}; "simple-log" = callPackage - ({ mkDerivation, async, base, containers, deepseq, directory - , exceptions, filepath, mtl, SafeSemaphore, text, time - , transformers - }: - mkDerivation { - pname = "simple-log"; - version = "0.5.1"; - sha256 = "1xnv5vgi1an91fw32m2c8wcf85cqwc5bh41f6cw6b23pg0hcvdyi"; - revision = "1"; - editedCabalFile = "0xqzi65hhmazyqpvw2c7rzs49xdm4rah84kcz7w3c25zac9hbxl2"; - libraryHaskellDepends = [ - async base containers deepseq directory exceptions filepath mtl - SafeSemaphore text time transformers - ]; - homepage = "http://github.com/mvoidex/simple-log"; - description = "Simple log for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-log_0_9_2" = callPackage ({ mkDerivation, async, base, base-unicode-symbols, containers , data-default, deepseq, directory, exceptions, filepath, hformat , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore @@ -171826,8 +172437,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.2"; - sha256 = "13a1rqbig0q0nkkwk33vq7vp6w4dvm8famf5dpydw3vlizwh4db9"; + version = "0.9.3"; + sha256 = "0i58x3gasg1gda7yx9r155ap6w7mamafcqi5jpq4adm9wx4gy4ph"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -171837,7 +172448,6 @@ self: { homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-log-syslog" = callPackage @@ -171857,31 +172467,36 @@ self: { ({ mkDerivation, base, fast-logger, mtl, text }: mkDerivation { pname = "simple-logger"; - version = "0.0.3"; - sha256 = "1hay2v40bnxl5liayssgsg28z835xv833smc974smxpayay05c2z"; + version = "0.0.4"; + sha256 = "0550in9vkgf78rxfkzcrna40mihmaqhlixysfz8n0rz0rhw0z9gk"; libraryHaskellDepends = [ base fast-logger mtl text ]; homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-logging" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, iso8601-time - , lens, mtl, simple-effects, string-conv, text, time, vector + ({ mkDerivation, aeson, base, bytestring, directory, exceptions + , filepath, hscolour, iso8601-time, lens, mtl, simple-effects + , string-conv, text, time, uuid, vector }: mkDerivation { pname = "simple-logging"; - version = "0.2.0.1"; - sha256 = "1x0vclb2an4mbwxqk44z0rpw1ai0pq2kc9ak0chyzijbk1vivwmx"; + version = "0.2.0.2"; + sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw"; libraryHaskellDepends = [ - aeson base bytestring exceptions iso8601-time lens mtl + aeson base bytestring directory exceptions filepath hscolour + iso8601-time lens mtl simple-effects string-conv text time uuid + vector + ]; + testHaskellDepends = [ + aeson base bytestring exceptions hscolour iso8601-time lens mtl simple-effects string-conv text time vector ]; - testHaskellDepends = [ base simple-effects ]; homepage = "https://gitlab.com/haskell-hr/logging"; description = "Logging effect to plug into the simple-effects framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-money" = callPackage @@ -172096,17 +172711,6 @@ self: { }) {}; "simple-smt" = callPackage - ({ mkDerivation, base, process }: - mkDerivation { - pname = "simple-smt"; - version = "0.6.0"; - sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c"; - libraryHaskellDepends = [ base process ]; - description = "A simple way to interact with an SMT solver process"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-smt_0_7_0" = callPackage ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; @@ -172115,7 +172719,6 @@ self: { libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-sql-parser" = callPackage @@ -172124,18 +172727,18 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.2"; - sha256 = "013vxh1l1q44s566d7mizhf810sl6r87nkkpl687md421kjhswms"; + version = "0.4.3"; + sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; + executableHaskellDepends = [ base mtl parsec pretty ]; testHaskellDepends = [ base HUnit mtl parsec pretty test-framework test-framework-hunit ]; - homepage = "http://jakewheat.github.io/simple-sql-parser/"; + 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 @@ -172238,7 +172841,6 @@ self: { homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-zipper" = callPackage @@ -172260,6 +172862,7 @@ self: { pname = "simpleargs"; version = "0.2.1"; sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://malde.org/~ketil/simpleargs"; description = "Provides a more flexible getArgs function with better error reporting"; @@ -172425,6 +173028,7 @@ self: { sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bio bytestring random ]; homepage = "http://malde.org/~ketil/"; description = "Simulate sequencing with different models for priming and errors"; @@ -172469,7 +173073,6 @@ self: { homepage = "http://sigkill.dk/programs/sindre"; description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage @@ -172478,6 +173081,8 @@ self: { pname = "singleton-bool"; version = "0.1.2.0"; sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk"; + revision = "1"; + editedCabalFile = "13x8chqhrlmrsca0018p7z5by3przlr9921yhjc072c8433br586"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; @@ -172527,15 +173132,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_3" = callPackage + "singletons_2_3_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, text , th-desugar }: mkDerivation { pname = "singletons"; - version = "2.3"; - sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5"; + version = "2.3.1"; + sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa"; libraryHaskellDepends = [ base containers mtl syb template-haskell text th-desugar ]; @@ -172582,6 +173187,7 @@ self: { sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg"; revision = "1"; editedCabalFile = "1q2dy0ywngm9iv7k6d9gnf860m9hpf62q5qvdzmxw5s629gk4afn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cpu ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -172644,6 +173250,7 @@ self: { homepage = "http://github.com/alpmestan/sitemap"; description = "Sitemap parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sitepipe" = callPackage @@ -172665,7 +173272,6 @@ 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 @@ -172721,7 +173327,8 @@ self: { }) {}; "sized-types" = callPackage - ({ mkDerivation, array, base, base-compat, containers, singletons + ({ mkDerivation, array, base, base-compat, containers, QuickCheck + , singletons }: mkDerivation { pname = "sized-types"; @@ -172734,6 +173341,8 @@ self: { libraryHaskellDepends = [ array base base-compat containers singletons ]; + executableHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base QuickCheck ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools"; description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; @@ -172894,6 +173503,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "skip-list" = callPackage + ({ mkDerivation, base, criterion, tasty, tasty-hunit }: + mkDerivation { + pname = "skip-list"; + version = "0.1.0.1"; + sha256 = "1ndcrn0w7957n1sjcsziml1mgqbr6p4zvzh3nm2m8akaswi09dxh"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/gmalecha/skip-list#readme"; + description = "An implementation of pure skip lists"; + license = stdenv.lib.licenses.mit; + }) {}; + "skulk" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -172948,6 +173571,11 @@ self: { 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 @@ -172958,7 +173586,6 @@ self: { homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting_0_3_3_1" = callPackage @@ -172979,6 +173606,11 @@ self: { containers directory filepath hxt mtl regex-pcre-builtin safe text utf8-string ]; + executableHaskellDepends = [ + aeson base 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 random tasty tasty-golden tasty-hunit text @@ -173070,7 +173702,6 @@ self: { testHaskellDepends = [ base ]; description = "Bindings to the Slack RTM API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slack-notify-haskell" = callPackage @@ -173094,17 +173725,22 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, generics-sop, http-api-data - , http-client, http-client-tls, servant, servant-client, text - , transformers + ({ 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.1.0"; - sha256 = "107knm7ldy14n0nb474xa5sha6z6b413pmf96ih8amv8zs5nq642"; + version = "0.2.0.1"; + sha256 = "1v1w6szcjy4qgdx66754vkp7w4fnkyg0pngijy2v422pqmc4jpr9"; libraryHaskellDepends = [ - aeson base generics-sop http-api-data http-client http-client-tls - servant servant-client text transformers + 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"; @@ -173220,7 +173856,6 @@ 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 @@ -173278,10 +173913,8 @@ self: { }: mkDerivation { pname = "slug"; - version = "0.1.6"; - sha256 = "14j6fca3fan8iazhf1r5l18hg22z59jj86mzbpnqhivx1nrqkmf4"; - revision = "1"; - editedCabalFile = "1q5adw6i43d588kbhci086blj1cvldbxcils2k99p4hs8qlzymbj"; + version = "0.1.7"; + sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -173333,10 +173966,8 @@ self: { ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.1"; - sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd"; - revision = "1"; - editedCabalFile = "1ykq0hqs1alw86p0ssa6dhsb1a8d4m6bqwibkhvzcd6c28dq975i"; + version = "1.1.2"; + sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; @@ -173459,8 +174090,8 @@ self: { }: mkDerivation { pname = "smartcheck"; - version = "0.2.2"; - sha256 = "1wc5257r6qrbawn4ip2d9fqlcpb77bjikjn3ixsa3rhazbasq2is"; + version = "0.2.4"; + sha256 = "0wj6xwassh69z97p47xh7i68xs7mvi05fni4qxizyicmbr8k27il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173496,6 +174127,7 @@ self: { sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base haskell98 pretty unix utf8-string ]; @@ -173541,8 +174173,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }: mkDerivation { pname = "smiles"; - version = "0.1.1.0"; - sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz"; + version = "0.2.0.0"; + sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; homepage = "https://github.com/zmactep/smiles#readme"; @@ -173555,6 +174187,7 @@ self: { pname = "smoothie"; version = "0.4.2.7"; sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; @@ -173576,7 +174209,6 @@ 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 @@ -173796,10 +174428,10 @@ self: { }: mkDerivation { pname = "snap"; - version = "1.0.0.1"; - sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9"; - revision = "4"; - editedCabalFile = "1bcfw4g6wqkssp0l7n6115d513y70b8zb7cdz5hrlaxyq5pah6hk"; + version = "1.0.0.2"; + sha256 = "0jx2prq0lxq9jqxqk8f059lwjm2yqxzwb9lx6iviq57flx4zxyqq"; + revision = "1"; + editedCabalFile = "1df44l26sxfk2qprs2vcfigzyzkxxwxi8siaaikbvmjzyjm0mby1"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -173837,7 +174469,6 @@ self: { homepage = "https://github.com/zmthy/snap-accept"; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-app" = callPackage @@ -173923,8 +174554,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.2.1"; - sha256 = "07d1rk6jr5yk74v3g53ncal5f44hyi1486xlxg7lj3v4qifkv46y"; + version = "1.0.3.0"; + sha256 = "0vkla7rfrwyhk31nign8ccjfhp7f0nqjhmg6hb7rq7ggblgwgnr4"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -173986,8 +174617,8 @@ self: { }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.3"; - sha256 = "1dbs1pww1xsfhfbddfxwxay5s3g4j0880hza83ck46n5kfgkm1rk"; + version = "1.1.4"; + sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -174009,10 +174640,11 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.0.0"; - sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n"; + version = "0.12.1.0"; + sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring case-insensitive configurator containers data-default digestive-functors @@ -174053,6 +174685,8 @@ self: { pname = "snap-loader-dynamic"; version = "1.0.0.0"; sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg"; + revision = "2"; + editedCabalFile = "1q5lal77sgxwcwbabw5rqwlrx84xv1c24zs2ry2gz57ccdr6n9qm"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix @@ -174131,10 +174765,8 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "1.0.2.2"; - sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7"; - revision = "1"; - editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f"; + version = "1.0.3.0"; + sha256 = "1lvwfrirf6gq6nr6ias0i0xynq62s9myrj4203wdwq0y4c40nhqc"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -174144,6 +174776,13 @@ self: { io-streams-haproxy lifted-base mtl network old-locale openssl-streams snap-core text time unix unix-compat vector ]; + executableHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers directory HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time transformers unix unix-compat + vector + ]; testHaskellDepends = [ attoparsec base base16-bytestring blaze-builder bytestring bytestring-builder case-insensitive clock containers deepseq @@ -174160,7 +174799,6 @@ self: { homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -174183,7 +174821,6 @@ 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 @@ -174219,6 +174856,7 @@ self: { pname = "snap-utils"; version = "0.1.2"; sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring heist http-types MonadCatchIO-transformers mtl snap snap-core text xmlhtml @@ -174273,6 +174911,7 @@ self: { pname = "snaplet-actionlog"; version = "0.2.0.1"; sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors digestive-functors-heist digestive-functors-snap errors heist @@ -174294,6 +174933,7 @@ self: { pname = "snaplet-amqp"; version = "1.1.0.0"; sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ amqp base bytestring configurator lens monad-control mtl network resource-pool snap transformers @@ -174333,6 +174973,7 @@ self: { pname = "snaplet-coffee"; version = "0.1.0.2"; sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring configurator directory filepath haskell-coffee mtl snap snap-core @@ -174388,6 +175029,7 @@ self: { sha256 = "01s2mj5vml5k9q0x291snhzhdpilb37ksvhavxjf0fz0j3na7acp"; revision = "1"; editedCabalFile = "06c6psa499aiz4nqwps1q6nw6imgkbcn0vird2b20kzi79lj7wsq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -174423,6 +175065,7 @@ self: { pname = "snaplet-hasql"; version = "1.0.2"; sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring clientsession configurator hasql hasql-backend lens mtl snap text time @@ -174480,6 +175123,7 @@ self: { pname = "snaplet-hslogger"; version = "1.0.0.2"; sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base configurator hslogger mtl snap transformers ]; @@ -174523,6 +175167,7 @@ self: { pname = "snaplet-influxdb"; version = "1.0.1.1"; sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring configurator http-client influxdb lens monad-control mtl network snap text transformers @@ -174558,6 +175203,7 @@ self: { pname = "snaplet-mandrill"; version = "0.1.0.3"; sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base configurator mandrill mtl network snap transformers ]; @@ -174613,6 +175259,7 @@ self: { pname = "snaplet-mysql-simple"; version = "0.2.2.0"; sha256 = "0n2hjchcr3hh7hb5cpz2ahsffsyhiavp3gizr19pjwslgmq484a3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator containers errors lens MonadCatchIO-transformers mtl mysql mysql-simple @@ -174662,6 +175309,7 @@ self: { pname = "snaplet-persistent"; version = "0.5"; sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator errors heist lens monad-logger MonadCatchIO-transformers mtl persistent @@ -174684,6 +175332,7 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.0.2.0"; sha256 = "1agykln1mr08bh5yp8xf5nhjirbvwc9kgl4k3rkl700hfjhdpbb7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator lens lifted-base monad-control mtl postgresql-simple resource-pool snap text @@ -174703,6 +175352,7 @@ self: { pname = "snaplet-postmark"; version = "0.2.0"; sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base configurator mtl postmark snap text transformers ]; @@ -174832,6 +175482,7 @@ self: { pname = "snaplet-sass"; version = "0.1.2.0"; sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring configurator directory filepath mtl process snap snap-core transformers @@ -174908,6 +175559,7 @@ self: { sha256 = "1mv0sfz2dqhl82wbsb11c5brw3jadh9sliinlj3xb5m7n42z84id"; revision = "1"; editedCabalFile = "0gj934nif3h3695ckwi457zjih2zfmbjsbsh884v3dp4qlfz6jcw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -174955,6 +175607,7 @@ self: { pname = "snaplet-stripe"; version = "0.3.0"; sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring configurator heist lens-family-core mtl snap stripe text text-format transformers xmlhtml @@ -175233,6 +175886,7 @@ self: { pname = "snow-white"; version = "2009.12.1"; sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring mps ]; homepage = "http://github.com/nfjinjing/snow-white"; description = "encode any binary instance to white space"; @@ -175327,6 +175981,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "snowtify" = callPackage + ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle + }: + mkDerivation { + pname = "snowtify"; + version = "0.1.0.3"; + sha256 = "1l3x90mpxima1j95msshp3wpw3fn1vka9b0nk4dmavxj1s8qd32q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base either safe safe-exceptions text turtle + ]; + homepage = "https://github.com/aiya000/hs-snowtify#README.md"; + description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; + license = stdenv.lib.licenses.mit; + }) {}; + "soap" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit @@ -175366,7 +176037,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -175418,23 +176088,6 @@ self: { }) {}; "socket" = callPackage - ({ mkDerivation, async, base, bytestring, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "socket"; - version = "0.7.0.0"; - sha256 = "0ql9y2jnm385jc5hgcjxnnxy0pwfckdrci3cx2a22y9dzrbd3nl4"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "socket_0_8_0_1" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -175449,7 +176102,6 @@ self: { homepage = "https://github.com/lpeterse/haskell-socket"; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -175470,15 +176122,14 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.7"; - sha256 = "02pg1w4xidjw1j10f8mdiiincg0h7qm39a1dpgk51s8icwm2vndv"; + version = "1.3.8"; + sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -175511,7 +176162,6 @@ self: { homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme"; description = "Unix domain sockets"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socketed" = callPackage @@ -175629,6 +176279,7 @@ self: { pname = "soegtk"; version = "0.12.1"; sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk old-time stm ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "GUI functions as used in the book \"The Haskell School of Expression\""; @@ -175676,7 +176327,6 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Swagger generation for Solga"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solr" = callPackage @@ -175766,6 +176416,7 @@ self: { pname = "sort-by-pinyin"; version = "2014.5.19"; sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ air air-extra air-th base bytestring containers text ]; @@ -175847,7 +176498,6 @@ self: { ]; description = "Approximate a song from other pieces of sound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sounddelay" = callPackage @@ -175876,6 +176526,7 @@ self: { sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring containers curl data-default directory filepath hack hack-contrib hack-handler-happstack haskell98 HDBC @@ -175938,8 +176589,8 @@ self: { }: mkDerivation { pname = "sox"; - version = "0.2.2.6"; - sha256 = "04pvz62r7dafiabvq18lmyl64s8n0lb7mb0l9mqpzg379phqdx6l"; + version = "0.2.2.7"; + sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame transformers unix utility-ht @@ -176106,10 +176757,11 @@ self: { }: mkDerivation { pname = "sparkle"; - version = "0.4.0.2"; - sha256 = "1bygwg1kadfhlphlsh8r05lxsdb5lzz3z37lny2zd00llmc4i33p"; + 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 @@ -176123,20 +176775,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sparkle_0_5_0_1" = callPackage - ({ mkDerivation, base, binary, bytestring, choice - , distributed-closure, filepath, jni, jvm, jvm-streaming, process - , regex-tdfa, singletons, streaming, text, vector, zip-archive + "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 + , vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.5.0.1"; - sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b"; + version = "0.6"; + sha256 = "11i0bk9yl8ba84xm2hfxlnspygfafdannafg42iqfg1q6f8h2y7w"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ - base binary bytestring choice distributed-closure jni jvm - jvm-streaming singletons streaming text vector + base binary bytestring choice distributed-closure inline-java jni + jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ base bytestring filepath process regex-tdfa text zip-archive @@ -176203,6 +176858,7 @@ self: { pname = "sparse-linear-algebra"; version = "0.2.9.7"; sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions mtl transformers vector vector-algorithms vector-space @@ -176263,6 +176919,7 @@ self: { pname = "spata"; version = "2010.10.10"; sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base dlist mps mtl ]; homepage = "http://github.com/nfjinjing/spata"; description = "brainless form validation"; @@ -176403,11 +177060,11 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.4"; - sha256 = "050ygn51z6bziv36j4y47j9rxq5wdcyrn1b2fppsv718d51bpbvw"; + version = "0.2.8"; + sha256 = "1xv3pciz0badd4wbijw8zmiwr656gjimv7lxccggm2q3nsqnq9gz"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; - testHaskellDepends = [ base cmdargs containers leancheck ]; - benchmarkHaskellDepends = [ 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; @@ -176466,6 +177123,7 @@ self: { sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base edit-distance phonetic-code sqlite ]; @@ -176771,7 +177429,6 @@ self: { homepage = "http://code.haskell.org/~thielema/split-record/"; description = "Split a big audio file into pieces at positions of silence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "split-tchan" = callPackage @@ -176907,8 +177564,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.4"; - sha256 = "1hj90bad6b1iiycwlpghxwmwxc1h14702pw4qpxvcp2n9sn2cjky"; + version = "0.1.3.5"; + sha256 = "1h5a2ifr10ihaqvl819d0g3vnn2wzp27wqlfbk21v8wv07wrwckk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176989,6 +177646,7 @@ self: { sha256 = "027vn7xqk7r15130hc6xikg2hyliqmg14y7n3wrrqaxvd4saa6qn"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers data-default docopt entropy http-conduit http-kit http-types @@ -177012,6 +177670,7 @@ self: { sha256 = "0jvkvk5yqp4gibg61q67iczaqvfszikxvvgf04fg6xs23gjkpihp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base blaze-html blaze-markup bytestring data-default-class directory docopt fast-logger filepath http-types @@ -177021,7 +177680,6 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage @@ -177035,8 +177693,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.95.0"; - sha256 = "16m0sqmp85p8zkpdh1pnzhja7j774cpfppwc5d6rq5palikwd88c"; + version = "1.96.0"; + sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177048,7 +177706,6 @@ self: { ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spsa" = callPackage @@ -177185,8 +177842,8 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.5.0"; - sha256 = "164a4bls6sqp8dmwn63dqa4dxyd7nd7fr7n2996bhrq7h4dk0ydv"; + version = "0.1.5.1"; + sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; homepage = "http://khibino.github.io/haskell-relational-record/"; @@ -177233,27 +177890,6 @@ self: { }) {inherit (pkgs) sqlite;}; "sqlite-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text - , time, transformers - }: - mkDerivation { - pname = "sqlite-simple"; - version = "0.4.13.0"; - sha256 = "1s7rf4bip9ki6l3581x7h7ndlj5j369yvxfakfshrj5rcz329car"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite text time transformers - ]; - testHaskellDepends = [ - base base16-bytestring bytestring direct-sqlite HUnit text time - ]; - homepage = "http://github.com/nurpax/sqlite-simple"; - description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sqlite-simple_0_4_14_0" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only , text, time, transformers @@ -177272,7 +177908,6 @@ self: { homepage = "http://github.com/nurpax/sqlite-simple"; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-errors" = callPackage @@ -177361,7 +177996,6 @@ self: { homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sr-extra" = callPackage @@ -177443,6 +178077,7 @@ self: { ]; description = "text UI for scanning with SANE"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sscgi" = callPackage @@ -177518,7 +178153,9 @@ self: { sha256 = "1zhhqam6y5ckh6i145mr0irm17dmlam2k730rpqiyw4mwgmcp4qa"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base iproute text ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit iproute QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text unix @@ -177559,6 +178196,7 @@ self: { sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers curl directory hdaemonize hslogger mtl process regex-compat stm unix @@ -177673,7 +178311,6 @@ self: { homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-memo" = callPackage @@ -177687,7 +178324,6 @@ 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 @@ -177728,6 +178364,7 @@ self: { sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6"; revision = "2"; editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -177745,49 +178382,80 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec + , megaparsec, mtl, template-haskell, text, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "1.1.1"; + sha256 = "1gjmv1yqm5hkgap60w1ci6ng1l7kfhmz97wdhnqawcm8q7lir1nx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec 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; + 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, either, errors, exceptions, extra + , deepseq, directory, echo, either, errors, exceptions, extra , fast-logger, file-embed, filelock, filepath, fsnotify - , generic-deriving, gitrev, hackage-security, hashable, hastache - , hit, hpack, hpc, hspec, http-client, http-client-tls + , 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, monad-control, monad-logger + , 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, 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 + , 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 }: mkDerivation { pname = "stack"; - version = "1.4.0"; - sha256 = "1dp8377a0wy8j7v9j3qb2lbic7y3p49glq8z7vd85rm0381ny3gi"; - revision = "4"; - editedCabalFile = "0hs3rlgbm088fjgi28h5fay3zl1s00ljnqhgd0xafcqk2asmqq0k"; + version = "1.5.1"; + sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x"; + revision = "1"; + editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6"; 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 either errors exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hit hpack hpc http-client - http-client-tls http-conduit http-types lifted-async lifted-base - memory microlens microlens-mtl 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 + 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 @@ -177800,12 +178468,13 @@ self: { path path-io split text transformers ]; testHaskellDepends = [ - attoparsec base bytestring Cabal conduit conduit-extra containers - cryptonite directory exceptions filepath hashable hspec + 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 QuickCheck - resourcet retry smallcheck store template-haskell temporary text - th-reify-many transformers unordered-containers vector yaml + 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 ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -177820,6 +178489,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "stack-bump" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, filepath + , Glob, hspec, lens, lens-aeson, optparse-applicative, process + , QuickCheck, strict, text, yaml + }: + mkDerivation { + pname = "stack-bump"; + version = "0.7.1.0"; + sha256 = "1la7v19zly3rnq0rwzv2h6hj9ibx0c0gdgvj4cc1pi893fyggkgz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base bytestring filepath Glob lens lens-aeson + optparse-applicative process strict text yaml + ]; + testHaskellDepends = [ + ansi-terminal async base bytestring filepath Glob hspec lens + lens-aeson optparse-applicative process QuickCheck strict text yaml + ]; + homepage = "https://github.com/yamadapc/stack-bump"; + description = "Dead simple version bumping for hpack packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib @@ -177863,7 +178557,6 @@ self: { homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run" = callPackage @@ -177945,6 +178638,7 @@ 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 @@ -178080,7 +178774,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 @@ -178132,25 +178825,6 @@ self: { }) {}; "stackage-query" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , optparse-applicative, process, stackage-types, text, yaml - }: - mkDerivation { - pname = "stackage-query"; - version = "0.1.0"; - sha256 = "0q9v8p53xfv96rhq1a3yz9f1nblp6zhx2bfbvkkl98jq50yh501j"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal containers directory filepath optparse-applicative - process stackage-types text yaml - ]; - homepage = "https://github.com/juhp/stackage-query"; - description = "Stackage package query"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stackage-query_0_1_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , optparse-applicative, process, stackage-types, text, yaml }: @@ -178167,7 +178841,6 @@ 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 @@ -178363,6 +179036,7 @@ self: { sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL random SDL @@ -178419,6 +179093,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "state-codes" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, shakespeare, text + }: + mkDerivation { + pname = "state-codes"; + version = "0.1.1"; + sha256 = "17vfgvwrhx7h9hy6x2w52h326h9ana2gfpgwgd1war0cbws07sna"; + libraryHaskellDepends = [ aeson base shakespeare text ]; + testHaskellDepends = [ aeson base hspec QuickCheck text ]; + homepage = "https://github.com/acamino/state-codes#README"; + description = "ISO 3166-2:US state codes and i18n names"; + license = stdenv.lib.licenses.mit; + }) {}; + "state-plus" = callPackage ({ mkDerivation, base, checkers, mtl, QuickCheck }: mkDerivation { @@ -178429,7 +179117,6 @@ self: { testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-record" = callPackage @@ -178451,8 +179138,8 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.8"; - sha256 = "1qn6rj13cn71bmradmy0frmlz1s925ssp233qnr53dshqfg21vfv"; + version = "0.2.8.2"; + sha256 = "1y8580n66hif4pp2b6gsqssafcqf1vysf63209i2rcjr0dsgnjgz"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; benchmarkHaskellDepends = [ @@ -178507,6 +179194,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; + revision = "1"; + editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -178798,8 +179487,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.0"; - sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797"; + version = "0.2.1.2"; + sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178810,12 +179499,12 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal filepath hspec QuickCheck semigroups text + base bytestring Cabal filepath hspec http-client http-client-tls + QuickCheck semigroups text ]; 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 @@ -178936,7 +179625,6 @@ 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 @@ -178951,6 +179639,7 @@ self: { homepage = "https://github.com/dimitri-xyz/stego-uuid#readme"; description = "Generator and verifier for steganographic numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stemmer" = callPackage @@ -178995,8 +179684,8 @@ self: { "stgi" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers - , deepseq, parsers, QuickCheck, semigroups, smallcheck, tasty - , tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun + , deepseq, doctest, parsers, QuickCheck, semigroups, smallcheck + , tasty, tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun , tasty-smallcheck, template-haskell, text, th-lift, transformers , trifecta }: @@ -179012,8 +179701,8 @@ self: { ]; executableHaskellDepends = [ ansi-terminal base semigroups text ]; testHaskellDepends = [ - ansi-wl-pprint base containers deepseq QuickCheck semigroups - smallcheck tasty tasty-html tasty-hunit tasty-quickcheck + ansi-wl-pprint base containers deepseq doctest QuickCheck + semigroups smallcheck tasty tasty-html tasty-hunit tasty-quickcheck tasty-rerun tasty-smallcheck template-haskell text ]; homepage = "https://github.com/quchen/stgi#readme"; @@ -179130,11 +179819,12 @@ self: { , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl , mtl-prelude, mwc-random, mwc-random-monad, placeholders , primitive, QuickCheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "stm-containers"; - version = "0.2.15"; - sha256 = "1q5jsrmvmqlw6xjh6gj94qz1l0a37iybcqx42v17a50kpsy86925"; + version = "0.2.16"; + sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139"; libraryHaskellDepends = [ base base-prelude focus hashable list-t primitive transformers ]; @@ -179146,7 +179836,7 @@ self: { benchmarkHaskellDepends = [ async base base-prelude containers criterion focus free hashable hashtables list-t loch-th mtl mtl-prelude mwc-random - mwc-random-monad placeholders text unordered-containers + mwc-random-monad placeholders text unordered-containers vector ]; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; @@ -179220,7 +179910,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-linkedlist" = callPackage @@ -179339,6 +180028,7 @@ self: { pname = "stmcontrol"; version = "0.1"; sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 mtl stm ]; homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html"; description = "Control communication among retrying transactions"; @@ -179526,8 +180216,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.12"; - sha256 = "19p8yz7amvf9sd3kgx2hhh6nifkbjxj43s6i1279qq1v46x9wznb"; + version = "0.2.12.1"; + sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck syb transformers unsafe utility-ht @@ -179535,7 +180225,9 @@ self: { testHaskellDepends = [ base bytestring QuickCheck random utility-ht ]; - benchmarkHaskellDepends = [ base deepseq sample-frame utility-ht ]; + benchmarkHaskellDepends = [ + base deepseq sample-frame unsafe utility-ht + ]; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; @@ -179554,7 +180246,9 @@ self: { }) {}; "storablevector-streamfusion" = callPackage - ({ mkDerivation, base, storablevector, stream-fusion, utility-ht }: + ({ mkDerivation, base, binary, bytestring, old-time, storablevector + , stream-fusion, utility-ht + }: mkDerivation { pname = "storablevector-streamfusion"; version = "0.0"; @@ -179564,65 +180258,15 @@ self: { libraryHaskellDepends = [ base storablevector stream-fusion utility-ht ]; + executableHaskellDepends = [ + base binary bytestring old-time stream-fusion + ]; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Conversion between storablevector and stream-fusion lists with fusion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "store_0_3_1" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bytestring, cereal, cereal-vector, conduit - , containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, streaming-commons, syb, template-haskell - , text, th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.3.1"; - sha256 = "146srr30sb1p1zbc2sz0m3zlrjakcm0gh5b32vjzcd3kmzmha47c"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant cryptohash deepseq directory filepath free - ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable network primitive resourcet safe - semigroups smallcheck store-core streaming-commons syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers contravariant criterion cryptohash - deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core streaming-commons syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector - vector-binary-instances void weigh - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant criterion cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core streaming-commons - syb template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "store" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit @@ -179673,24 +180317,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "store-core_0_3" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text - , transformers - }: - mkDerivation { - pname = "store-core"; - version = "0.3"; - sha256 = "11vha2c3vlv640s8anfmvvsvg81ldzx7swlqvf8hlcaacc5j74w7"; - libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -179734,14 +180360,18 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.4.3"; - sha256 = "0cwqni8n13jkk3m6blvppmx5lgnb91mc19xfa51xlpsfcdsfm101"; + 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 @@ -179751,6 +180381,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_8_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable + , hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.8.0"; + sha256 = "0wv4anpxf6fmhhyw38wb7s3jbbhyn9vvhs912kls786gxs8xdlg5"; + 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 hashable hspec hspec-discover + lens 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; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -179775,14 +180434,13 @@ self: { "stratux" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck , stratux-http, stratux-types, stratux-websockets, template-haskell - , text }: mkDerivation { pname = "stratux"; - version = "0.0.8"; - sha256 = "0awksbs58vvzf21747bcnhhf15px7nw99nnrd2kx220fa62fd9qh"; + version = "0.0.9"; + sha256 = "17jy7svf74k3r87p8xlp0hi9z95f5npmnn28jlwx4rb68dn63aly"; libraryHaskellDepends = [ - base stratux-http stratux-types stratux-websockets text + base stratux-http stratux-types stratux-websockets ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -179800,8 +180458,8 @@ self: { }: mkDerivation { pname = "stratux-http"; - version = "0.0.8"; - sha256 = "0p9wcp8rby3mdxy1xs4wfx9cyc1yx16x2r4k964brv9vh6h615y7"; + version = "0.0.9"; + sha256 = "121pansnd8pdhv9ki2qdav93cwldmnxnykjldhbkb2bkyr0skdyb"; libraryHaskellDepends = [ aeson base either HTTP network-uri stratux-types utf8-string ]; @@ -179821,8 +180479,8 @@ self: { }: mkDerivation { pname = "stratux-types"; - version = "0.0.8"; - sha256 = "1jf633w4pzhqmpmwpxiq49l0as85c6sj6wyvs3gjp0cik5g3m0q5"; + version = "0.0.9"; + sha256 = "06d4qagcmzch25zkxpnvw04h5aav5wbdrfyi6xvzvndj12hvayza"; libraryHaskellDepends = [ aeson base bytestring lens scientific text time ]; @@ -179842,8 +180500,8 @@ self: { }: mkDerivation { pname = "stratux-websockets"; - version = "0.0.8"; - sha256 = "1rq0v6hyjc3s28zkdssm1my8k4lwbpqv0hv119w5j5i51l8zhgj8"; + version = "0.0.9"; + sha256 = "0076n4i250frv71w9sysw935g5aq0py8shwaqrhjrv4jp6mb2k3q"; libraryHaskellDepends = [ aeson base either network stratux-types text transformers websockets @@ -180006,6 +180664,7 @@ self: { ]; description = "Cassava support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-commons" = callPackage @@ -180066,8 +180725,8 @@ self: { }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.0.0"; - sha256 = "1dnlnm57rlk900n148xnfihx917rc9lggx6fdzhf7cjbi1n2ibn2"; + version = "0.3.0.1"; + sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -180115,7 +180774,6 @@ self: { ]; description = "Translate pull-based stream folds into push-based iteratees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -180134,6 +180792,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "streaming-osm" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, streaming, streaming-bytestring, streaming-utils + , tasty, tasty-hunit, text, transformers, vector, zlib + }: + mkDerivation { + pname = "streaming-osm"; + version = "1.0.0"; + sha256 = "1z1wpwmsgc4viy0w3zcmf5d88nylyynb359r1p2naajg65kbb46h"; + libraryHaskellDepends = [ + attoparsec base bytestring containers streaming + streaming-bytestring streaming-utils text transformers vector zlib + ]; + testHaskellDepends = [ + attoparsec base bytestring streaming tasty tasty-hunit vector zlib + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion streaming vector zlib + ]; + description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-png" = callPackage ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels , mmorph, mtl, resourcet, streaming, streaming-bytestring @@ -180162,8 +180843,8 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.0"; - sha256 = "15aiddyi5rykg1m47a0y725yfxv1jyl9n07x5fbp3jgk3j75h01f"; + version = "0.2.0.1"; + sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -180190,7 +180871,6 @@ 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 @@ -180212,14 +180892,14 @@ self: { "streaming-with" = callPackage ({ mkDerivation, base, exceptions, managed, streaming-bytestring - , transformers + , temporary, transformers }: mkDerivation { pname = "streaming-with"; - version = "0.1.0.0"; - sha256 = "1gc8y3ak3w411yibzrbf9wa719zr0zym6pqmg3ihrdn03z1ij3h0"; + version = "0.2.0.0"; + sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp"; libraryHaskellDepends = [ - base exceptions managed streaming-bytestring transformers + base exceptions managed streaming-bytestring temporary transformers ]; description = "with/bracket-style idioms for use with streaming"; license = stdenv.lib.licenses.mit; @@ -180274,6 +180954,7 @@ self: { homepage = "https://github.com/nikita-volkov/strelka"; description = "A simple, flexible and composable web-router"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strelka-core" = callPackage @@ -180370,14 +181051,27 @@ self: { }) {}; "strict-data" = callPackage - ({ mkDerivation, aeson, base, deepseq }: + ({ mkDerivation, aeson, base, containers, deepseq, doctest + , exceptions, fail, hashable, HTF, monad-control, mtl, pretty + , QuickCheck, resourcet, strict, text, transformers + , transformers-base, unordered-containers, util-plus, vector + , vector-algorithms + }: mkDerivation { pname = "strict-data"; - version = "0.1.1.0"; - sha256 = "1by3icfp0b0im2g87rmaclh7iwwwz564gl3x6yyn840rgc9k4xnr"; - libraryHaskellDepends = [ aeson base deepseq ]; + version = "0.2.0.2"; + sha256 = "1xr1qd707grip4kan9d2nh5flqc61m2m3z8kf4wzgdd3m42zdg7q"; + libraryHaskellDepends = [ + aeson base containers deepseq exceptions fail hashable + monad-control mtl pretty QuickCheck resourcet strict text + transformers transformers-base unordered-containers util-plus + vector vector-algorithms + ]; + testHaskellDepends = [ + base containers deepseq doctest hashable HTF vector + ]; homepage = "https://github.com/agrafix/strict-data#readme"; - description = "Verious useful strict data structures"; + description = "A collection of commonly used strict data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180405,7 +181099,6 @@ self: { homepage = "https://github.com/cartazio/strict-identity"; description = "Strict Identity Monad, handy for writing fast code!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-io" = callPackage @@ -180417,7 +181110,6 @@ self: { libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-writer" = callPackage @@ -180549,6 +181241,7 @@ self: { pname = "string-qq"; version = "0.0.2"; sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.publicDomain; @@ -180560,6 +181253,7 @@ self: { pname = "string-quote"; version = "0.0.1"; sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -180754,8 +181448,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.1"; - sha256 = "0vbc6ddp15yh7ddz9rrr7cmdqb9b5xzl4lh2h2sqf7wy8yldd58w"; + version = "2.2.2"; + sha256 = "1w2f5ynilzdzszga468lcy4fzl8cm2i9mcvb7hzzpg2gjykbi55s"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -180769,8 +181463,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.1"; - sha256 = "1gyhms7vhmqj9fjs8lfa022r9h43c5m0y5cz5xfbx3v71id9kq5a"; + version = "2.2.2"; + sha256 = "08jksi6swwb15sib5y5ms0m4k6m24v7xg4zany34x2zbas30qlp4"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -180784,8 +181478,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.1"; - sha256 = "0qk6jys2ijg9fy22rhg58ahj4c3mzfcjmpk7rfh09q3y2vrg1rsx"; + version = "2.2.2"; + sha256 = "1s6rj46m2pmcvagwm02z2qf4z4b44y14kjdi397b6s4cva7sdf84"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -180806,8 +181500,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.1"; - sha256 = "1sg3gixaar1lcipdyzlcgcnfsc9vdip49zpfzh7a6pcw242vcw71"; + version = "2.2.2"; + sha256 = "1jccj0ic1v1vpdp3s8vb0a5w2rzr1zcqm6xqkjf1012ljxkvdq3f"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -180839,8 +181533,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "3.0.3"; - sha256 = "0g98wsc1afjjlw0sjhnsjd4xv8akid1xr4gc16jcdy9wfv32rb4m"; + version = "3.0.4"; + sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -180869,8 +181563,8 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1"; - sha256 = "0haghcp365rfmh53hpkv4xydc2yfyai45r053q60lspd7gj202hz"; + version = "0.1.1"; + sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -180930,6 +181624,7 @@ self: { sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base descriptive ghc-prim haskell-src-exts text ]; @@ -180962,9 +181657,9 @@ self: { ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, free, ghc , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st - , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty - , tasty-quickcheck, tasty-th, transformers, unordered-containers - , vector, vector-algorithms + , MonadRandom, mwc-random, parallel, primitive, QuickCheck + , semigroups, tasty, tasty-quickcheck, tasty-th, transformers + , unordered-containers, vector, vector-algorithms }: mkDerivation { pname = "structures"; @@ -180981,7 +181676,7 @@ self: { unordered-containers ]; benchmarkHaskellDepends = [ - array base containers criterion deepseq MonadRandom + array base containers criterion deepseq MonadRandom mwc-random unordered-containers vector ]; homepage = "http://github.com/ekmett/structures"; @@ -181040,6 +181735,7 @@ self: { sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base binary bullet bytestring containers directory elerea GLFW-b lambdacube-bullet lambdacube-engine mtl random vector @@ -181079,35 +181775,6 @@ self: { }) {}; "stylish-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.7.1.0"; - sha256 = "1g011ip26yn9ixsa5bzb8gnjj58www2p0d8b7fj9b2brwqx682jp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory 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; - }) {}; - - "stylish-haskell_0_8_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml @@ -181118,6 +181785,7 @@ self: { sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath haskell-src-exts mtl syb yaml @@ -181134,7 +181802,6 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylized" = callPackage @@ -181166,7 +181833,6 @@ self: { ]; description = "A generator of nix files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sub-state" = callPackage @@ -181391,13 +182057,13 @@ self: { }) {}; "sum-type-boilerplate" = callPackage - ({ mkDerivation, base, hlint, hspec, HUnit, template-haskell }: + ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { pname = "sum-type-boilerplate"; - version = "0.1.0"; - sha256 = "1nibnrnj35sdi6jywjlg5f41138a22q2vg7hn0vqczynzswjb5y8"; + version = "0.1.1"; + sha256 = "17xby0mqdsbax0afrfr3p8c6cj5r94byy8gprgyrmq84qqadls9i"; libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base hlint hspec HUnit template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme"; description = "Library for reducing the boilerplate involved with sum types"; license = stdenv.lib.licenses.mit; @@ -181480,6 +182146,7 @@ self: { sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base Boolean containers data-default directory filepath parallel-io process QuickCheck random semigroups shake stm sunroof-compiler @@ -181558,24 +182225,6 @@ self: { }) {}; "superbuffer" = callPackage - ({ mkDerivation, async, base, buffer-builder, bytestring, criterion - , HTF, QuickCheck - }: - mkDerivation { - pname = "superbuffer"; - version = "0.2.0.1"; - sha256 = "0rhinl9gr80rjbjylzc42d2vnisvkb9lh4ns50nl2qcnfbns1lnf"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring HTF QuickCheck ]; - benchmarkHaskellDepends = [ - async base buffer-builder bytestring criterion - ]; - homepage = "https://github.com/agrafix/superbuffer#readme"; - description = "Efficiently build a bytestring from smaller chunks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "superbuffer_0_3_1_1" = callPackage ({ mkDerivation, async, base, buffer-builder, bytestring, criterion , HTF, QuickCheck }: @@ -181591,7 +182240,6 @@ 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 @@ -181652,6 +182300,7 @@ self: { homepage = "http://github.com/ryantrinkle/superconstraints"; description = "Access an instance's constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "superdoc" = callPackage @@ -181685,7 +182334,6 @@ self: { ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -181714,8 +182362,8 @@ self: { }: mkDerivation { pname = "superrecord"; - version = "0.2.0.0"; - sha256 = "0gjmh3mk5pkfqmq145h8zy9hc0vb18prhjqzv948qmihb1ixdaci"; + version = "0.3.0.0"; + sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5"; libraryHaskellDepends = [ aeson base constraints deepseq ghc-prim mtl text ]; @@ -181790,6 +182438,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "svg-builder-fork" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "svg-builder-fork"; + version = "0.1.0.3"; + sha256 = "16y8azlayb5925aybm2780aqbq4qhqpv9c96k22h3ci7ybb9zk92"; + libraryHaskellDepends = [ + base blaze-builder bytestring hashable text unordered-containers + ]; + homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git"; + description = "DSL for building SVG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-tree" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers @@ -181797,8 +182461,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6.1"; - sha256 = "0lap0il6bfdlv3yv71xh8sczg9jmfkbx25vbw5sjcgkxamaqrxcv"; + version = "0.6.2"; + sha256 = "1vrrjdid864s86dqs9a37s8jw7a4pb3ghfxii45dd9phwnd5vr1b"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -181834,6 +182498,7 @@ self: { pname = "svgcairo"; version = "0.13.1.1"; sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; @@ -181934,23 +182599,21 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , 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 + , 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.4"; - sha256 = "0i3zchbshk8h0b6yip4p9lyz6abb4akv5n6lr3qsndz5pbxfibc5"; - revision = "1"; - editedCabalFile = "1sfabkac6a37frrzcmz6w0whszz39xpc3g0r8v2ihv0irswvfp2n"; + version = "2.1.4.1"; + sha256 = "0b4c9m6yvhj2z7krf7r3a4xmbnyiifhcc4ahl5xfkb2wh6g6nfi3"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable http-media insert-ordered-containers lens mtl network scientific @@ -181965,7 +182628,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "swapper" = callPackage @@ -182045,10 +182707,11 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.8"; - sha256 = "1jilcrb1r94kvlwwrj59y72qmvnvnwi1cbk5i5xafw5h4y5qx3s9"; + version = "0.9.1.10"; + sha256 = "10nx8vx6vprsdchqd726vx3cfzxy0jkz9ylw4p2mkcam9s72dd7c"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable intern mtl network-uri old-locale polyparse semigroups text time @@ -182061,7 +182724,6 @@ self: { homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -182102,21 +182764,6 @@ self: { }) {}; "syb" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl }: - mkDerivation { - pname = "syb"; - version = "0.6"; - sha256 = "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3"; - revision = "1"; - editedCabalFile = "158ngdnlq9n1mil7cq2bzy4zkgx73zzms9q56wp6ll93m5mc4nlx"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers HUnit mtl ]; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "syb_0_7" = callPackage ({ mkDerivation, base, containers, HUnit, mtl }: mkDerivation { pname = "syb"; @@ -182127,7 +182774,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syb-extras" = callPackage @@ -182253,8 +182899,8 @@ self: { }: mkDerivation { pname = "symantic"; - version = "6.3.0.20170703"; - sha256 = "14r9jdn7pgcajdjgzgxkcn2p394wljlhfsmy6ajp9i18crhinj9y"; + version = "6.3.0.20170807"; + sha256 = "1w2yyy35w9k3p53x9a51hn5cfja74i6g62jcw2l1bq5cgaakfjgn"; libraryHaskellDepends = [ base containers mono-traversable symantic-document symantic-grammar text transformers @@ -182280,8 +182926,8 @@ self: { }: mkDerivation { pname = "symantic-grammar"; - version = "0.1.0.20170703"; - sha256 = "09anbgpkh3l8mgzz0nwl65054az0026wl65vi7qmy79ncl2823yd"; + version = "0.2.0.20170709"; + sha256 = "0vr0j7v2l9sfw8fcfdrhdcb9imgzklmm7p8n6jh9vlshl2d9piwy"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base megaparsec tasty tasty-hunit text transformers @@ -182309,6 +182955,7 @@ self: { ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symbol" = callPackage @@ -182339,6 +182986,7 @@ self: { homepage = "http://github.com/symengine/symengine.hs#readme"; description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; "symengine-hs" = callPackage @@ -182514,7 +183162,6 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntactical" = callPackage @@ -182664,11 +183311,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syntaxnet-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , data-default, haskell-conll, hspec, lens, protolude, safe, split + , text, text-format, vector + }: + mkDerivation { + pname = "syntaxnet-haskell"; + version = "0.1.1.0"; + sha256 = "0lcgn91kbsjkpnbw7fczqsjmzvhrx5fixhgzjzmjaiwndw09b5z5"; + libraryHaskellDepends = [ + aeson base bytestring cassava containers data-default haskell-conll + lens protolude safe split text text-format vector + ]; + testHaskellDepends = [ aeson base cassava haskell-conll hspec ]; + homepage = "https://github.com/mgajda/syntaxnet-haskell#readme"; + description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "synthesizer" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , event-list, filepath, gnuplot, non-negative, numeric-prelude - , numeric-quest, process, QuickCheck, random, sox, storable-record - , storablevector, transformers, utility-ht + , directory, event-list, filepath, gnuplot, non-negative + , numeric-prelude, numeric-quest, old-time, process, QuickCheck + , random, sox, storable-record, storablevector, transformers + , utility-ht }: mkDerivation { pname = "synthesizer"; @@ -182681,6 +183349,7 @@ self: { non-negative numeric-prelude numeric-quest process QuickCheck random sox storable-record storablevector transformers utility-ht ]; + executableHaskellDepends = [ directory old-time ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell"; license = "GPL"; @@ -182708,7 +183377,6 @@ 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 @@ -182721,8 +183389,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.1"; - sha256 = "1lhsg33xw1xb3smhr67gxdl6ap1azshyxqvy0p288p9i70hxqa79"; + 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 @@ -182741,7 +183409,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 @@ -182763,7 +183430,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with static physical dimensions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-filter" = callPackage @@ -182859,7 +183525,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 @@ -182894,7 +183559,6 @@ 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 @@ -182959,6 +183623,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "system-extra" = callPackage + ({ mkDerivation, base, bytestring, directory, hspec, process + , QuickCheck + }: + mkDerivation { + pname = "system-extra"; + version = "0.1.0"; + sha256 = "0x4xikvlj61r0sl8b98nccijkp99jalz0qkc6z5l48p81bj3qrl1"; + libraryHaskellDepends = [ base bytestring directory process ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A bunch of system utilities used by other projects"; + license = stdenv.lib.licenses.mit; + }) {}; + "system-fileio" = callPackage ({ mkDerivation, base, bytestring, chell, system-filepath , temporary, text, time, transformers, unix @@ -183009,17 +183687,16 @@ self: { }) {}; "system-info" = callPackage - ({ mkDerivation, base, process, regex }: + ({ mkDerivation, base, process, regex, regex-with-pcre }: mkDerivation { pname = "system-info"; - version = "0.1.0.7"; - sha256 = "0nj490pjlzvsjnxpfkg63x7makhh0y6difqm9iysrqf37qnir5zx"; - libraryHaskellDepends = [ base process regex ]; + version = "0.1.0.8"; + sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516"; + libraryHaskellDepends = [ base process regex regex-with-pcre ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; description = "Get information about CPUs, memory, etc"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-inotify" = callPackage @@ -183059,15 +183736,15 @@ self: { }) {}; "system-linux-proc" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, errors - , hedgehog, text + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, errors, hedgehog, text }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.0.0"; - sha256 = "0ij75jdkb7nan98yk6i1dznwqvw20x23krgasix33scf1yyk30ps"; + version = "0.1.0.3"; + sha256 = "0gljgsbyzya0grh0m13sld6v2cj7g9j5jcgh6yxff2mmqfcf3z7p"; libraryHaskellDepends = [ - attoparsec base bytestring containers errors text + attoparsec base bytestring containers directory errors text ]; testHaskellDepends = [ base hedgehog ]; homepage = "https://github.com/erikd/system-linux-proc"; @@ -183198,6 +183875,10 @@ self: { template-haskell ]; librarySystemDepends = [ libossp_uuid ]; + executableHaskellDepends = [ + base binary bytestring containers murmur-hash parsec + template-haskell + ]; executableSystemDepends = [ libossp_uuid ]; homepage = "http://github.com/solidsnack/system-uuid/"; description = "Bindings to system UUID functions"; @@ -183455,6 +184136,7 @@ self: { pname = "tablestorage"; version = "0.2.1.0"; sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring conduit crypto-api cryptohash HTTP http-conduit http-types mtl network old-locale resourcet SHA @@ -183530,6 +184212,7 @@ self: { sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers dbus dyre enclosed-exceptions filepath gtk gtk-traymanager HStringTemplate HTTP mtl network network-uri @@ -183587,10 +184270,12 @@ self: { sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor explicit-exception non-empty transformers utility-ht xml-basic ]; + executableHaskellDepends = [ base xml-basic ]; testHaskellDepends = [ base xml-basic ]; benchmarkHaskellDepends = [ base bytestring containers data-accessor explicit-exception @@ -183620,12 +184305,14 @@ self: { }) {}; "tagged-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, pureMD5 }: + ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }: mkDerivation { pname = "tagged-binary"; - version = "0.2.0.0"; - sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm"; - libraryHaskellDepends = [ base binary bytestring pureMD5 ]; + version = "0.2.0.1"; + sha256 = "0nv41x5ijw5wdb2nyfgxyspbgmk9qisp32fs1izzp3c3jl4smkvj"; + libraryHaskellDepends = [ + base base-compat binary bytestring pureMD5 + ]; description = "Provides tools for serializing data tagged with type information"; license = stdenv.lib.licenses.mit; }) {}; @@ -183749,6 +184436,7 @@ self: { editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup text unordered-containers vector @@ -183764,6 +184452,7 @@ 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 @@ -183783,6 +184472,7 @@ 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 @@ -183969,6 +184659,7 @@ self: { pname = "tai64"; version = "0.2.0"; sha256 = "0pk8qfla4iv8yryfxpz5nf2ijhdg7svbcikg3pik2psir6igj3sw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base16-bytestring binary bytestring QuickCheck text time vector @@ -183999,7 +184690,6 @@ self: { ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tak" = callPackage @@ -184047,13 +184737,16 @@ self: { pname = "takahashi"; version = "0.2.2.0"; sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base lens monad-skeleton mtl ]; description = "create slide for presentation"; license = stdenv.lib.licenses.mit; }) {}; "takusen-oracle" = callPackage - ({ mkDerivation, base, clntsh, mtl, old-time, time }: + ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random + , time + }: mkDerivation { pname = "takusen-oracle"; version = "0.9.4.1"; @@ -184062,6 +184755,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; + executableHaskellDepends = [ + base mtl old-time QuickCheck random time + ]; homepage = "https://github.com/paulrzcz/takusen-oracle.git"; description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; @@ -184100,6 +184796,7 @@ self: { sha256 = "1x2d3vlwwssdj0jhnvrm1h0qaajxyns25b9azhf9k8q8xqxi7r32"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson array base binary blaze-builder blaze-html bytestring cmdargs conduit containers deepseq derive directory dlist fclabels filepath @@ -184370,40 +185067,22 @@ self: { "tasty" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays + , unbounded-delays, unix }: mkDerivation { pname = "tasty"; - version = "0.11.2.1"; - sha256 = "1fg2bk9x6jhksxcm4761ynmxgsx9clzg8xdykgzj1azjmk4dymk9"; + version = "0.11.2.5"; + sha256 = "09qg2ssack4y3vy5dppjpprvg7gss970a0nfv0rq2m87gw5r3i1h"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays + optparse-applicative regex-tdfa stm tagged unbounded-delays unix ]; - homepage = "http://documentup.com/feuerbach/tasty"; + homepage = "https://github.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.0.5"; - sha256 = "0djlj91bnhqq83hbm57ljwixf5zhqk94kb1kgmdh5i74rh7l8bb4"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -184419,32 +185098,9 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage - ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec - , tasty-hunit, tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-auto"; - version = "0.1.0.2"; - sha256 = "070s73vcb68lbw5yb5225zvmsskmscl2jq5la0xsiqfch2vpcq6p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath tasty tasty-hspec tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/minad/tasty-auto#readme"; - description = "Auto discovery for Tasty with support for ingredients and test tree generation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tasty-auto_0_2_0_0" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck }: @@ -184467,18 +185123,6 @@ self: { }) {}; "tasty-dejafu" = callPackage - ({ mkDerivation, base, dejafu, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "0.3.0.2"; - sha256 = "0p9gpsfm2xsbm63w2bb9yws26lqcyj0w87l76vh67ivnmnxjw78z"; - libraryHaskellDepends = [ base dejafu tagged tasty ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-dejafu_0_6_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -184488,32 +185132,22 @@ self: { homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; + }) {}; + + "tasty-dejafu_0_7_0_0" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.7.0.0"; + sha256 = "0713gck8zdcd303zaq52g0ca9x28arwj9n1brfyzqscac95bcccc"; + 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 = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec - , tasty-hunit, tasty-quickcheck, tasty-th - }: - mkDerivation { - pname = "tasty-discover"; - version = "1.1.0"; - sha256 = "1id3m1f67paxb4adab5w1ksifaldn1khc0y8svyrdd84khjnhd82"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory filepath tasty tasty-hspec tasty-hunit - tasty-quickcheck tasty-th - ]; - executableHaskellDepends = [ base directory filepath tasty-th ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/lwm/tasty-discover/"; - description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tasty-discover_3_0_2" = callPackage ({ mkDerivation, base, containers, directory, filepath, tasty , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck }: @@ -184532,7 +185166,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 @@ -184564,7 +185197,6 @@ self: { homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme"; description = "Adds the ability to fail a tasty test suite on first test failure"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-golden" = callPackage @@ -184632,6 +185264,7 @@ self: { pname = "tasty-html"; version = "0.4.1.1"; sha256 = "06hzb4y98aqmcn3zl6mr1gwmkkl73phqc4419fwsxwqyrygirshf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html bytestring containers filepath generic-deriving mtl stm tagged tasty text transformers @@ -184823,8 +185456,8 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.6"; - sha256 = "0ycxg7whabgcxyzy6gr536x8ykzx45whh1wrbsc7c58zi862fczd"; + version = "1.1.7"; + sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -184876,8 +185509,8 @@ self: { }: mkDerivation { pname = "tasty-stats"; - version = "0.2.0.2"; - sha256 = "19f6ipaq0vkamg7c38jh4jy12migfichq1455n065kipisq1v1zn"; + version = "0.2.0.3"; + sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -184901,7 +185534,6 @@ self: { homepage = "https://github.com/michaelxavier/tasty-tap"; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-th" = callPackage @@ -185017,6 +185649,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tcod-haskell" = callPackage + ({ mkDerivation, base, bytestring, containers, inline-c, repa, sdl2 + , tcod, vector + }: + mkDerivation { + pname = "tcod-haskell"; + version = "0.2.0.0"; + sha256 = "131qdd7h2890as35lfb3kx37j3vrz33ajxp5n4cl65rdrdk5vfxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c repa sdl2 vector + ]; + librarySystemDepends = [ tcod ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ncrashed/tcod-haskell#readme"; + description = "Bindings to libtcod roguelike engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {tcod = null;}; + "tconfig" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -185051,6 +185704,7 @@ self: { 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 @@ -185062,18 +185716,18 @@ self: { homepage = "https://github.com/winterland1989/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tcp-streams_1_0_0_0" = callPackage + "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 }: mkDerivation { pname = "tcp-streams"; - version = "1.0.0.0"; - sha256 = "1f00r9650pb90zkk7mv12i9s8gapwn00krb9b6zl3wcqm4gjaizb"; + version = "1.0.1.0"; + sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class io-streams network pem tls x509 x509-store x509-system @@ -185113,15 +185767,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tcp-streams-openssl_1_0_0_0" = callPackage + "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 }: mkDerivation { pname = "tcp-streams-openssl"; - version = "1.0.0.0"; - sha256 = "0irgybnlzi3a34252s3y3j2y8qddpisk1vadw271mmhzmifdx7bp"; + version = "1.0.1.0"; + sha256 = "1zka2hmx0659f6w9xnh13i53pfwhky833ifwm63sr3rlly5miry3"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network tcp-streams @@ -185173,8 +185827,8 @@ self: { pname = "tdigest"; version = "0.1"; sha256 = "0jy57m7acda4sk0hkkcxbkb274bc6i39hmq8l79wwmk5pspb6dh0"; - revision = "1"; - editedCabalFile = "0xp8csvp7vqgzz677qgw1vlkhqhvnvjhyf75m4dizgzh3mw8jmqp"; + revision = "2"; + editedCabalFile = "0g54mzya141wllmsv977san1qz08lz2z36znkv6cqxh8z4vyfwdk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids semigroups @@ -185218,15 +185872,14 @@ self: { }: mkDerivation { pname = "tdoc"; - version = "0.4.6"; - sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48"; + version = "0.4.7"; + sha256 = "06f9cbl123g0k9xqmy73l3x468ni120faj9slc806ncwalhjn67s"; libraryHaskellDepends = [ base bytestring template-haskell transformers xhtml ]; homepage = "https://github.com/np/tdoc"; description = "TDoc is a typed document builder with support for (X)HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teams" = callPackage @@ -185273,7 +185926,6 @@ self: { homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "telegram" = callPackage @@ -185303,6 +185955,7 @@ self: { pname = "telegram-api"; version = "0.6.3.0"; sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -185454,12 +186107,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "template-haskell_2_11_1_0" = callPackage + "template-haskell_2_12_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.11.1.0"; - sha256 = "171ngdd93i9prp9d5a4ix0alp30ahw2dvdk7i8in9mzscnv41csz"; + version = "2.12.0.0"; + sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -185698,8 +186351,8 @@ self: { }: mkDerivation { pname = "temporary"; - version = "1.2.1"; - sha256 = "1y54fx183sfmpd3xj94c74z9v42y1d7ski3jqrfrd7pnbh38ikwy"; + version = "1.2.1.1"; + sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm"; libraryHaskellDepends = [ base directory exceptions filepath transformers unix ]; @@ -185757,6 +186410,7 @@ self: { sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base directory executable-path filepath haskeline mtl uniplate utf8-string @@ -186059,7 +186713,6 @@ self: { homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terminal-size" = callPackage @@ -186177,6 +186830,7 @@ self: { sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers mtl process syb transformers ]; @@ -186193,8 +186847,8 @@ self: { }: mkDerivation { pname = "test-fixture"; - version = "0.5.0.1"; - sha256 = "0gnvz4paxr2wamdp01fnflhifbmsgxpmhg6l3a8nqmi32wgrwy6m"; + version = "0.5.0.2"; + sha256 = "1k4skkwswwh60cwcqai5j4k7x8ma24dqc9mnh5ia0yw8dam5vinz"; libraryHaskellDepends = [ base data-default-class haskell-src-exts haskell-src-meta mtl template-haskell th-orphans @@ -186478,7 +187132,6 @@ self: { homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-sandbox-compose" = callPackage @@ -186540,7 +187193,6 @@ self: { homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "QuickCheck convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-shouldbe" = callPackage @@ -186572,7 +187224,6 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -186590,20 +187241,28 @@ self: { }) {}; "testbench" = callPackage - ({ mkDerivation, base, boxes, criterion, deepseq, HUnit, statistics - , transformers + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , deepseq, dlist, HUnit, optparse-applicative, process, resourcet + , statistics, streaming, streaming-bytestring, streaming-cassava + , temporary, transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.1.0.0"; - sha256 = "10rydywa6d6adfzckafhiwwh1r84pzh60icrmv9h66kfzw328nb6"; + version = "0.2.1.0"; + sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boxes criterion deepseq HUnit statistics transformers + base bytestring cassava criterion deepseq dlist HUnit + optparse-applicative process resourcet statistics streaming + streaming-bytestring streaming-cassava temporary transformers weigh + ]; + executableHaskellDepends = [ + base bytestring containers criterion HUnit ]; description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testing-feat" = callPackage @@ -186677,6 +187336,7 @@ self: { sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base filepath gtk ]; homepage = "http://code.haskell.org/~dons/code/testpattern"; description = "Display a monitor test pattern"; @@ -186707,6 +187367,7 @@ self: { sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base GLUT random ]; homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris"; description = "A 2-D clone of Tetris"; @@ -186731,31 +187392,8 @@ self: { "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.9.4"; - sha256 = "1591d0z2f8anql4sxh3566gyfmfyvvf83sg21ss9yrq8jw35srns"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_9_4_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml }: mkDerivation { pname = "texmath"; @@ -186766,6 +187404,7 @@ self: { libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; + executableHaskellDepends = [ network-uri ]; testHaskellDepends = [ base bytestring directory filepath process split temporary text utf8-string xml @@ -186773,7 +187412,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -186794,34 +187432,9 @@ self: { ]; description = "Functions for running Tex from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text" = 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.2.1"; - sha256 = "0nrrzx0ws7pv4dx9jbc6jm2734al1cr0m6iwcnbck4v2yfyv3p8s"; - 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/bos/text"; - description = "An efficient packed Unicode text type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text_1_2_2_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , directory, ghc-prim, HUnit, integer-gmp, QuickCheck , quickcheck-unicode, random, test-framework, test-framework-hunit @@ -186843,33 +187456,21 @@ self: { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-all" = callPackage - ({ mkDerivation, base, text, text-format, text-show }: + ({ mkDerivation, base, bytestring, text, text-format, utf8-string + }: mkDerivation { pname = "text-all"; - version = "0.3.1.0"; - sha256 = "11326d2il1qv7l1cnyy6n93ik37aah4j1ajwyqyjdz9h3jvbziyy"; - libraryHaskellDepends = [ base text text-format text-show ]; + version = "0.4.1.1"; + sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w"; + libraryHaskellDepends = [ + base bytestring text text-format utf8-string + ]; homepage = "http://github.com/aelve/text-all"; description = "Everything Data.Text related in one package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-all_0_4_0_0" = callPackage - ({ mkDerivation, base, text, text-format }: - mkDerivation { - pname = "text-all"; - version = "0.4.0.0"; - sha256 = "0imy2q8dg1w3j0w8s0cc80fmjin99x2y7p41hdfwmaj5j1d5k6jb"; - libraryHaskellDepends = [ base text text-format ]; - homepage = "http://github.com/aelve/text-all"; - description = "Everything Data.Text related in one package"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-and-plots" = callPackage @@ -186922,7 +187523,6 @@ self: { homepage = "https://github.com/nikita-volkov/text-builder"; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-conversions" = callPackage @@ -187039,6 +187639,7 @@ self: { pname = "text-icu-normalized"; version = "0.4.1"; sha256 = "0nwma8yvfkmy0zzl3kb9xwmpp3z74aj33mdp7kr036baqvxini04"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-unicode-symbols bytestring lens text text-icu ]; @@ -187148,15 +187749,14 @@ self: { }: mkDerivation { pname = "text-lips"; - version = "0.1"; - sha256 = "0cwrbl8d2dpiz9q8vvrl04vpdiiw4gx0cv1rmlk4zryn3ja38y8n"; + version = "0.1.0.1"; + sha256 = "1sm7sy11yc2rfjrpq5in7fqv3gh7zcfli8vw4b2mdlh6nxrh7k89"; libraryHaskellDepends = [ base containers parsers text text-loc transformers ]; homepage = "https://github.com/mvv/text-lips"; description = "Monadic parsing combinator library with attention to locations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-loc" = callPackage @@ -187205,6 +187805,7 @@ self: { pname = "text-markup"; version = "0.1"; sha256 = "1nn0h61cvaydawrc4d0bizyqnssbhmgvsb0s59fvxcwk9zlw10xh"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-text tasty tasty-quickcheck text @@ -187216,23 +187817,6 @@ self: { }) {}; "text-metrics" = callPackage - ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck, text - }: - mkDerivation { - pname = "text-metrics"; - version = "0.2.0"; - sha256 = "0fp4zzmq14hwprxv3h8zbm7107drj1yj0l9zp75q4qdc2k7088q8"; - revision = "1"; - editedCabalFile = "1j3xzb7l2qd2340p4hzfpp26y5414h61nkvhpwpg4brmd041h7fh"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - benchmarkHaskellDepends = [ base criterion deepseq text ]; - homepage = "https://github.com/mrkkrp/text-metrics"; - description = "Calculate various string metrics efficiently"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-metrics_0_3_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hspec , QuickCheck, text, vector, weigh }: @@ -187246,7 +187830,6 @@ self: { homepage = "https://github.com/mrkkrp/text-metrics"; description = "Calculate various string metrics efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-normal" = callPackage @@ -187267,6 +187850,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-plus" = callPackage + ({ mkDerivation, base, bytestring, doctest, HTF, pretty, QuickCheck + , strict-data, text, util-plus + }: + mkDerivation { + pname = "text-plus"; + version = "0.1.0.1"; + sha256 = "1i93dk0i7zn81iw0q6g8ygr0bxwil09826mx1kw544n153yw9g7x"; + libraryHaskellDepends = [ + base bytestring pretty QuickCheck strict-data text util-plus + ]; + testHaskellDepends = [ base doctest HTF text ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "Utils for text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-position" = callPackage ({ mkDerivation, base, QuickCheck, regex-applicative }: mkDerivation { @@ -187289,8 +187889,8 @@ self: { }: mkDerivation { pname = "text-postgresql"; - version = "0.0.2.2"; - sha256 = "0390ca2482i6v311rb2cjqd21gr87996cwcpfaiprvl3b94lwd4i"; + version = "0.0.2.3"; + sha256 = "0dp4f213d9rslgiqpmpk9dzl6yb9njmiym7s1fn3ms9aadipag72"; libraryHaskellDepends = [ base dlist transformers transformers-compat ]; @@ -187336,26 +187936,6 @@ self: { }) {}; "text-region" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , containers, groups, hspec, lens, mtl, text - }: - mkDerivation { - pname = "text-region"; - version = "0.1.0.1"; - sha256 = "1w8vyr8m312kp8sfpi68rfjxc57jjd1bli2lbrhwm61qydxgy5sj"; - libraryHaskellDepends = [ - aeson base base-unicode-symbols bytestring containers groups lens - mtl text - ]; - testHaskellDepends = [ - base base-unicode-symbols containers hspec lens mtl text - ]; - homepage = "https://github.com/mvoidex/text-region"; - description = "Marking text regions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-region_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , groups, hspec, lens, text }: @@ -187370,7 +187950,6 @@ self: { homepage = "https://github.com/mvoidex/text-region"; description = "Marking text regions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-register-machine" = callPackage @@ -187429,10 +188008,10 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.4.1.1"; - sha256 = "08cr9y2d4hpq15carwk928vscn3ygm7pcs5nc7ccmpl9fg5h9fph"; - revision = "2"; - editedCabalFile = "1282q12n11pzih3f86aj1jx60c471s1qz9ih6w7ridgymfdw2iyk"; + 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 @@ -187455,7 +188034,6 @@ 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_3_6_2" = callPackage @@ -187499,36 +188077,35 @@ self: { ({ 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 - , QuickCheck, quickcheck-instances, random, semigroups, tagged - , template-haskell, terminfo, text, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , vector, xhtml + , 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.5"; - sha256 = "0hh3d52wkq7vbbikn9sznv2i4k23b4vsnxw7s3h0nij2cxpbyz8c"; + version = "3.6"; + sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi"; revision = "1"; - editedCabalFile = "1jbqpmphh4zrbdbqrazqls099gd73zmri1maf1qssvm4drz0ffgn"; + editedCabalFile = "1cw1zjkvfjjgmn8p20lqx5hly5zjlvp69gqp9xdf9zfs3fsgyp8r"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory - ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml + 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 QuickCheck quickcheck-instances random - semigroups tagged template-haskell terminfo text text-show + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances_3_6_2" = callPackage @@ -187667,6 +188244,7 @@ self: { pname = "text-zipper"; version = "0.10"; sha256 = "0vhp707irmyqdix4clnjphnly8zyph4brpjb41n05rxlaybn96n5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; @@ -187873,8 +188451,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.3.0"; - sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm"; + version = "0.2.5.0"; + sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -187959,8 +188537,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.0.2.2"; - sha256 = "0f6fcazfjb5iravmflx1s023hp2swzzkwk296l4jv64xjpxqvdd1"; + version = "0.0.2.4"; + sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; @@ -188108,15 +188686,19 @@ self: { }) {}; "th-kinds" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell }: + ({ mkDerivation, base, containers, mtl, template-haskell + , th-orphans + }: mkDerivation { pname = "th-kinds"; - version = "0.1.1"; - sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b"; - libraryHaskellDepends = [ base containers mtl template-haskell ]; + version = "0.2"; + sha256 = "1jajj3fmhwvkla5ngvg6qb3hl2hmhgj6c1ldnz79b66ys62m6fs6"; + libraryHaskellDepends = [ + base containers mtl template-haskell th-orphans + ]; + homepage = "https://github.com/ddssff/th-kinds"; description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-kinds-fork" = callPackage @@ -188173,8 +188755,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.3"; - sha256 = "0vf4g2pwhgh242512cssbzsgbpfrnn1fj5kv7qw4wx8cdnvdb03k"; + version = "0.13.4"; + sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -188206,8 +188788,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; - version = "0.0.1.1"; - sha256 = "04y539y3ajm92rxnc149qrvw02bk0m8sac1swn0q6763wahsa73j"; + version = "0.0.1.2"; + sha256 = "102w8zxsgdk1p7478p0sdhapai3paid3wyar2cpia649a17jlhwc"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/khibino/haskell-th-reify-compat/"; description = "Compatibility for the result type of TH reify"; @@ -188220,8 +188802,8 @@ self: { }: mkDerivation { pname = "th-reify-many"; - version = "0.1.7"; - sha256 = "1sa4gxkkv30h6g12cqss3qffmphcamfqmvnn69ix2w0wlsya81m8"; + version = "0.1.8"; + sha256 = "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf"; libraryHaskellDepends = [ base containers mtl safe template-haskell th-expand-syns ]; @@ -188247,8 +188829,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { pname = "th-to-exp"; - version = "0.0.1.0"; - sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h"; + version = "0.0.1.1"; + sha256 = "09aqjrvgarygcbry01f6kmwbf7lzsbravmwz4277jdzdhwwj2zw6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; @@ -188336,7 +188918,6 @@ 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 @@ -188503,6 +189084,7 @@ self: { sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty ]; homepage = "http://web.cecs.pdx.edu/~mpj/thih/"; description = "Typing Haskell In Haskell"; @@ -188520,6 +189102,7 @@ self: { sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base edit-distance parseargs phonetic-code sqlite ]; @@ -188604,13 +189187,14 @@ self: { }) {}; "threads" = callPackage - ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework - , test-framework-hunit + ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm + , test-framework, test-framework-hunit }: mkDerivation { pname = "threads"; - version = "0.5.1.4"; - sha256 = "1ggyfrr00b24zjjrggf2srxpxl0spd2jy54v5b70nz6c8fvhbf6k"; + version = "0.5.1.5"; + sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit @@ -188630,7 +189214,6 @@ self: { testHaskellDepends = [ base ]; description = "Extends the threads package with a bounded thread group"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threads-pool" = callPackage @@ -188673,10 +189256,11 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.7"; - sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc"; + version = "0.2.8"; + sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary cairo containers deepseq filepath ghc-events glib gtk mtl pango text time unix @@ -188704,48 +189288,45 @@ self: { }) {}; "threepenny-editors" = callPackage - ({ mkDerivation, base, casing, data-default, generics-sop - , profunctors, threepenny-gui + ({ mkDerivation, base, casing, containers, data-default + , generics-sop, profunctors, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.2.0.14"; - sha256 = "1gw1pp2ylf3g8ijbsm7zfqmfba47hcwncnmdykzid7hb34c7zaw8"; + version = "0.4.1"; + sha256 = "1fzipaqzhayqg581r4p02byxxxql8ydsyxpwdhvqw738a46afqxg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base casing data-default generics-sop profunctors threepenny-gui + 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-gui" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, filepath, hashable, network-uri, safe - , snap-core, snap-server, stm, template-haskell, text, transformers - , unordered-containers, vault, vector, websockets, websockets-snap + "threepenny-editors_0_5_2" = callPackage + ({ mkDerivation, base, bifunctors, casing, containers, data-default + , generics-sop, lens, profunctors, threepenny-gui }: mkDerivation { - pname = "threepenny-gui"; - version = "0.7.0.2"; - sha256 = "0yc4n9b3my7mfq4w28yk4pjh14wqg116gqgx3w8wr26j0yn3y8j0"; + pname = "threepenny-editors"; + version = "0.5.2"; + sha256 = "131gczj4nwcip1m2pry8h340mivpm4skydw0r8ir7mfr4pc6a1wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - filepath hashable network-uri safe snap-core snap-server stm - template-haskell text transformers unordered-containers vault - vector websockets websockets-snap + base bifunctors casing containers data-default generics-sop lens + profunctors threepenny-gui ]; - homepage = "http://wiki.haskell.org/Threepenny-gui"; - description = "GUI framework that uses the web browser as a display"; + homepage = "https://github.com/pepeiborra/threepenny-editors"; + description = "Composable algebraic editors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "threepenny-gui_0_8_0_0" = callPackage + "threepenny-gui" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, filepath, hashable , network-uri, safe, snap-core, snap-server, stm, template-haskell @@ -188754,10 +189335,11 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.0.0"; - sha256 = "1zlkmk0jf4njfc2zk61lvxmr0cy5pzlnrv7r5admy00ha04spnx1"; + version = "0.8.0.1"; + sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq exceptions filepath hashable network-uri safe snap-core snap-server @@ -188767,7 +189349,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -188787,22 +189368,6 @@ self: { }) {}; "threepenny-gui-flexbox" = callPackage - ({ mkDerivation, base, clay, text, threepenny-gui }: - mkDerivation { - pname = "threepenny-gui-flexbox"; - version = "0.3.0.2"; - sha256 = "0bgd0267zsxjwcz03w07wivq25v30ph9770wxhcg9lvjfv5g6f6d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base clay text threepenny-gui ]; - executableHaskellDepends = [ base threepenny-gui ]; - homepage = "https://github.com/barischj/threepenny-gui-flexbox"; - description = "Flexbox layouts for Threepenny-gui"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "threepenny-gui-flexbox_0_4_2" = callPackage ({ mkDerivation, base, clay, text, threepenny-gui }: mkDerivation { pname = "threepenny-gui-flexbox"; @@ -188815,7 +189380,6 @@ self: { homepage = "https://github.com/barischj/threepenny-gui-flexbox"; description = "Flexbox layouts for Threepenny-gui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thrift" = callPackage @@ -188885,8 +189449,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "1"; - editedCabalFile = "0rd88blvc7dz6j64868dkgz1l7zpy5gfzx2m5kp3wjbbfmjrzh7h"; + revision = "2"; + editedCabalFile = "1qbzxll2zfc2y9r17yk2077lyq6f2dw1745kxn5f4r33970128k6"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; homepage = "https://www.github.com/bergmark/through-text"; description = "Convert textual types through Text without needing O(n^2) instances"; @@ -188991,6 +189555,7 @@ self: { sha256 = "1il31vwcl3lag1nz9a9j8i7g160djbdbfcd58qi7d9sw9mcjk361"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html blaze-markup dbus utf8-string xmonad xmonad-contrib ]; @@ -189020,8 +189585,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.2"; - sha256 = "10n0vbhkyvq5mcf98mbh06pzzp3f2k1w9mk576h3ciyh8rirvl4d"; + version = "0.1.1.4"; + sha256 = "0xr31py60q915a8qg590c55mjprf7w5w4cdlcjg1gz6wqq9kdjam"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -189042,6 +189607,7 @@ self: { sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base glade gtk haskell98 ]; homepage = "http://ecks.homeunix.net"; description = "Useful if reading \"Why FP matters\" by John Hughes"; @@ -189049,6 +189615,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ticker" = callPackage + ({ mkDerivation, async, base, deepseq, doctest, Glob, hspec + , safe-exceptions + }: + mkDerivation { + pname = "ticker"; + version = "1.0.0"; + sha256 = "16n1qxhp6i14h636n7r427s89v7z4kmfi7ivc6a0sz6jzh4h5c0d"; + revision = "1"; + editedCabalFile = "1d1zj1x0plk3s0jy8ps6mwx94rg82smcmjzb85fwv7dy2dhrkzg7"; + libraryHaskellDepends = [ async base safe-exceptions ]; + testHaskellDepends = [ async base deepseq doctest Glob hspec ]; + homepage = "https://github.com/syocy/ticker-hs"; + description = "A concurrent utility inspired by Ticker in golang"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tickle" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, lens, mtl, QuickCheck, semigroupoids, semigroups @@ -189068,7 +189651,6 @@ self: { homepage = "https://github.com/NICTA/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tictactoe3d" = callPackage @@ -189085,25 +189667,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, binary, bytestring, colour, containers - , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process - , text, time, transformers, websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.8.2"; - sha256 = "12rs8i44cx8hnik3q52l43zd5j3qfv1ljznjam0c4gmq83dm967p"; - libraryHaskellDepends = [ - base binary bytestring colour containers hashable hmt hosc - mersenne-random-pure64 mtl parsec process text time transformers - websockets - ]; - homepage = "http://tidal.lurk.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_0_9_4" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit , text, time, websockets @@ -189120,7 +189683,6 @@ self: { homepage = "http://tidalcycles.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -189165,7 +189727,6 @@ self: { homepage = "http://yaxu.org/tidal/"; description = "Visual rendering for Tidal patterns"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tie-knot" = callPackage @@ -189280,6 +189841,7 @@ self: { sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base binary bytestring bzlib filepath haskell98 mtl pretty ]; @@ -189290,14 +189852,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8_0_2" = callPackage + "time_1_8_0_3" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8.0.2"; - sha256 = "158hy4klkdwm1vvqnfibziqac6h6ms42x0gha24w3a5cbjb2sr20"; + version = "1.8.0.3"; + sha256 = "0mbz76v74q938ramsgipgsvk8hvnplcnffplaq439z202zkyar1h"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -189370,7 +189932,6 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Yet another time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-http" = callPackage @@ -189511,7 +190072,6 @@ self: { homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -189592,14 +190152,14 @@ self: { "time-warp" = callPackage ({ mkDerivation, ansi-terminal, array, async, attoparsec, base , binary, binary-conduit, bytestring, conduit, conduit-extra - , containers, data-default, data-msgpack, deepseq, exceptions - , extra, formatting, hashable, hspec, lens, lifted-base, log-warper - , mmorph, monad-control, monad-loops, MonadRandom, mtl, network - , pqueue, QuickCheck, quickcheck-instances, random, safe - , semigroups, serokell-util, slave-thread, stm, stm-chans - , stm-conduit, streaming-commons, template-haskell, text - , text-format, time, time-units, transformers, transformers-base - , unordered-containers + , containers, data-default, data-msgpack, deepseq, directory + , exceptions, extra, formatting, hashable, hslogger, hspec, lens + , lifted-base, log-warper, mmorph, monad-control, monad-loops + , MonadRandom, mtl, network, optparse-simple, pqueue, QuickCheck + , quickcheck-instances, random, resourcet, safe, semigroups + , serokell-util, slave-thread, stm, stm-chans, stm-conduit + , streaming-commons, template-haskell, text, text-format, time + , time-units, transformers, transformers-base, unordered-containers }: mkDerivation { pname = "time-warp"; @@ -189617,6 +190177,14 @@ self: { streaming-commons template-haskell text text-format time time-units transformers transformers-base unordered-containers ]; + executableHaskellDepends = [ + async attoparsec base binary binary-conduit bytestring conduit + conduit-extra containers data-default data-msgpack directory + exceptions extra formatting hslogger hspec lens log-warper + monad-control monad-loops MonadRandom mtl optparse-simple + QuickCheck random resourcet serokell-util stm text text-format time + time-units transformers unordered-containers + ]; testHaskellDepends = [ async base data-default data-msgpack exceptions hspec lens log-warper mtl QuickCheck random serokell-util stm text text-format @@ -189654,7 +190222,6 @@ self: { homepage = "https://github.com/xpika/Time-Console"; description = "time each line of terminal output"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeit" = callPackage @@ -189760,6 +190327,10 @@ self: { 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 @@ -189854,7 +190425,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Timeplot"; description = "A tool for visualizing time series from log files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeprint" = callPackage @@ -189964,7 +190534,6 @@ self: { homepage = "https://github.com/Peaker/timestamp-subprocess-lines"; description = "Run a command and timestamp its stdout/stderr lines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timestamper" = callPackage @@ -190014,18 +190583,6 @@ self: { }) {}; "timezone-series" = callPackage - ({ mkDerivation, base, time }: - mkDerivation { - pname = "timezone-series"; - version = "0.1.6.1"; - sha256 = "1hrcbh146lq3pl4jprdmqwpbnlqv6743m52ls7qs0hqi7f69msk5"; - libraryHaskellDepends = [ base time ]; - homepage = "http://projects.haskell.org/time-ng/"; - description = "Enhanced timezone handling for Data.Time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timezone-series_0_1_8" = callPackage ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "timezone-series"; @@ -190035,7 +190592,6 @@ self: { homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timezone-unix" = callPackage @@ -190238,35 +190794,11 @@ self: { }) {}; "titlecase" = callPackage - ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "titlecase"; - version = "0.1.0.3"; - sha256 = "08i22wcb0amrl3rl3bkdbvym6zcjz2msraj78px0l0ky3prc7fv7"; - revision = "1"; - editedCabalFile = "0p7f68d4v1rp9lf2zaa2bx195ylrsxrds5ybl8mhdr49p0y642qf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base blaze-markup semigroups text ]; - executableHaskellDepends = [ base blaze-markup semigroups text ]; - testHaskellDepends = [ - base blaze-markup semigroups tasty tasty-hunit tasty-quickcheck - text - ]; - homepage = "https://github.com/peti/titlecase#readme"; - description = "Convert English words to title case"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "titlecase_1" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "titlecase"; - version = "1"; - sha256 = "1q7pll71rqgmzm90949i6fskfjysfdqhqvby0mh38ykm88bxm80w"; + version = "1.0.1"; + sha256 = "1k29br4ck9hpjq0w8md7i5kbh47svx74i2abv6ql2awxa0liqwz7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -190275,7 +190807,6 @@ self: { homepage = "https://github.com/peti/titlecase#readme"; description = "Convert English Words to Title Case"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -190300,12 +190831,12 @@ self: { }) {}; "tkyprof" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs - , conduit, conduit-extra, containers, data-default, directory - , exceptions, filepath, http-types, mtl, resourcet, rosezipper - , shakespeare, stm, template-haskell, text, time, transformers - , unordered-containers, vector, wai, wai-extra, warp, web-routes - , yesod, yesod-core, yesod-form, yesod-static + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , cmdargs, conduit, conduit-extra, containers, data-default + , directory, exceptions, filepath, http-types, mtl, resourcet + , rosezipper, shakespeare, stm, template-haskell, text, time + , transformers, unordered-containers, vector, wai, wai-extra, warp + , web-routes, yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "tkyprof"; @@ -190313,12 +190844,14 @@ self: { sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs conduit conduit-extra - containers data-default directory exceptions filepath http-types - mtl resourcet rosezipper shakespeare stm template-haskell text time - transformers unordered-containers vector wai wai-extra warp - web-routes yesod yesod-core yesod-form yesod-static + aeson attoparsec base blaze-builder bytestring cmdargs conduit + conduit-extra containers data-default directory exceptions filepath + http-types mtl resourcet rosezipper shakespeare stm + template-haskell text time transformers unordered-containers vector + wai wai-extra warp web-routes yesod yesod-core yesod-form + yesod-static ]; homepage = "https://github.com/maoe/tkyprof"; description = "A web-based visualizer for GHC Profiling Reports"; @@ -190336,7 +190869,6 @@ self: { testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tldr" = callPackage @@ -190391,6 +190923,36 @@ self: { 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 + , transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.4.0"; + sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cereal cryptonite data-default-class + hourglass mtl QuickCheck tasty tasty-quickcheck x509 + x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -190411,6 +190973,27 @@ self: { 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 + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.5"; + sha256 = "16zb4dray3l6sdckixyd2a5hbf6s0svy5f5bfffq48zr7f3c8id3"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -190433,14 +191016,14 @@ self: { }) {}; "tls-session-manager" = callPackage - ({ mkDerivation, auto-update, base, clock, psqueues, time, tls }: + ({ mkDerivation, auto-update, base, clock, psqueues, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.0.0"; - sha256 = "04bci0pcky2sc3d0nb5nc2hg03k0gg04iy5rhcr7698ig02x8wvn"; - libraryHaskellDepends = [ - auto-update base clock psqueues time tls - ]; + version = "0.0.0.1"; + sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8"; + revision = "1"; + editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01"; + libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -190488,8 +191071,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "0.1.0.7"; - sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2"; + version = "0.1.0.8"; + sha256 = "11cs5cq99gxkfj0x14kkcsn6mnh9c7d8hw1kdj598fy1gic5c94n"; libraryHaskellDepends = [ base directory network process temporary unix ]; @@ -190736,7 +191319,8 @@ self: { }) {}; "toktok" = callPackage - ({ mkDerivation, base, bytestring, containers, gf, haskell98, iconv + ({ mkDerivation, base, bytestring, containers, criterion, filepath + , gf, haskell98, HUnit, iconv, progression, QuickCheck }: mkDerivation { pname = "toktok"; @@ -190745,7 +191329,10 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskell98 ]; - executableHaskellDepends = [ base bytestring gf iconv ]; + executableHaskellDepends = [ + base bytestring criterion filepath gf HUnit iconv progression + QuickCheck + ]; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -190789,6 +191376,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toml" = callPackage @@ -190837,7 +191425,6 @@ self: { homepage = "http://functionalley.eu"; description = "Ill-defined library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "top" = callPackage @@ -190862,7 +191449,6 @@ self: { homepage = "http://github.com/tittoassini/top"; description = "Top (typed oriented protocol) API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "topkata" = callPackage @@ -190875,6 +191461,7 @@ self: { sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random ]; @@ -190932,7 +191519,6 @@ self: { libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "total-alternative" = callPackage @@ -191006,7 +191592,6 @@ self: { homepage = "https://github.com/tonyday567/tower"; description = "A numeric tower"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "toxcore" = callPackage @@ -191037,11 +191622,11 @@ self: { , exceptions, extended-reals, filepath, finite-field, ghc-prim , hashable, haskeline, heaps, intern, loop, mtl, multiset , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes - , process, pseudo-boolean, queue, QuickCheck, semigroups, sign, stm - , tasty, tasty-hunit, tasty-quickcheck, tasty-th, template-haskell - , temporary, time, transformers, transformers-compat - , type-level-numbers, unbounded-delays, unordered-containers - , vector, vector-space + , process, pseudo-boolean, queue, QuickCheck, semigroups, sign + , split, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, temporary, time, transformers + , transformers-compat, type-level-numbers, unbounded-delays + , unordered-containers, vector, vector-space }: mkDerivation { pname = "toysolver"; @@ -191063,7 +191648,7 @@ self: { executableHaskellDepends = [ array base bytestring containers data-default-class filepath haskeline mtl mwc-random OptDir parse-dimacs parsec process - pseudo-boolean time transformers transformers-compat + pseudo-boolean split time transformers transformers-compat unbounded-delays vector vector-space ]; testHaskellDepends = [ @@ -191119,27 +191704,28 @@ self: { }) {}; "tpb" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring - , directory, filepath, free, http-client, http-client-tls - , libnotify, microlens, mtl, optparse-applicative, pushbullet-types - , servant, servant-client, servant-pushbullet-client, text, time + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, boxes + , bytestring, containers, directory, filepath, free, http-client + , http-client-tls, libnotify, microlens, mtl, optparse-applicative + , pushbullet-types, servant, servant-client + , servant-pushbullet-client, servant-server, text, time, wai, warp , websockets, wuss }: mkDerivation { pname = "tpb"; - version = "0.1.1.1"; - sha256 = "0w2wzv52lmnp80amwrzmxm3lacvp03wpkcx1i9f9b1qr060h6v41"; + version = "0.4.0.0"; + sha256 = "0d90vbyma5yhai0nlxa035pibn928jak879wbs6xx9ssyshcfwgy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson ansi-wl-pprint base boxes bytestring directory filepath free - http-client http-client-tls libnotify microlens mtl - optparse-applicative pushbullet-types servant servant-client - servant-pushbullet-client text time websockets wuss + aeson ansi-wl-pprint async base boxes bytestring containers + directory filepath free http-client http-client-tls libnotify + microlens mtl optparse-applicative pushbullet-types servant + servant-client servant-pushbullet-client servant-server text time + wai warp websockets wuss ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -191243,7 +191829,6 @@ self: { ]; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -191267,7 +191852,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traildb" = callPackage @@ -191429,6 +192013,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-bifunctors" = callPackage + ({ mkDerivation, base, mmorph, transformers }: + mkDerivation { + pname = "transformers-bifunctors"; + version = "0.1"; + sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w"; + libraryHaskellDepends = [ base mmorph transformers ]; + homepage = "https://github.com/jystic/transformers-bifunctors"; + description = "Bifunctors over monad transformers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -191503,7 +192099,6 @@ self: { homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {effect-interpreters = null;}; @@ -191521,19 +192116,6 @@ self: { }) {}; "transformers-lift" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "transformers-lift"; - version = "0.1.0.1"; - sha256 = "0x5a80c8inc89h7z85qkr892s3ybk2gqybqn3h0w3cmrizsi37f2"; - revision = "1"; - editedCabalFile = "0jk65y544gm09hi3wl0d599aay5a6d484wi3l9nwv2yml97x9inw"; - libraryHaskellDepends = [ base transformers ]; - description = "Ad-hoc type classes for lifting"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "transformers-lift_0_2_0_1" = callPackage ({ mkDerivation, base, transformers, writer-cps-transformers }: mkDerivation { pname = "transformers-lift"; @@ -191544,7 +192126,6 @@ self: { ]; description = "Ad-hoc type classes for lifting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-runnable" = callPackage @@ -191572,41 +192153,24 @@ self: { }) {}; "transient" = callPackage - ({ mkDerivation, base, containers, directory, mtl, random, stm - , time, transformers + ({ mkDerivation, atomic-primops, base, bytestring, containers + , directory, mtl, random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.4.4.1"; - sha256 = "1vfhd25bp6hvivjvdsji11qlnxpvbvrkfjxz98lls16lqfv39bgi"; + version = "0.5.9.2"; + sha256 = "0ij3ycc1zln9vnjp66d5mxsgwpzmfswbz018ci6w8m885zdf9dr2"; libraryHaskellDepends = [ - base containers directory mtl random stm time transformers - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient_0_5_8" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, mtl - , random, stm, time, transformers - }: - mkDerivation { - pname = "transient"; - version = "0.5.8"; - sha256 = "04n43yddamgk7han7kmhz57v2vrp3cazqkgy4xnkdfgr10z8pppx"; - libraryHaskellDepends = [ - base bytestring containers directory mtl random stm time - transformers + atomic-primops base bytestring containers directory mtl random stm + time transformers ]; testHaskellDepends = [ - base bytestring containers directory mtl random stm time - transformers + atomic-primops base bytestring containers directory mtl random stm + time transformers ]; homepage = "http://www.fpcomplete.com/user/agocorona"; description = "composing programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe" = callPackage @@ -191617,38 +192181,8 @@ self: { }: mkDerivation { pname = "transient-universe"; - version = "0.3.5.1"; - sha256 = "11grgp63wy8nld3802l4i4dj909bg9xnhgvr94v444dik6dby4vn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP iproute mtl network network-info network-uri process - random stm TCache text time transformers transient vector - websockets - ]; - executableHaskellDepends = [ base transformers transient ]; - testHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Remote execution and map-reduce: distributed computing for Transient"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "transient-universe_0_4_6" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, iproute, mtl, network - , network-info, network-uri, process, random, stm, TCache, text - , time, transformers, transient, vector, websockets - }: - mkDerivation { - pname = "transient-universe"; - version = "0.4.6"; - sha256 = "0as7930b9mwy86rcly957q9yslqd2rflakmxnl1njnqm2cr2dx7m"; + version = "0.4.6.1"; + sha256 = "1bsx6a0bkys99xwrz78nnd1f8y2ixzcbng0smh1kb6xrac8b1jin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191670,7 +192204,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 = stdenv.lib.platforms.none; }) {}; "transient-universe-tls" = callPackage @@ -191712,6 +192245,7 @@ self: { pname = "translate"; version = "2010.1.24"; sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base curl json network utf8-string ]; homepage = "http://github.com/nfjinjing/translate"; description = "Haskell binding to Google's AJAX Language API for Translation and Detection"; @@ -191801,17 +192335,6 @@ self: { }) {}; "traverse-with-class" = callPackage - ({ mkDerivation, base, template-haskell, transformers }: - mkDerivation { - pname = "traverse-with-class"; - version = "0.2.0.4"; - sha256 = "0wl741z4vnvl7ghbn66nnnrw62k3v4wl280nyqx2bw9pmk7fjm4x"; - libraryHaskellDepends = [ base template-haskell transformers ]; - description = "Generic applicative traversals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "traverse-with-class_1_0_0_0" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers }: @@ -191823,7 +192346,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Generic applicative traversals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "travis" = callPackage @@ -191873,6 +192395,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "travis-pogodi" = callPackage + ({ mkDerivation, base, optparse-applicative, process }: + mkDerivation { + pname = "travis-pogodi"; + version = "0.1.0"; + sha256 = "1m75rlbzy0lm3nhp14kms3v1l9bykdva3ivgw4n8rqy5i48ismi0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base optparse-applicative process ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/4e6/travis-pogodi#readme"; + description = "A better travis_wait"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "trawl" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, MissingH , optparse-applicative, process, split @@ -191901,6 +192438,7 @@ self: { sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base gtk process ]; homepage = "http://projects.haskell.org/traypoweroff"; description = "Tray Icon application to PowerOff / Reboot computer"; @@ -191961,7 +192499,6 @@ self: { ]; description = "A tree of Data.Map."; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap-html" = callPackage @@ -192024,6 +192561,10 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; + executableHaskellDepends = [ + base containers mtl QuickCheck random + ]; + testHaskellDepends = [ base containers mtl QuickCheck random ]; homepage = "http://www.haskell.org/haskellwiki/Treeviz"; description = "Visualization of computation decomposition trees"; license = stdenv.lib.licenses.bsd3; @@ -192112,6 +192653,8 @@ self: { 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 @@ -192126,7 +192669,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_7" = callPackage + "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 @@ -192136,8 +192679,10 @@ self: { }: mkDerivation { pname = "trifecta"; - version = "1.7"; - sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq"; + version = "1.7.1.1"; + sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; + revision = "1"; + editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -192377,7 +192922,6 @@ self: { ]; description = "Thread-safe logging, with additional interleaving fuzz-testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tsne" = callPackage @@ -192416,8 +192960,8 @@ self: { }) {}; "tsparse" = callPackage - ({ mkDerivation, base, Decimal, parsec, pretty, process, split - , time + ({ mkDerivation, base, Decimal, parsec, pretty, process, random + , split, time }: mkDerivation { pname = "tsparse"; @@ -192428,6 +192972,9 @@ self: { libraryHaskellDepends = [ base Decimal parsec pretty process split time ]; + executableHaskellDepends = [ + base Decimal parsec pretty process random split time + ]; homepage = "http://www.github.com/massysett/tsparse"; description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements"; license = stdenv.lib.licenses.bsd3; @@ -192830,6 +193377,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_4_1" = 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.4.1"; + sha256 = "1frq36axmzbcya2623vcs2cpvr7zh7bk7nzjpdpvzmwqykkfm4lc"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -192900,26 +193471,29 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, http-client, http-client-tls, http-types - , lens, megaparsec, optparse-applicative, split, text + , directory, extra, hspec, htoml, http-client, http-client-tls + , http-types, lens, megaparsec, optparse-applicative, QuickCheck + , split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "0.6.1.2"; - sha256 = "17nvm7xnb5gvmq977bz812gd6s3dfvvkxd2zwcdayczdmnz06gyz"; + version = "1.0.1.2"; + sha256 = "0rzkb2mv19jafswc3cww7zp1flbz87pyn4mkw16sf3gjar2k9h8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition - containers data-default directory extra http-client http-client-tls - http-types lens megaparsec optparse-applicative split text + containers data-default directory extra htoml http-client + http-client-tls http-types lens megaparsec optparse-applicative + split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp" = callPackage @@ -193087,7 +193661,6 @@ self: { homepage = "https://github.com/wiggly/twfy-api-client#readme"; description = "They Work For You API Client Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -193165,10 +193738,8 @@ self: { }: mkDerivation { pname = "twilio"; - version = "0.1.3.1"; - sha256 = "0vsb0fli01fy1qbvqvmm12sl70nxz0gk7rsmghhyqwv01nmakfwk"; - revision = "1"; - editedCabalFile = "10dgcxjhmz7fn5fcgs28niyfpjq0vfs8fcpipq0ijcxwk6z78h3c"; + version = "0.1.3.2"; + sha256 = "1vbb846cdav6csm2y9asrdzvmh9s3pf4apyharrr1hwd2xz3jcga"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers errors exceptions free http-client http-client-tls http-types mtl network-uri old-locale @@ -193182,7 +193753,6 @@ self: { homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -193211,8 +193781,9 @@ self: { }: mkDerivation { pname = "twiml"; - version = "0.2.0.0"; - sha256 = "12vavc02rpdrgdcnbd1jzn9lllzx4fghczdrpjr2icn8bkrgkqi5"; + version = "0.2.0.1"; + sha256 = "1x4jhvz0590zlpy74yjwjxkrllk7yvpgf2srkisi10klmarsjygd"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default deepseq lens network-uri parsec template-haskell text void xml @@ -193328,6 +193899,39 @@ self: { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "twitter-conduit_0_2_2_2" = callPackage + ({ 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 + }: + mkDerivation { + pname = "twitter-conduit"; + version = "0.2.2.2"; + sha256 = "00bxqd77ccxa0cbbrgwhnivyi8jvmm5w0xx7fnx592yn7y9kgfip"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base bytestring conduit + conduit-extra containers data-default exceptions http-client + http-conduit http-types lens lens-aeson resourcet template-haskell + text time transformers transformers-base twitter-types + twitter-types-lens + ]; + testHaskellDepends = [ + aeson attoparsec authenticate-oauth base bytestring + case-insensitive conduit conduit-extra containers data-default + doctest hlint hspec http-client http-conduit http-types lens + lens-aeson network-uri resourcet template-haskell text time + twitter-types twitter-types-lens + ]; + homepage = "https://github.com/himura/twitter-conduit"; + description = "Twitter API package with conduit interface and Streaming API support"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -193395,7 +193999,6 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -193412,7 +194015,6 @@ self: { homepage = "https://github.com/himura/twitter-types-lens"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -193498,6 +194100,7 @@ self: { sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring directory filepath ghc process ]; @@ -193513,6 +194116,7 @@ self: { pname = "type-aligned"; version = "0.9.6"; sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "https://github.com/atzeus/type-aligned"; description = "Various type-aligned sequence data structures"; @@ -193530,7 +194134,6 @@ self: { homepage = "https://github.com/lexi-lambda/type-assertions#readme"; description = "Runtime type assertions for testing"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-booleans" = callPackage @@ -193916,6 +194519,24 @@ self: { homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "type-of-html" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec + , text + }: + mkDerivation { + pname = "type-of-html"; + version = "0.2.1.1"; + sha256 = "1dvmpi1bal10vr5l4phllwxij9yw5lgjyx7aimb1yalri2dapipk"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion text + ]; + 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; }) {}; @@ -194079,6 +194700,7 @@ self: { sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l"; revision = "1"; editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ applicative-numbers base constraints newtype ty vector-space ]; @@ -194107,8 +194729,8 @@ self: { }: mkDerivation { pname = "typed-duration"; - version = "0.1.0.0"; - sha256 = "06z2yq29z3mwyiwy2n389f39ygcrhjjib82vl1hkyj3573sillj8"; + version = "0.1.1.0"; + sha256 = "14na0mczkppzdixkr75z7vkp2rk7r1lsiysvgb6j29scj5a9l6x4"; libraryHaskellDepends = [ base lifted-base monad-control transformers-base ]; @@ -194137,6 +194759,28 @@ self: { homepage = "https://github.com/fpco/typed-process#readme"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; + }) {}; + + "typed-process_0_1_0_1" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring + , conduit, conduit-extra, exceptions, hspec, http-conduit, process + , stm, temporary, transformers + }: + mkDerivation { + pname = "typed-process"; + version = "0.1.0.1"; + sha256 = "05pwpis2vm63qxg8kkqd52whbgkgf5k5sy0w1z1am7jsm6fiychc"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra exceptions process stm + transformers + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring conduit conduit-extra hspec + http-conduit temporary + ]; + homepage = "https://haskell-lang.org/library/typed-process"; + description = "Run external processes, with strong typing of streams"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -194432,17 +195076,18 @@ self: { "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit - , text + , text, vector }: mkDerivation { pname = "tyro"; - version = "0.2.0.0"; - sha256 = "116hay13pqngpxbqbxz60mzhz2ccgkiqgaz7frfqyc4mwqm80xnh"; + version = "0.3.0.0"; + sha256 = "0gx50kx5pvh8fi88wjh1hvmawnj1k1jl7z78h9q9spvg0l7nz4q5"; libraryHaskellDepends = [ - aeson base bytestring protolude reflection singletons text + aeson base bytestring protolude reflection singletons text vector ]; testHaskellDepends = [ - aeson base HUnit protolude test-framework test-framework-hunit text + aeson base bytestring HUnit protolude reflection singletons + test-framework test-framework-hunit text vector ]; homepage = "https://github.com/rlupton20/tyro#readme"; description = "Type derived JSON parsing using Aeson"; @@ -194458,8 +195103,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.2.1"; - sha256 = "14n44wbz2cjvzhv8zd6bddmbivxyw04xwd7p1jkm5d0v1jggb1yi"; + version = "0.1.3.0"; + sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -194484,8 +195129,9 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20161123.0"; - sha256 = "1dnc9m3396bxps84xgxfzrx928yh7vxd8pdim63a5xrydcfp16fb"; + version = "0.1.20170320.0"; + sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector ]; @@ -194528,6 +195174,7 @@ self: { sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base BNFC-meta cmdargs containers mtl parsec pretty split transformers @@ -194544,8 +195191,9 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.3"; - sha256 = "043srsyff22vfhs2nwqmzp6w7vlqqlg3sl7acnbl4vical0k7cmx"; + version = "0.7.4"; + sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml ]; @@ -194572,6 +195220,7 @@ self: { sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base containers directory filepath hslogger mtl network process regex-compat time time-locale-compat unix @@ -194631,6 +195280,7 @@ self: { sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring cereal containers ghc-prim mtl network unix utf8-string @@ -194668,7 +195318,9 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: + ({ mkDerivation, base, bytestring, libudev, posix-paths, select + , unix + }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -194677,6 +195329,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; libraryPkgconfigDepends = [ libudev ]; + executableHaskellDepends = [ base bytestring select ]; homepage = "https://github.com/pxqr/udev"; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; @@ -194723,6 +195376,7 @@ self: { sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers directory fgl filepath hashable mtl network old-locale primitive process syb transformers @@ -194794,7 +195448,6 @@ 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 @@ -194825,7 +195478,6 @@ self: { homepage = "http://github.com/hargettp/uid.git"; description = "Simple unique identifier datatype, serializable and encodable as base32"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ulid" = callPackage @@ -194917,6 +195569,7 @@ self: { homepage = "https://github.com/LukeHoersten/unagi-streams"; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unamb" = callPackage @@ -195030,12 +195683,13 @@ self: { }) {}; "unboxed-ref" = callPackage - ({ mkDerivation, base, ghc-prim, primitive }: + ({ mkDerivation, async, base, ghc-prim, HUnit, primitive }: mkDerivation { pname = "unboxed-ref"; - version = "0.3.0.0"; - sha256 = "0zzw9myflayv0lzlfj11abgfxjb5yvyp3jw8xwbal92bzvd569gl"; + version = "0.4.0.0"; + sha256 = "0gvpp35mzx6ydwhwqdv319pl4yw7g4pyayciry83lnh3a3asisv4"; libraryHaskellDepends = [ base ghc-prim primitive ]; + testHaskellDepends = [ async base HUnit ]; homepage = "https://github.com/winterland1989/unboxed-ref"; description = "Fast unboxed references for ST and IO monad"; license = stdenv.lib.licenses.bsd3; @@ -195348,8 +196002,8 @@ self: { }: mkDerivation { pname = "unicode-transforms"; - version = "0.2.1"; - sha256 = "1g1sgyl0csz8cs62aybx4nx9alvnygvn2sa73sm8b1n5wc6sm2qx"; + version = "0.3.3"; + sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -195363,29 +196017,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unicode-transforms_0_3_1" = callPackage - ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq - , filepath, getopt-generics, optparse-applicative, path, path-io - , QuickCheck, split, text - }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.3.1"; - sha256 = "03n9s1pqgq9gl3q6xydwjlsvwq4al6khwd8lr137941263zxx0di"; - libraryHaskellDepends = [ base bitarray bytestring text ]; - testHaskellDepends = [ - base deepseq getopt-generics QuickCheck split text - ]; - benchmarkHaskellDepends = [ - base criterion deepseq filepath optparse-applicative path path-io - text - ]; - homepage = "http://github.com/harendra-kumar/unicode-transforms"; - description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -195396,6 +196027,7 @@ self: { sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base directory filepath text ]; @@ -195406,7 +196038,6 @@ self: { homepage = "https://github.com/Zankoku-Okuno/unicoder"; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unidecode" = callPackage @@ -195461,6 +196092,7 @@ self: { pname = "uniform-pair"; version = "0.1.13"; sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq prelude-extras ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -195473,10 +196105,10 @@ self: { }: mkDerivation { pname = "union"; - version = "0.1.1.1"; - sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1"; + version = "0.1.1.2"; + sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; revision = "1"; - editedCabalFile = "03ac6fnvqhlzngyaz5qd14gb5niybw73iimr4mafyqq3swi27q49"; + editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -195699,8 +196331,8 @@ self: { }: mkDerivation { pname = "units-parser"; - version = "0.1.0.0"; - sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq"; + version = "0.1.0.1"; + sha256 = "1kmac80hnb2dric6d5ll7cdyhs8s4qqkk5vmd8gq9zjdyl6zxmrp"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -195770,6 +196402,7 @@ self: { pname = "universal-binary"; version = "0.11"; sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; description = "Parser for OS X Universal Binary format"; license = stdenv.lib.licenses.bsd3; @@ -195899,8 +196532,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.5"; - sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; + version = "0.5.1.1"; + sha256 = "1cj9qs7r3p8zhlrv3h3phmflp158ckimg3rzq4c28vfx85d8vxz2"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers @@ -195911,14 +196544,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "unix_2_7_2_1" = callPackage + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { pname = "unix"; - version = "2.7.2.1"; - sha256 = "1709ip8k1vahy00zi7v7qccw6rr22qrf3vk54h97jxrnjiakc1gw"; - revision = "1"; - editedCabalFile = "1m6gvvsb7ds25qws07wn6v3icksmh9g09qbrz726z8rnvvlbdc9x"; + version = "2.7.2.2"; + sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -195944,8 +196575,8 @@ self: { pname = "unix-compat"; version = "0.4.3.1"; sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; - revision = "1"; - editedCabalFile = "02li6r77ingmhd2887qkrj4rrkl7w86bz5kjqix875ib6aji86bc"; + revision = "2"; + editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -195953,7 +196584,7 @@ self: { }) {}; "unix-fcntl" = callPackage - ({ mkDerivation, base, foreign-var }: + ({ mkDerivation, base, foreign-var, unix }: mkDerivation { pname = "unix-fcntl"; version = "0.0.0"; @@ -195961,6 +196592,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base foreign-var ]; + executableHaskellDepends = [ base foreign-var unix ]; homepage = "https://github.com/maoe/unix-fcntl"; description = "Comprehensive bindings to fcntl(2)"; license = stdenv.lib.licenses.bsd3; @@ -195997,6 +196629,7 @@ self: { pname = "unix-memory"; version = "0.1.2"; sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix @@ -196078,7 +196711,6 @@ self: { homepage = "https://github.com/scrive/unjson"; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlambda" = callPackage @@ -196095,6 +196727,35 @@ self: { license = "GPL"; }) {}; + "unliftio" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath + , monad-logger, resourcet, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.1.0.0"; + sha256 = "053swazav18rrmlwskrgnw99wn7j7wznaadjmsf8nmzk13qzn18i"; + libraryHaskellDepends = [ + async base deepseq directory filepath monad-logger resourcet + transformers unix unliftio-core + ]; + homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + }) {}; + + "unliftio-core" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "unliftio-core"; + version = "0.1.0.0"; + sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -196107,7 +196768,6 @@ self: { executableHaskellDepends = [ base directory text ]; description = "Tool to convert literate code between styles or to code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unm-hip" = callPackage @@ -196232,6 +196892,7 @@ self: { pname = "unsafe"; version = "0.0"; sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~thielema/unsafe/"; description = "Unified interface to unsafe functions"; @@ -196259,6 +196920,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; homepage = "http://github.com/konn/unsafely"; description = "Flexible access control for unsafe operations and instances"; license = stdenv.lib.licenses.bsd3; @@ -196271,6 +196933,7 @@ self: { pname = "unsafeperformst"; version = "0.9.2"; sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; homepage = "https://github.com/atzeus/unsafeperformst"; description = "Like unsafeperformIO, but for the ST monad"; @@ -196287,6 +196950,7 @@ self: { sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base optparse-applicative stream-fusion unordered-containers ]; @@ -196341,6 +197005,7 @@ self: { sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base bytestring cassava containers directory file-embed filepath inflections megaparsec mtl parallel-io process @@ -196354,7 +197019,6 @@ 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 @@ -196519,6 +197183,7 @@ self: { sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring cake3 directory filepath language-javascript mime-types mtl optparse-applicative process syb text @@ -196575,8 +197240,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; - version = "0.1.0.1"; - sha256 = "1zi5jl2ksjmvflfzff0hqy7a66ma6xifl2nycb1f6qd0fsrc6hpg"; + version = "0.1.0.2"; + sha256 = "1i62sr28fxc3k045j8l2iak4f46nf8ygzqafc2k1pa0grm4l7ipa"; libraryHaskellDepends = [ aeson base bytestring text uri-bytestring ]; @@ -196658,6 +197323,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uri-parse" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, data-default, hspec + , http-types, lens, text + }: + mkDerivation { + pname = "uri-parse"; + version = "0.1.0.0"; + sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx"; + libraryHaskellDepends = [ + attoparsec base bytestring data-default http-types lens text + ]; + testHaskellDepends = [ base data-default hspec lens ]; + homepage = "https://github.com/luminescent-dreams/uri-parse#readme"; + description = "A simple library for parsing and generating URIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uri-template" = callPackage ({ mkDerivation, base, containers, utf8-string }: mkDerivation { @@ -196691,7 +197373,6 @@ self: { homepage = "http://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url" = callPackage @@ -196727,6 +197408,7 @@ self: { homepage = "https://github.com/nikita-volkov/url-decoders"; description = "Decoders for URL-encoding (aka Percent-encoding)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url-generic" = callPackage @@ -196834,6 +197516,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "urn-random" = callPackage + ({ mkDerivation, base, deepseq, haskell-src-meta, integer-gmp + , MonadRandom, QuickCheck, template-haskell, transformers + }: + mkDerivation { + pname = "urn-random"; + version = "0.1.0.0"; + sha256 = "1zpx56gy8dnmnkkqqhzqxiw2yqkan6h2gfm9lq4218978801jdl4"; + libraryHaskellDepends = [ + base deepseq haskell-src-meta integer-gmp MonadRandom QuickCheck + template-haskell transformers + ]; + homepage = "https://github.com/antalsz/urn-random"; + description = "A package for updatable discrete distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urxml" = callPackage ({ mkDerivation, base, filepath, mtl, optparse-applicative, parsec , process, syb @@ -196859,8 +197559,8 @@ self: { }: mkDerivation { pname = "usb"; - version = "1.3.0.4"; - sha256 = "1izxrjwxs9h4gs9kaiw696p4r10wq6n5mijn80ab6bn716zkhwdf"; + version = "1.3.0.5"; + sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1"; libraryHaskellDepends = [ base bindings-libusb bytestring containers ghc-prim text vector ]; @@ -196911,6 +197611,7 @@ self: { sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-unicode-symbols bytestring containers containers-unicode-symbols parsimony @@ -197111,6 +197812,7 @@ self: { sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base utf8-string ]; description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; license = stdenv.lib.licenses.bsd3; @@ -197131,6 +197833,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util-plus" = callPackage + ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck + , safe, unordered-containers + }: + mkDerivation { + pname = "util-plus"; + version = "0.1.0.0"; + sha256 = "062xs84zgqvxwvydbb2ivyhsfsmqk6wxl41pd4v7pyyqhdq588wm"; + libraryHaskellDepends = [ + array base containers hashable safe unordered-containers + ]; + testHaskellDepends = [ base containers HTF QuickCheck ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "A collection of commonly used utils"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -197325,6 +198044,7 @@ self: { sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-html ]; executableHaskellDepends = [ base process ]; homepage = "https://github.com/matthijssteen/uuagd"; @@ -197371,6 +198091,7 @@ self: { libraryHaskellDepends = [ aeson base text uuid ]; description = "Aeson types for UUID instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuid-le" = callPackage @@ -197614,8 +198335,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.8"; - sha256 = "0mn2mhjnwkmzpb9d7qc5bb8qp22gdmrhwb7d7gf8mh07p1i5025v"; + version = "0.0.9"; + sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197773,6 +198494,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson" = callPackage + ({ mkDerivation, aeson, base, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.0.0.0"; + sha256 = "1a7yh87vlngd4f6j5al7zrfy5pkgfgpbjr00fbpaqk56z87328nh"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -197809,6 +198547,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.0.0.0"; + sha256 = "1k68lp33z0w1ari6i2wdcgypv9viynya5bi8bqs7ybic7h7cs3i5"; + libraryHaskellDepends = [ base scientific validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -197835,6 +198585,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "162xv4mip8awj214gdybhp2m3skjs0pg10gf9abj3h017wf046vd"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "validity-vector" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.0.0.0"; + sha256 = "0iz3qxk73k4ci337h4y9n94vahs9pfl060pdkx4bkg9wpar6fqr1"; + libraryHaskellDepends = [ base hashable validity vector ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -197856,6 +198632,7 @@ self: { sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base deepseq dlist fgl graphviz haskell-src-exts mtl uniplate ]; @@ -198123,6 +198900,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vcf" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec + , hspec-expectations, text + }: + mkDerivation { + pname = "vcf"; + version = "0.9.0"; + sha256 = "1sjsgld8zd30insksv0n3rsjwq0mrr69rqnb1jpcq8lmcgz43jlq"; + libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring hspec hspec-expectations + ]; + description = "A package to parse VCF files inspired in similar python libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -198152,10 +198945,11 @@ self: { }: mkDerivation { pname = "vcsgui"; - version = "0.2.1.2"; - sha256 = "1qf5insiqgl3p9bg6m1igl24lghzbb3y50acwxgcpbcbdcaw13z5"; + version = "0.2.2.0"; + sha256 = "0s7vmlbggmwaj6mlhmj1vkri6af16xpsanwyr2jip5hdpn8gpjv2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl process text vcswrapper @@ -198167,7 +198961,6 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -198176,10 +198969,11 @@ self: { }: mkDerivation { pname = "vcswrapper"; - version = "0.1.5"; - sha256 = "0yzin613nzvnklkb3j29vzy4rfladb3cy3sy6ic0mi6lxhilan2n"; + version = "0.1.6"; + sha256 = "0givnl1716ymjz5a5n4wdy61hg8zhfxb66vx9bzkziavzni2dfif"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hxt mtl parsec process split text @@ -198260,27 +199054,6 @@ self: { }) {}; "vector" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck - , random, template-haskell, test-framework - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.11.0.0"; - sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa"; - revision = "2"; - editedCabalFile = "1kjafhgsyjqlvrpfv2vj17hipyv0zw56a2kbl6khzn5li9szvyib"; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base QuickCheck random template-haskell test-framework - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/haskell/vector"; - description = "Efficient Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector_0_12_0_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive , QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers @@ -198299,12 +199072,11 @@ self: { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-algorithms" = callPackage - ({ mkDerivation, base, bytestring, containers, primitive - , QuickCheck, vector + ({ mkDerivation, base, bytestring, containers, mtl, mwc-random + , primitive, QuickCheck, vector }: mkDerivation { pname = "vector-algorithms"; @@ -198315,6 +199087,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring primitive vector ]; + executableHaskellDepends = [ base mtl mwc-random vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector ]; @@ -198392,11 +199165,12 @@ self: { homepage = "https://github.com/k0001/vector-bytes-instances"; description = "Serial (from the bytes package) for Vector (from the vector package)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim - , primitive, QuickCheck, random, vector + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , ghc-prim, primitive, QuickCheck, random, vector }: mkDerivation { pname = "vector-bytestring"; @@ -198407,6 +199181,7 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ghc-prim primitive vector ]; + executableHaskellDepends = [ base bytestring criterion deepseq ]; testHaskellDepends = [ base directory QuickCheck random ]; homepage = "https://github.com/basvandijk/vector-bytestring"; description = "ByteStrings as type synonyms of Storable Vectors of Word8s"; @@ -198423,6 +199198,7 @@ self: { pname = "vector-clock"; version = "0.2.2"; sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary ghc-prim hashable ]; testHaskellDepends = [ array base binary ghc-prim HUnit QuickCheck test-framework @@ -198581,6 +199357,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_0_6_1_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits, vector }: + mkDerivation { + pname = "vector-sized"; + version = "0.6.1.0"; + sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; + libraryHaskellDepends = [ base deepseq finite-typelits vector ]; + 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 { @@ -198592,6 +199381,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_11" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.11"; + sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -198629,6 +199430,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; + revision = "1"; + editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -198769,6 +199572,7 @@ self: { libraryHaskellDepends = [ aeson base containers text unordered-containers vector verdict ]; + executableHaskellDepends = [ aeson base containers verdict ]; testHaskellDepends = [ aeson base containers hspec unordered-containers vector verdict ]; @@ -198814,20 +199618,6 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit - , text - }: - mkDerivation { - pname = "versions"; - version = "3.0.2.1"; - sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp"; - libraryHaskellDepends = [ base megaparsec text ]; - testHaskellDepends = [ base microlens tasty tasty-hunit text ]; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "versions_3_1_1" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens , tasty, tasty-hunit, text }: @@ -198839,6 +199629,20 @@ self: { testHaskellDepends = [ base microlens tasty tasty-hunit text ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "versions_3_2_0" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "versions"; + version = "3.2.0"; + sha256 = "0hvjcjjrdgxrrdm300mhbj2mbvad66ak04pcbvs23wgxkqrgmqml"; + 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198887,6 +199691,7 @@ self: { sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base byteable bytestring cereal cipher-aes cryptohash directory filepath mmap random storable-endian text time @@ -198917,26 +199722,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.1"; - sha256 = "1gpppkw528k59372qp5fbnqiph934rfgk2dv317330mmpb0rm29f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers ghc-prof lens scientific text vector - vector-algorithms vty - ]; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_4" = callPackage - ({ mkDerivation, base, brick, containers, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; - version = "0.0.0.4"; - sha256 = "06a2bw0blamf29bf3hrwq5c98glx81argk9hsmnp6rjdjzwq6fcp"; + version = "0.0.0.8"; + sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198946,7 +199733,6 @@ self: { homepage = "https://github.com/maoe/viewprof"; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -199026,7 +199812,6 @@ 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 @@ -199041,6 +199826,7 @@ self: { sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default deepseq directory filepath libmpd mtl old-locale process template-haskell time @@ -199059,19 +199845,21 @@ self: { }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage - ({ mkDerivation, array, base, directory, filepath, HUnit, mtl - , parsec, process, random, regex-base, regex-posix, time + ({ mkDerivation, array, base, directory, filepath, hashable + , hashtables, HUnit, mtl, parsec, process, random, regex-base + , regex-posix, time }: mkDerivation { pname = "vintage-basic"; - version = "1.0.1"; - sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25"; + version = "1.0.3"; + sha256 = "1wv7gz4yw4vd2xqcjx8sq0s7cd9h6z6zn7s5lxb10akv7kf52xb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base directory filepath HUnit mtl parsec process random - regex-base regex-posix time + array base directory filepath hashable hashtables HUnit mtl parsec + process random regex-base regex-posix time ]; + testHaskellDepends = [ base ]; homepage = "http://www.vintage-basic.net"; description = "Interpreter for microcomputer-era BASIC"; license = stdenv.lib.licenses.bsd3; @@ -199095,6 +199883,27 @@ self: { 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"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base doctest hspec lens should-not-typecheck singletons + ]; + benchmarkHaskellDepends = [ + base criterion lens linear mwc-random primitive vector + ]; + description = "Extensible Records"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -199102,8 +199911,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.0.1"; - sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a"; + version = "0.3.1"; + sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -199212,6 +200021,7 @@ self: { sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring Cabal directory file-embed filepath mtl process safe split @@ -199245,6 +200055,7 @@ self: { sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory filepath glib gtk json MonadCatchIO-transformers mtl parsec PSQueue stm url utf8-string @@ -199267,6 +200078,7 @@ self: { sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers directory fgl glade graphviz gtk haskell-src ipprint isevaluated lazysmallcheck parallel pretty process @@ -199322,6 +200134,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vivid-osc" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, microspec, time + }: + mkDerivation { + pname = "vivid-osc"; + version = "0.3.0.0"; + sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57"; + libraryHaskellDepends = [ base binary bytestring cereal time ]; + testHaskellDepends = [ base bytestring cereal microspec time ]; + description = "Open Sound Control encode/decode"; + license = "GPL"; + }) {}; + "vk-aws-route53" = callPackage ({ mkDerivation, aws, base, bytestring, containers, http-conduit , http-types, old-locale, resourcet, text, time, xml-conduit @@ -199447,6 +200272,7 @@ self: { pname = "vte"; version = "0.13.1.1"; sha256 = "0cajvmnbkbqvkm3kngp7zscrjnzyf287rk6x2lnbwixg4sk9k1n3"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; @@ -199464,6 +200290,7 @@ self: { pname = "vtegtk3"; version = "0.13.1.1"; sha256 = "0rrhca2850dc84sg5gn8dghsn8yk02da1rj7xzjazpmd9lkgwqas"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; @@ -199484,10 +200311,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.15.1"; - sha256 = "0ba8qnb59ixg9czfj71ckh82p7kkwgnhwh6c69bkjhy0f7g36hr4"; - revision = "1"; - editedCabalFile = "0bcvqvhmsj8fbxs19nwy80acjdp1dsphgfzj2xkj8kkxaw08s2g8"; + version = "5.16"; + sha256 = "1zxjr4g7xl50zhjpbzk1a16cp2i1k75abpkna2q37hy1ss6sw637"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199510,6 +200335,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_17" = 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.17"; + sha256 = "19dn80mxdd4w68cp21x7rnish5ph9bajzhcrz9mgxc7274g81kwr"; + 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 @@ -199547,9 +200408,9 @@ self: { }) {}; "vty-ui" = callPackage - ({ mkDerivation, array, base, containers, data-default, directory - , filepath, mtl, QuickCheck, random, regex-base, stm, text, unix - , vector, vty + ({ mkDerivation, array, base, bytestring, containers, data-default + , directory, filepath, mtl, QuickCheck, random, regex-base, stm + , text, time, unix, vector, vty }: mkDerivation { pname = "vty-ui"; @@ -199557,11 +200418,14 @@ self: { sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers data-default directory filepath mtl regex-base stm text unix vector vty ]; - executableHaskellDepends = [ base QuickCheck random text vty ]; + executableHaskellDepends = [ + base bytestring mtl QuickCheck random text time vty + ]; homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; @@ -199654,6 +200518,7 @@ self: { sha256 = "0x7yh4g4jprc34pr6i50c8xyx9w6rjl6i2y6zwnkzydv7msf0d76"; revision = "1"; editedCabalFile = "1kdszyxp0i4f8yi7831x7vc4q55677ab2rj4fign77m0xk6cnphl"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base data-default-class kansas-comet natural-transformation remote-monad scotty semigroups stm text wai-middleware-static @@ -199732,7 +200597,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "File/CGI/Rev Proxy App of WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-app-static" = callPackage @@ -199814,6 +200678,7 @@ self: { pname = "wai-cors"; version = "0.2.5"; sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive http-types mtl transformers wai @@ -199826,7 +200691,6 @@ self: { homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-devel" = callPackage @@ -199874,7 +200738,6 @@ 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 @@ -200225,8 +201088,8 @@ self: { }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.1.2.0"; - sha256 = "04lkj70lirgz8aj8zis23rd5an0xk0kskl94hvmm84jmq34s92cb"; + version = "0.1.2.1"; + sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200242,7 +201105,6 @@ self: { ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "wai-middleware-cache" = callPackage @@ -200359,7 +201221,8 @@ self: { ({ mkDerivation, async, base, base-prelude, bytestring, conduit , conduit-extra, consul-haskell, enclosed-exceptions, http-client , http-types, monad-control, monad-logger, network, process - , resourcet, text, transformers, void, wai, wai-conduit + , resourcet, text, transformers, void, wai, wai-app-static + , wai-conduit, wai-extra, warp }: mkDerivation { pname = "wai-middleware-consul"; @@ -200373,6 +201236,10 @@ self: { monad-control monad-logger network process resourcet text transformers void wai wai-conduit ]; + executableHaskellDepends = [ + async base base-prelude monad-logger transformers wai + wai-app-static wai-extra warp + ]; homepage = "https://github.com/fpco/wai-middleware-consul"; description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; @@ -200527,6 +201394,9 @@ self: { cryptohash http-client http-types mtl old-locale time transformers word8 ]; + executableHaskellDepends = [ + base bytestring http-client transformers + ]; description = "WAI HMAC Authentication Middleware Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -200549,6 +201419,7 @@ 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 @@ -200613,30 +201484,6 @@ self: { }) {}; "wai-middleware-rollbar" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hostname, http-client, http-conduit, http-types, lens - , lens-aeson, network, QuickCheck, text, time, unordered-containers - , uuid, wai - }: - mkDerivation { - pname = "wai-middleware-rollbar"; - version = "0.3.0"; - sha256 = "001j9hjgny8f8hxxfr71r4b84dc696x5dsr8a08yqmfkjqmn6zy9"; - 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 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; - }) {}; - - "wai-middleware-rollbar_0_4_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 @@ -200658,7 +201505,6 @@ self: { 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 @@ -200704,7 +201550,6 @@ self: { homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-static-caching" = callPackage @@ -200769,8 +201614,9 @@ self: { "wai-middleware-verbs" = callPackage ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, transformers + , mmorph, monad-logger, mtl, resourcet, text, transformers , transformers-base, unordered-containers, wai + , wai-middleware-content-type, wai-transformers, warp }: mkDerivation { pname = "wai-middleware-verbs"; @@ -200782,8 +201628,14 @@ self: { base errors exceptions hashable http-types mmorph monad-logger mtl resourcet transformers transformers-base unordered-containers wai ]; + executableHaskellDepends = [ + base errors exceptions hashable http-types mmorph monad-logger mtl + resourcet text transformers transformers-base unordered-containers + wai wai-middleware-content-type wai-transformers warp + ]; description = "Route different middleware responses based on the incoming HTTP verb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -200809,6 +201661,30 @@ self: { 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 + , transformers, vault, vector, wai + }: + mkDerivation { + pname = "wai-predicates"; + version = "0.10.0"; + sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion case-insensitive + cookie http-types singletons text 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"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-request-spec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, http-types, text, wai @@ -200860,6 +201736,26 @@ self: { 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 + }: + mkDerivation { + pname = "wai-route"; + version = "0.3.1.2"; + sha256 = "1biiq5p8aa7icsafslgnnnv5n43v7gizz69y1snyxph5n0n7sl81"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-router" = callPackage ({ mkDerivation, base, text, wai }: mkDerivation { @@ -200874,32 +201770,6 @@ self: { }) {}; "wai-routes" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, data-default-class - , filepath, hspec, hspec-wai, hspec-wai-json, http-types - , mime-types, monad-loops, mtl, path-pieces, random - , template-haskell, text, vault, wai, wai-app-static, wai-extra - }: - mkDerivation { - pname = "wai-routes"; - version = "0.9.10"; - sha256 = "0wjn4lz3vixdysizph7an4b23cz364minhp4qcd5qk7n46136wp8"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive containers - cookie data-default-class filepath http-types mime-types - monad-loops mtl path-pieces random template-haskell text vault wai - wai-app-static wai-extra - ]; - testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json text wai - ]; - homepage = "https://ajnsit.github.io/wai-routes/"; - description = "Typesafe URLs for Wai applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "wai-routes_0_10_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types @@ -200922,7 +201792,6 @@ 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 @@ -201245,7 +202114,7 @@ self: { "waitra" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-types, regex-applicative, tasty, tasty-hunit - , template-haskell, text, wai, wai-extra + , template-haskell, text, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "waitra"; @@ -201259,6 +202128,7 @@ self: { aeson base bytestring directory filepath http-types regex-applicative template-haskell text wai ]; + executableHaskellDepends = [ aeson base wai wai-app-static warp ]; testHaskellDepends = [ aeson base http-types tasty tasty-hunit wai wai-extra ]; @@ -201282,6 +202152,7 @@ self: { sha256 = "0r0lqy3vqs3ypxf0v6xwyarj5rxjf9f19x6b48rhj32z8x9d0isq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base blaze-builder browscap bytestring case-insensitive conduit conduit-extra deepseq directory @@ -201323,21 +202194,20 @@ self: { "warc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions - , filepath, free, lens, mmorph, optparse-applicative, pipes - , pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time - , transformers + , filepath, free, hashable, lens, mmorph, optparse-applicative + , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time + , transformers, unordered-containers }: mkDerivation { pname = "warc"; - version = "0.3.1"; - sha256 = "044mvpwzgcqzj0zbmlb6v0nx5s2jqw5r9na1m94fxzk571am51rb"; - revision = "1"; - editedCabalFile = "0xmwmi3wqyrpci2zm50kvvyzdyqsblaarm6zz7rjky4qykc12kqr"; + version = "1.0.1"; + sha256 = "0vwml51prp730n5dmdla4s2116slp0wqg195b7psv4a3yqfx7v7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring errors free lens mmorph pipes + attoparsec base bytestring errors free hashable lens mmorph pipes pipes-attoparsec pipes-bytestring text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring errors exceptions filepath free lens @@ -201351,42 +202221,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP - , http-date, http-types, http2, HUnit, iproute, lifted-base - , network, process, QuickCheck, silently, simple-sendfile, stm - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.12"; - sha256 = "04d7hfh52j0j241jn5yffng6iyf2hrfimn82pdrq0hz94giffg73"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers criterion hashable http-date - http-types network unix unix-compat - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_13" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP @@ -201420,7 +202254,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -201464,23 +202297,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.2.3"; - sha256 = "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls wai warp - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp-tls_3_2_4" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, wai, warp }: @@ -201495,13 +202311,12 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, certificate, conduit - , crypto-random, network, network-conduit, pem, tls, tls-extra - , unix, wai, warp + , crypto-random, http-types, network, network-conduit, pem, tls + , tls-extra, unix, wai, warp }: mkDerivation { pname = "warp-tls-uid"; @@ -201513,6 +202328,10 @@ self: { base bytestring certificate conduit crypto-random network network-conduit pem tls tls-extra unix wai warp ]; + executableHaskellDepends = [ + base bytestring certificate conduit crypto-random http-types + network network-conduit pem tls tls-extra unix wai warp + ]; description = "set group and user id before running server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -201529,7 +202348,6 @@ self: { libraryHaskellDepends = [ base mtl time ]; description = "Simple control structure to re-try an action with exponential backoff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "watcher" = callPackage @@ -201599,6 +202417,7 @@ self: { pname = "wave"; version = "0.1.5"; sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers ]; @@ -201609,7 +202428,6 @@ self: { homepage = "https://github.com/mrkkrp/wave"; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -201688,7 +202506,9 @@ self: { }) {}; "wcwidth" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, attoparsec, base, bytestring, containers + , setlocale, utf8-string + }: mkDerivation { pname = "wcwidth"; version = "0.0.2"; @@ -201696,6 +202516,9 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ + attoparsec base bytestring containers setlocale utf8-string + ]; homepage = "http://github.com/solidsnack/wcwidth/"; description = "Native wcwidth"; license = stdenv.lib.licenses.bsd3; @@ -201797,7 +202620,6 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -201858,7 +202680,6 @@ self: { homepage = "http://hub.darcs.net/ertes/web-page"; description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-plugins" = callPackage @@ -201898,27 +202719,6 @@ self: { }) {}; "web-routes" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; - version = "0.27.11"; - sha256 = "1n4cvqbbnjhliy9080fff7nfn9x073vnp8vj7mh0ja4ii96lsqj5"; - revision = "1"; - editedCabalFile = "1kq9x2s1z2l9ldsbmzl29b4xbpv1w3ls98ca76d8d4dnwg5va14a"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck text ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes_0_27_12" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck , split, text, utf8-string @@ -201937,7 +202737,6 @@ self: { homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-boomerang" = callPackage @@ -201959,8 +202758,8 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.10"; - sha256 = "1vgvbbrnvqwh7caxsr4fszks2f7jvr75ly6i86zks6x9rqvz7fx7"; + version = "0.23.11"; + sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y"; libraryHaskellDepends = [ base bytestring happstack-server text web-routes ]; @@ -202023,8 +202822,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.1"; - sha256 = "1li1mb6h14gw2lr2fvv7cc6ykqh5l5zx0k956fasc8h9w2xlg6r4"; + version = "0.22.6.2"; + sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -202100,6 +202899,7 @@ self: { homepage = "https://github.com/airalab/hs-web3#readme"; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webapi" = callPackage @@ -202258,7 +203058,6 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -202281,7 +203080,6 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-snoy" = callPackage @@ -202371,7 +203169,6 @@ self: { homepage = "http://github.com/ananthakumaran/webify"; description = "webfont generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webkit" = callPackage @@ -202382,6 +203179,7 @@ self: { pname = "webkit"; version = "0.14.2.1"; sha256 = "0l7ml6pfx63fz3gaay9krbksz7y15zv6aq2zr1g29x6yv6kz43mq"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk mtl pango text transformers @@ -202418,32 +203216,31 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk24x, webkitgtk24x-gtk3 + , webkitgtk24x-gtk3 }: mkDerivation { pname = "webkitgtk3"; version = "0.14.2.1"; sha256 = "1xml39120yng7pgdpaz114zc2vcq7kxi5v1gdlfarzdvxxsw8wba"; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x - , webkitgtk24x-gtk3 + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 }: mkDerivation { pname = "webkitgtk3-javascriptcore"; @@ -202451,11 +203248,11 @@ self: { sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: @@ -202530,6 +203327,10 @@ self: { 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 @@ -202542,7 +203343,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets_0_11_2_0" = callPackage + "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 @@ -202551,8 +203352,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.11.2.0"; - sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq"; + version = "0.12.2.0"; + sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202560,6 +203361,10 @@ self: { case-insensitive containers entropy network random SHA streaming-commons 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 @@ -202580,19 +203385,25 @@ self: { "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty - , tasty-quickcheck, text, transformers, unordered-containers - , wai-transformers, websockets + , 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.0.2"; - sha256 = "04narwk3nxrbxjw7vlypg4bgb4z8pnymdqsc0c93hybfir00n43q"; + version = "0.4.0"; + sha256 = "13rvlh5yvznm8f6x8yiqghnrwn6gyr0xcqzvs338lvsaqanggg0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers exceptions mtl QuickCheck - stm text transformers unordered-containers wai-transformers + 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 = [ @@ -202604,7 +203415,7 @@ self: { "websockets-rpc_0_6_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , exceptions, hashable, monad-control, mtl, QuickCheck + , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck , quickcheck-instances, stm, tasty, tasty-quickcheck, text , transformers, unordered-containers, uuid, wai-transformers , websockets, websockets-simple @@ -202621,6 +203432,10 @@ self: { unordered-containers uuid wai-transformers websockets websockets-simple ]; + executableHaskellDepends = [ + aeson async base exceptions MonadRandom mtl wai-transformers + websockets websockets-simple + ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck ]; @@ -202630,6 +203445,23 @@ self: { }) {}; "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 @@ -202655,15 +203487,14 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.2"; - sha256 = "1n3qfrbkqnn4c9bdkq0wdpgs98drmqqxqv9vz18fsz3s26vvphxw"; + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -202721,18 +203552,19 @@ self: { }) {}; "weeder" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, extra, filepath - , hashable, process, text, unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml }: mkDerivation { pname = "weeder"; - version = "0.1.6"; - sha256 = "1ss78jqiygypr8j4n2nj9b5dhxly6gmnf5qlil4cj8kb0pzr1q7b"; + version = "0.1.7"; + sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring cmdargs extra filepath hashable process text - unordered-containers vector yaml + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml ]; homepage = "https://github.com/ndmitchell/weeder#readme"; description = "Detect dead code"; @@ -202740,17 +203572,20 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, deepseq, mtl, process, split - , template-haskell, temporary + ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl + , process, random, split, template-haskell, temporary + , unordered-containers }: mkDerivation { pname = "weigh"; - version = "0.0.4"; - sha256 = "1qzc3h3a8z4wmv2mgmaq6k971xiiyp58qr36i7j1nh5187ihqdib"; + version = "0.0.5"; + sha256 = "0s4bk2bglc5bf569zrbap7h6svd96sfgmvmrx57xwyinard7jfz9"; libraryHaskellDepends = [ base deepseq mtl process split template-haskell temporary ]; - testHaskellDepends = [ base deepseq ]; + 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; @@ -202945,6 +203780,7 @@ self: { sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers GLUT mtl OpenGL process random X11 ]; @@ -202974,6 +203810,7 @@ self: { sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ haskell98 random ]; homepage = "https://github.com/haroldl/whitespace-nd"; description = "Whitespace, an esoteric programming language"; @@ -203054,8 +203891,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.8"; - sha256 = "18wl7g42lmjjl1kfvmq3j8kxsrwrm6x64m09gggb9kmd19a7fl34"; + version = "0.1.0.9"; + sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -203111,6 +203948,7 @@ self: { pname = "wild-bind-indicator"; version = "0.1.0.1"; sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers gtk text transformers wild-bind ]; @@ -203142,8 +203980,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.6"; - sha256 = "1d74735cycjm6zbv273ndwc4flxway5v5cyaapd01vmc6cl4n50y"; + version = "0.1.0.7"; + sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -203241,7 +204079,6 @@ 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 @@ -203260,6 +204097,7 @@ self: { homepage = "https://github.com/esoeylemez/wires"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiring" = callPackage @@ -203277,7 +204115,6 @@ 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 @@ -203293,7 +204130,6 @@ self: { homepage = "https://github.com/ppelleti/hs-wiringPi"; description = "Access GPIO pins on Raspberry Pi via wiringPi library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "with-location" = callPackage @@ -203315,8 +204151,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4"; - sha256 = "0zr6zqkhflgynfhsc6wqly35psxw97nrna7pmc2141p5zk4dsgm1"; + version = "0.2.4.1"; + sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -203418,24 +204254,6 @@ self: { }) {}; "wl-pprint-annotated" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "wl-pprint-annotated"; - version = "0.0.1.4"; - sha256 = "1c28m1xww44wynyfpyqfh39y84dw69l1vi3pd3c1sxwlp2bwh689"; - libraryHaskellDepends = [ base containers deepseq text ]; - testHaskellDepends = [ - base containers deepseq HUnit test-framework test-framework-hunit - text - ]; - homepage = "https://github.com/minad/wl-pprint-annotated#readme"; - description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wl-pprint-annotated_0_1_0_0" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit , text }: @@ -203450,7 +204268,6 @@ self: { homepage = "https://github.com/minad/wl-pprint-annotated#readme"; description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-ansiterm" = callPackage @@ -203517,6 +204334,7 @@ self: { pname = "wl-pprint-terminfo"; version = "3.7.1.4"; sha256 = "084d70plp3d9629aznrk5nxkg0hg7yr76iyi74gcby633xbvmniw"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers nats semigroups terminfo text transformers wl-pprint-extras @@ -203632,8 +204450,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.21"; - sha256 = "0gqiqqmm72fhkdax8p27mhpsl2f91zkqaj6xlwdhmbljfhb8ilhp"; + version = "0.3.26"; + sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203688,6 +204506,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word-wrap" = callPackage + ({ mkDerivation, base, criterion, hspec, text }: + mkDerivation { + pname = "word-wrap"; + version = "0.4.1"; + sha256 = "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb"; + revision = "1"; + editedCabalFile = "1k4w4g053vhmpp08542hrqaw81p3p35i567xgdarqmpghfrk68pp"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://github.com/jtdaugherty/word-wrap/"; + description = "A library for word-wrapping"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "word24" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -203704,15 +204538,14 @@ self: { homepage = "https://github.com/winterland1989/word24"; description = "24-bit word and int types for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "word8" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec }: mkDerivation { pname = "word8"; - version = "0.1.2"; - sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw"; + version = "0.1.3"; + sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -203727,8 +204560,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.0.5"; - sha256 = "0841dzjxnj9hm2lm31sa7xabaywdpnjjksy1c7b4idirdpmz9rhd"; + version = "0.1.1.1"; + sha256 = "1n1frb1c3fv808sb5w7j8gv86pva7fryq6f3j2c7z1p32v9xcnza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203787,6 +204620,7 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "words" = callPackage @@ -203795,6 +204629,7 @@ self: { pname = "words"; version = "0.1.2"; sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory text ]; description = "Cross-platform access to a list of words"; license = stdenv.lib.licenses.bsd3; @@ -203936,13 +204771,18 @@ self: { }) {}; "workflow-windows" = callPackage - ({ mkDerivation, base, doctest, hspec, QuickCheck }: + ({ mkDerivation, base, c-storable-deriving, doctest, free, hspec + , QuickCheck, StateVar, transformers, workflow-types + }: mkDerivation { pname = "workflow-windows"; version = "0.0.0"; sha256 = "14pzzm7c17sg76lmxjaw0d5avgpafgj4q66diqmh502mx8k2z4jc"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base c-storable-deriving free StateVar transformers workflow-types + ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; homepage = "http://github.com/sboosali/workflow-windows#readme"; @@ -204014,44 +204854,45 @@ self: { "wrecker" = callPackage ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array - , base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, clock, clock-extras, connection, containers - , cookie, cryptonite, data-default, data-default-class, deepseq - , exceptions, filepath, hspec, hspec-discover, http-client - , http-types, immortal, lens, markdown-unlit, memory, mime-types - , network, network-uri, next-ref, optparse-applicative, random - , scotty, statistics, stm, stm-chans, streaming-commons, tabular - , text, threads, threads-extras, time, tls, transformers - , unagi-chan, unix, unordered-containers, vector, vty, wai, warp - , wreq + , authenticate-oauth, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, clock, clock-extras, connection + , containers, cookie, cryptonite, data-default, data-default-class + , deepseq, exceptions, filepath, hspec, hspec-discover, http-client + , http-client-tls, http-types, immortal, lens, markdown-unlit + , memory, mime-types, network, network-uri, next-ref + , optparse-applicative, random, scotty, statistics, stm, stm-chans + , streaming-commons, tabular, tdigest, text, threads + , threads-extras, time, tls, transformers, unagi-chan, unix + , unordered-containers, vector, vty, wai, warp, wreq }: mkDerivation { pname = "wrecker"; - version = "0.1.3.3"; - sha256 = "1bg4f0i74r82a21dv13ir3j05czkld4lcrvz4ib55lb5jsngqsdy"; + version = "1.0.0.2"; + sha256 = "0ydmwxixgxryiq4nf4lxds30zmx4hhhm1w6fyk4h1hva01vrybr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal ansigraph array base base64-bytestring - blaze-builder bytestring case-insensitive clock clock-extras - connection containers cookie cryptonite data-default + aeson ansi-terminal ansigraph array authenticate-oauth base + base64-bytestring blaze-builder bytestring case-insensitive clock + clock-extras connection containers cookie cryptonite data-default data-default-class deepseq exceptions filepath http-client - http-types immortal memory mime-types network network-uri next-ref - optparse-applicative random statistics stm stm-chans - streaming-commons tabular text threads threads-extras time tls - transformers unagi-chan unix unordered-containers vector vty wreq + http-client-tls http-types immortal memory mime-types network + network-uri next-ref optparse-applicative random statistics stm + stm-chans streaming-commons tabular tdigest text threads + threads-extras time tls transformers unagi-chan unix + unordered-containers vector vty wreq ]; executableHaskellDepends = [ - aeson aeson-qq base bytestring connection http-client immortal lens - markdown-unlit network next-ref optparse-applicative scotty text - transformers wai warp wreq + aeson aeson-qq base bytestring connection http-client + http-client-tls immortal lens markdown-unlit network next-ref + optparse-applicative scotty text transformers wai warp wreq ]; testHaskellDepends = [ aeson aeson-qq base bytestring connection hspec hspec-discover http-client immortal markdown-unlit network next-ref scotty text transformers unordered-containers wai warp wreq ]; - homepage = "https://github.com/skedgeme/wrecker#readme"; + homepage = "https://github.com/lorenzo/wrecker#readme"; description = "An HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -204095,6 +204936,45 @@ 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 @@ -204138,12 +205018,13 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.5.0.1"; - sha256 = "0nwn7y593hxf971h0pr7l7l76wl6nmb622yasirzczx8qxvmr5ya"; + version = "0.5.1.0"; + sha256 = "1f23f1dxim8xkx7jj0z7fr4xjpmxc8cr0rbh84hhb359mkfklhvf"; 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 @@ -204154,6 +205035,7 @@ self: { pname = "wright"; version = "0.1.0.2"; sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bed-and-breakfast containers ]; testHaskellDepends = [ assertions base bed-and-breakfast containers filepath lens @@ -204240,7 +205122,6 @@ self: { homepage = "https://github.com/minad/writer-cps-monads-tf#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-morph" = callPackage @@ -204337,6 +205218,7 @@ self: { ]; description = "WSDL parsing in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wsedit" = callPackage @@ -204474,8 +205356,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.4"; - sha256 = "0nzxbnab5gskgp9aixnpszhr9lw6yni64qqx4w5hab3mj6gindkm"; + version = "1.1.5"; + sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -204490,11 +205372,11 @@ self: { pname = "wx"; version = "0.92.3.0"; sha256 = "04ccw9g8a08ipp4r1282jzgmx0lvxsbwgiasxq7ivij133mspjxx"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base stm time wxcore ]; homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -204505,11 +205387,11 @@ self: { sha256 = "16rixql7ixcdmxcayzrqswc4fcj6wdq513cl8qr66hwqyq2k0525"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base directory random wx wxcore ]; homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -204548,6 +205430,8 @@ self: { pname = "wxc"; version = "0.92.3.0"; sha256 = "0i7z4avy57qzrykz3kddfn313zddp3lnyl9a0krx5f2k3b2pz8i8"; + revision = "1"; + editedCabalFile = "1cgq577ddskmp1xdlnlz0581r8hsqblgxc7wy0avb7sgf181cbd4"; setupHaskellDepends = [ base bytestring Cabal directory filepath process split ]; @@ -204560,7 +205444,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -204582,7 +205465,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -204601,7 +205483,6 @@ 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 @@ -204612,6 +205493,7 @@ self: { sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base wx wxcore ]; homepage = "http://github.com/elbrujohalcon/wxhnotepad"; description = "An example of how to implement a basic notepad with wxHaskell"; @@ -204721,7 +205603,6 @@ self: { homepage = "http://redmine.iportnov.ru/projects/x11-xinput"; description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage @@ -204731,8 +205612,10 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.6.5"; - sha256 = "10s77746vq3w06q66dy0pcis4dbvwf2wix59yaajgar39qhr8f5m"; + version = "1.7.2"; + sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw"; + revision = "1"; + editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -204748,16 +205631,18 @@ self: { "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, directory, filepath, mtl, pem, x509 + , containers, cryptonite, directory, filepath, mtl, pem, tasty + , tasty-hunit, x509 }: mkDerivation { pname = "x509-store"; - version = "1.6.2"; - sha256 = "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9"; + version = "1.6.5"; + sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite directory filepath mtl pem x509 ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 collection accessing and storing methods"; license = stdenv.lib.licenses.bsd3; @@ -204769,8 +205654,8 @@ self: { }: mkDerivation { pname = "x509-system"; - version = "1.6.4"; - sha256 = "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr"; + version = "1.6.6"; + sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"; libraryHaskellDepends = [ base bytestring containers directory filepath mtl pem process x509 x509-store @@ -204787,8 +205672,8 @@ self: { }: mkDerivation { pname = "x509-util"; - version = "1.6.1"; - sha256 = "1387r62y1dj5bx9xvlacbcigsk8zz6cb99q61zxpsfv3ij6khd6m"; + version = "1.6.4"; + sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -204798,22 +205683,29 @@ 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 ({ mkDerivation, asn1-encoding, asn1-types, base, byteable , bytestring, containers, cryptonite, data-default-class, hourglass - , memory, mtl, pem, x509, x509-store + , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store }: mkDerivation { pname = "x509-validation"; - version = "1.6.5"; - sha256 = "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi"; + version = "1.6.9"; + sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44"; + revision = "1"; + editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax"; libraryHaskellDepends = [ asn1-encoding asn1-types base byteable bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 x509-store ]; + testHaskellDepends = [ + asn1-encoding asn1-types base bytestring cryptonite + data-default-class hourglass tasty tasty-hunit x509 x509-store + ]; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; @@ -204912,7 +205804,6 @@ self: { homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -204923,6 +205814,7 @@ self: { sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process unix ]; executableHaskellDepends = [ base directory filepath process unix @@ -204972,7 +205864,6 @@ 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 @@ -205023,27 +205914,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, criterion, deepseq - , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector - , weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.1"; - sha256 = "1mg2imqwdcyrayvn5593da36k10vgn0a91f7igdzqp8dkjirq7p6"; - 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_2" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector , weigh, xml @@ -205062,7 +205932,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 @@ -205307,7 +206176,6 @@ self: { benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -205376,34 +206244,6 @@ self: { }) {}; "xlsx" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, errors, extra, filepath - , groom, lens, mtl, mtl-compat, network-uri, old-locale - , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xml-conduit - , zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.4.3"; - sha256 = "184r0qg5zaw6jqsmr13rbd9svhd9b8smin30kihxim73ifkg2qhq"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default errors extra filepath lens mtl mtl-compat network-uri - old-locale safe text time transformers vector xml-conduit - zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck text time vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xlsx_0_6_0" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath , groom, lens, mtl, mtl-compat, network-uri, old-locale @@ -205429,7 +206269,6 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-tabular" = callPackage @@ -205522,8 +206361,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.4.0.4"; - sha256 = "1z2j5laqzppd9bakq1b1qiy1pz461x4zq9hxffsp2nppsdwq418i"; + 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 @@ -205538,20 +206377,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xml-conduit_1_5_1" = callPackage + "xml-conduit_1_6_0" = 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 + , data-default-class, deepseq, hspec, HUnit, monad-control + , resourcet, text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.5.1"; - sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks"; + version = "1.6.0"; + sha256 = "042cq7i988jxfwayndzpk2mygfs73709xmzi875imhmar10nv914"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default deepseq monad-control - resourcet text transformers xml-types + conduit conduit-extra containers data-default-class deepseq + monad-control resourcet text transformers xml-types ]; testHaskellDepends = [ base blaze-markup bytestring conduit containers hspec HUnit @@ -205686,8 +206525,8 @@ self: { pname = "xml-hamlet"; version = "0.4.1"; sha256 = "1fy29sxby4z6dby518x4za9bpgnh7aqwpwn365lb384rjpsr1wvx"; - revision = "1"; - editedCabalFile = "0cs0pmz3hlm09nrcdkr8cnj7s9phqi0y1gfvldcqzw6l4h9557aw"; + revision = "2"; + editedCabalFile = "1qlhn3lir1b534mqwxvx5ndnmn4h4qvmd809zapadx8s1q0i0f53"; libraryHaskellDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -205896,6 +206735,7 @@ self: { pname = "xml-push"; version = "0.0.0.18"; sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring crypto-random handle-like monad-control monads-tf peyotls random sasl simple-pipe stm tighttp transformers-base uuid @@ -205982,7 +206822,6 @@ self: { homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-to-json-fast" = callPackage @@ -206100,6 +206939,7 @@ self: { sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base bio bytestring containers directory xhtml ]; @@ -206131,24 +206971,25 @@ self: { "xmlhtml" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, directory, HUnit, parsec, test-framework - , test-framework-hunit, text, unordered-containers + , bytestring, bytestring-builder, containers, directory, hspec + , HUnit, parsec, text, unordered-containers }: mkDerivation { pname = "xmlhtml"; - version = "0.2.4"; - sha256 = "172kwkgpghmda42dj5ppfbdj2m5kh692rlim2hy2x00hzrs06440"; + version = "0.2.5"; + sha256 = "0760gankqpb9ljh5plj8kzfpixh4lq02p8d4h1j0bb6vhxg107df"; libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - parsec text unordered-containers + base blaze-builder blaze-html blaze-markup bytestring + bytestring-builder containers parsec text unordered-containers ]; testHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring directory - HUnit test-framework test-framework-hunit text + base blaze-builder blaze-html blaze-markup bytestring + bytestring-builder directory hspec HUnit text ]; 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 @@ -206162,6 +207003,7 @@ self: { sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base old-locale time xml ]; executableHaskellDepends = [ base bytestring configurator filepath http-client network-uri @@ -206245,6 +207087,7 @@ self: { sha256 = "1jh3lcs20qpna36fa5a0r174xqrsxhj10x1rm5vwf64zariipy7r"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers data-default directory extensible-exceptions filepath mtl process setlocale unix utf8-string X11 @@ -206255,8 +207098,9 @@ self: { ]; postInstall = '' shopt -s globstar - mkdir -p $out/share/man/man1 - mv "$out/"**"/man/"*.1 $out/share/man/man1/ + mkdir -p $doc/share/man/man1 + mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/ + rm "$data/"**"/man/"* ''; homepage = "http://xmonad.org"; description = "A tiling window manager"; @@ -206273,6 +207117,7 @@ self: { sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory extensible-exceptions filepath mtl process unix X11 @@ -206419,18 +207264,20 @@ self: { }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, containers, hspec, process, transformers - , X11, xmonad, xmonad-contrib + ({ mkDerivation, base, composition, containers, hspec, process + , transformers, X11, xmonad, xmonad-contrib }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.2"; - sha256 = "065kcsr7s114sw8g8hdl2i5w0543r9f9ypirvh3bn38x2lv4f9ng"; + version = "0.1.1.4"; + sha256 = "1qbapbb72qa78n174x8y9q2zzb1g1bw6dgg260hxxzc7v9kb88xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers process transformers X11 xmonad xmonad-contrib + base composition containers process transformers X11 xmonad + xmonad-contrib ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec xmonad ]; homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa"; description = "Custom xmonad, which builds with stack or cabal"; @@ -206517,6 +207364,7 @@ self: { pname = "xournal-builder"; version = "0.1.1.1"; sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-builder bytestring double-conversion strict xournal-types @@ -206537,6 +207385,7 @@ self: { sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cairo cmdargs directory filepath HStringTemplate mtl xournal-parser xournal-render xournal-types @@ -206576,6 +207425,7 @@ self: { pname = "xournal-render"; version = "0.6.0"; sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cairo containers fclabels mtl poppler strict TypeCompose xournal-types @@ -206707,11 +207557,11 @@ self: { pname = "xtc"; version = "1.0.1"; sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base wx wxcore ]; homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -206739,7 +207589,6 @@ self: { ]; description = "turtle like LOGO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xxhash" = callPackage @@ -206757,7 +207606,25 @@ self: { ]; description = "A Haskell implementation of the xxHash algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xxhash-ffi" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, digest + , hashable, hspec, murmur-hash, QuickCheck, xxhash + }: + mkDerivation { + pname = "xxhash-ffi"; + version = "0.1.0.1"; + sha256 = "1858lz6w3qabji92vzvqwlg68g0bvy0by2h958rhsaiqd15i1kkx"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq digest hashable murmur-hash + xxhash + ]; + homepage = "https://github.com/haskell-haskey/xxhash-ffi#readme"; + description = "Bindings to the C implementation the xxHash algorithm"; + license = stdenv.lib.licenses.bsd3; }) {}; "y0l0bot" = callPackage @@ -206938,6 +207805,7 @@ self: { pname = "yamemo"; version = "0.6.0"; sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl ]; description = "Simple memoisation function"; license = stdenv.lib.licenses.bsd3; @@ -206952,8 +207820,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.23.1"; - sha256 = "0sv01yzi08mr2r7wkjcrsl5pf02zzv3y2n7amznv0pdj82sw16sa"; + version = "0.8.23.3"; + sha256 = "0hvmxl8krh8m3804d1nrvgmbirvw11a8iy80ciq4rg0csmz5r1fc"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -206981,14 +207849,14 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.0.1"; - sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48"; + version = "1.1"; + sha256 = "045zi5lipnjw161xz2awr5zwnzhiszsrrpwin64q4r5pxjkh7ala"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base doctest tasty tasty-hunit unordered-containers + aeson base doctest tasty tasty-hunit text unordered-containers ]; homepage = "https://github.com/feuerbach/yaml-combinators"; description = "YAML parsing combinators for improved validation and error reporting"; @@ -207108,6 +207976,7 @@ self: { sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring directory filepath text unix unordered-containers vector yaml @@ -207122,7 +207991,6 @@ self: { homepage = "https://github.com/michelk/yaml-union.hs"; description = "Read multiple yaml-files and override fields recursively"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml2owl" = callPackage @@ -207164,7 +208032,7 @@ self: { }) {}; "yampa-canvas" = callPackage - ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: + ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }: mkDerivation { pname = "yampa-canvas"; version = "0.2.2"; @@ -207174,6 +208042,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; + executableHaskellDepends = [ base blank-canvas text Yampa ]; description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -207200,7 +208069,7 @@ self: { "yampa-glut" = callPackage ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space - , Yampa-core + , vector-space-opengl, Yampa-core }: mkDerivation { pname = "yampa-glut"; @@ -207211,9 +208080,14 @@ self: { libraryHaskellDepends = [ base GLUT newtype OpenGL vector-space Yampa-core ]; + executableHaskellDepends = [ + base GLUT newtype OpenGL vector-space vector-space-opengl + Yampa-core + ]; homepage = "https://github.com/ony/yampa-glut"; description = "Connects Yampa and GLUT"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa2048" = callPackage @@ -207233,8 +208107,8 @@ self: { "yandex-translate" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class - , exceptions, lens, lens-aeson, text, transformers - , unordered-containers, wreq + , exceptions, hspec, hspec-core, lens, lens-aeson, text + , transformers, unordered-containers, wreq }: mkDerivation { pname = "yandex-translate"; @@ -207244,6 +208118,9 @@ self: { aeson base bytestring data-default-class exceptions lens lens-aeson text transformers unordered-containers wreq ]; + testHaskellDepends = [ + base data-default-class hspec hspec-core lens text transformers + ]; description = "Bindings to Yandex translate API"; license = stdenv.lib.licenses.mit; }) {}; @@ -207276,21 +208153,20 @@ self: { }) {}; "yarn-lock" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, megaparsec - , protolude, tasty, tasty-hunit, tasty-th, text + ({ mkDerivation, ansi-wl-pprint, base, containers, either + , megaparsec, neat-interpolation, protolude, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text }: mkDerivation { pname = "yarn-lock"; - version = "0.2.0"; - sha256 = "0jily4hrxbj487450amx6nayxpcm0giwrv0zn3mld906lqr2f990"; - revision = "1"; - editedCabalFile = "1ji64dab6wf59l9yi1czm81xgnx86qgvcawnxwa83wp1fa3flics"; + version = "0.3.1"; + sha256 = "0plsv7qhl43y85dwzybbik2fx1bm23lz8m5l1fyhd363v9f2df7x"; libraryHaskellDepends = [ - base containers megaparsec protolude text + base containers either megaparsec protolude text ]; testHaskellDepends = [ - ansi-wl-pprint base containers megaparsec protolude tasty - tasty-hunit tasty-th text + ansi-wl-pprint base containers either megaparsec neat-interpolation + protolude tasty tasty-hunit tasty-quickcheck tasty-th text ]; homepage = "https://github.com/Profpatsch/yarn-lock#readme"; description = "Represent and parse yarn.lock files"; @@ -207357,6 +208233,7 @@ self: { sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base event-driven filepath monads-tf regexpr ]; @@ -207372,6 +208249,7 @@ self: { pname = "ycextra"; version = "0.1"; sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers csv mtl uniplate yhccore ]; @@ -207584,6 +208462,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_17_3" = 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.17.3"; + sha256 = "16z4rqzy8gzri6sbgm5cx3vm44myx2bzydfyhi91yd6ravi7rc9i"; + 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 @@ -207708,7 +208616,6 @@ self: { homepage = "https://github.com/psibi/yesod-auth-fb"; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hashdb" = callPackage @@ -207735,7 +208642,6 @@ self: { homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hmac-keccak" = callPackage @@ -207745,8 +208651,9 @@ self: { }: mkDerivation { pname = "yesod-auth-hmac-keccak"; - version = "0.0.0.2"; - sha256 = "005v6wr9xw6lm4w7nm9pbbyp5j458dcyshk8yh3vlpf7sj29cya6"; + version = "0.0.0.3"; + sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cryptonite mtl persistent random shakespeare text yesod-auth yesod-core yesod-form yesod-persistent yesod-static @@ -207825,6 +208732,7 @@ self: { homepage = "http://github.com/mulderr/yesod-auth-ldap-native"; description = "Yesod LDAP authentication plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-nopassword" = callPackage @@ -207863,15 +208771,15 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , hspec, http-client, http-conduit, http-types, lifted-base - , network-uri, random, text, transformers, vector, yesod-auth - , yesod-core, yesod-form + ({ mkDerivation, aeson, authenticate, base, bytestring, containers + , hoauth2, hspec, http-client, http-conduit, http-types + , lifted-base, load-env, network-uri, random, text, transformers + , vector, warp, yesod, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.2.2"; - sha256 = "0cswp2kkw14g64axbzncnckrlfxnvdjgppjwwm60i4n9y2zg6xk2"; + version = "0.2.4"; + sha256 = "1gpyra5j6hi25r0hrjifjmkar8yb0f74cln4rygdjsvczllkri9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207879,6 +208787,9 @@ self: { http-types lifted-base network-uri random text transformers vector yesod-auth yesod-core yesod-form ]; + executableHaskellDepends = [ + base containers http-conduit load-env text warp yesod yesod-auth + ]; testHaskellDepends = [ base hspec ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; @@ -207954,8 +208865,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.2.3"; - sha256 = "1xi3s79j14sa7wav8i1vpp14ry2jgkrbvich13yccd3qkmbw7azf"; + version = "1.5.2.5"; + sha256 = "0jwnjxfb6s2gcx66am74hpq38fv3svgp1a08yf4610g6fskhkx4n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -208086,10 +208997,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.35"; - sha256 = "1wawpd2pwqn535zrs5wz43jvi0bca0q2kinml6waw5d4s7m0npby"; - revision = "1"; - editedCabalFile = "1cgizphqsjd6qmz7xa1flcg064rg5543shybqx6l2npyr21h67yk"; + version = "1.4.36"; + sha256 = "0pjhpqqsgkkccg269i5q8xngzk1lh945acnlfdjd429xjrpcmfir"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -208174,7 +209083,6 @@ self: { ]; description = "Add CSP headers to Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-datatables" = callPackage @@ -208305,6 +209213,7 @@ self: { sha256 = "1z56y5l6mgwi7ghcn1ycxhgpzximg0fbs652jlaxdy03rzxizv29"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal base bytestring directory filepath fsnotify Glob optparse-applicative process pureMD5 stm system-filepath temporary @@ -208333,6 +209242,7 @@ self: { homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -208350,7 +209260,6 @@ self: { homepage = "https://github.com/psibi/yesod-fb"; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form" = callPackage @@ -208362,8 +209271,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.12"; - sha256 = "0lcakfc0x17ng5kk1ahmd9m8nlbzll8mxw7fzxw2y48vak0kh5kk"; + version = "1.4.13"; + sha256 = "0yq98rk81nilm39djpwl2kvr83j96yakc1ysyy3zgywb2k1ncvqk"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -208377,6 +209286,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_4_15" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.15"; + sha256 = "107ddpngzwzmslrv1cc82fx775icvjpbsgjhinj7cnmpi3paq3w3"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-form-bootstrap4" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "0.1.0.1"; + sha256 = "0z555456ryfgs3ir0h139cfap61hmshywbd8wq7xsc4kf52yl44a"; + libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -208399,8 +209345,8 @@ self: { }: mkDerivation { pname = "yesod-form-richtext"; - version = "0.1.0.1"; - sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y"; + version = "0.1.0.2"; + sha256 = "0im3yfy0sdx60hn5cynh8pxp1fq2f64xgaizhxk0rd824i34lycn"; libraryHaskellDepends = [ base blaze-builder blaze-html shakespeare text xss-sanitize yesod-core yesod-form @@ -208480,9 +209426,11 @@ self: { }) {}; "yesod-job-queue" = callPackage - ({ mkDerivation, aeson, api-field-json-th, base, bytestring, cron - , file-embed, hedis, lens, monad-control, monad-logger, stm, text - , time, transformers, uuid, yesod, yesod-core, yesod-persistent + ({ mkDerivation, aeson, api-field-json-th, base, bytestring + , classy-prelude-yesod, cron, file-embed, hedis, lens + , monad-control, monad-logger, persistent-sqlite, resourcet, stm + , text, time, transformers, uuid, yesod, yesod-core + , yesod-persistent }: mkDerivation { pname = "yesod-job-queue"; @@ -208495,11 +209443,14 @@ self: { monad-control monad-logger stm text time transformers uuid yesod yesod-core yesod-persistent ]; + executableHaskellDepends = [ + base classy-prelude-yesod hedis monad-logger persistent-sqlite + resourcet yesod yesod-core + ]; testHaskellDepends = [ base ]; 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 @@ -208539,9 +209490,14 @@ self: { }) {}; "yesod-mangopay" = callPackage - ({ mkDerivation, base, containers, http-conduit, http-types - , lifted-base, mangopay, persistent-template, text, time, yesod - , yesod-core + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , containers, country-codes, data-default, directory, fast-logger + , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay + , monad-control, monad-logger, persistent, persistent-postgresql + , persistent-template, resourcet, shakespeare, template-haskell + , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod + , yesod-auth, yesod-core, yesod-form, yesod-persistent + , yesod-static }: mkDerivation { pname = "yesod-mangopay"; @@ -208553,6 +209509,15 @@ self: { base containers http-conduit http-types lifted-base mangopay persistent-template text time yesod yesod-core ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra containers + country-codes data-default directory fast-logger hamlet hjsmin + http-conduit lifted-base mangopay monad-control monad-logger + persistent persistent-postgresql persistent-template resourcet + shakespeare template-haskell text time wai wai-extra wai-logger + warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent + yesod-static + ]; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; @@ -208647,7 +209612,8 @@ self: { "yesod-paginator" = callPackage ({ mkDerivation, base, data-default, hspec, persistent, resourcet - , text, transformers, wai-extra, yesod, yesod-core, yesod-test + , text, transformers, wai-extra, warp, yesod, yesod-core + , yesod-test }: mkDerivation { pname = "yesod-paginator"; @@ -208658,13 +209624,13 @@ self: { libraryHaskellDepends = [ base persistent resourcet text transformers yesod ]; + executableHaskellDepends = [ base warp yesod ]; testHaskellDepends = [ base data-default hspec wai-extra yesod-core yesod-test ]; homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-paypal-rest" = callPackage @@ -208992,7 +209958,6 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -209105,32 +210070,32 @@ self: { "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text + , containers, cryptonite, cryptonite-conduit, css-text , data-default, directory, exceptions, file-embed, filepath - , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time - , process, resourcet, template-haskell, text, transformers - , unix-compat, unordered-containers, wai, wai-app-static, wai-extra - , yesod-core, yesod-test + , hashable, hjsmin, hspec, http-types, HUnit, memory, mime-types + , old-time, process, resourcet, template-haskell, text + , transformers, unix-compat, unordered-containers, wai + , wai-app-static, wai-extra, yesod-core, yesod-test }: mkDerivation { pname = "yesod-static"; - version = "1.5.3"; - sha256 = "0raxbnr1xpxgirh2fhs3m277yzbklf6k3dijrrx4kh2bnaiax1ml"; + version = "1.5.3.1"; + sha256 = "0drrzg59k0jmbxdf2d7mlk0nr0nvdd8h164638nizjy8713ghjsl"; libraryHaskellDepends = [ async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory exceptions - file-embed filepath hashable hjsmin http-types mime-types old-time - process resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core + bytestring conduit conduit-extra containers cryptonite + cryptonite-conduit css-text data-default directory exceptions + file-embed filepath hashable hjsmin http-types memory mime-types + old-time process resourcet template-haskell text transformers + unix-compat unordered-containers wai wai-app-static yesod-core ]; testHaskellDepends = [ async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default + conduit-extra containers cryptonite cryptonite-conduit data-default directory exceptions file-embed filepath hjsmin hspec http-types - HUnit mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test + HUnit memory mime-types old-time process resourcet template-haskell + text transformers unix-compat unordered-containers wai + wai-app-static wai-extra yesod-core yesod-test ]; homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; @@ -209141,7 +210106,8 @@ self: { ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec , HUnit, language-javascript, mime-types, shakespeare - , template-haskell, text, yesod-core, yesod-static, yesod-test + , template-haskell, text, yesod, yesod-core, yesod-static + , yesod-test }: mkDerivation { pname = "yesod-static-angular"; @@ -209154,6 +210120,9 @@ self: { directory filepath hamlet language-javascript mime-types shakespeare template-haskell text yesod-core yesod-static ]; + executableHaskellDepends = [ + base data-default shakespeare yesod yesod-static + ]; testHaskellDepends = [ base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test @@ -209201,8 +210170,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.7"; - sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2"; + version = "1.5.8"; + sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -209399,7 +210368,6 @@ self: { homepage = "https://github.com/alephcloud/hs-yet-another-logger"; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "yhccore" = callPackage @@ -209423,8 +210391,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.14.0"; - sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali"; + version = "0.14.1"; + sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -209462,66 +210430,20 @@ self: { "yi-core" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist - , dynamic-state, dyre, exceptions, filepath, hashable, Hclip - , ListLike, microlens-platform, mtl, old-locale, oo-prototypes - , parsec, pointedlist, process, process-extras, quickcheck-text - , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck - , text, text-icu, time, transformers-base, unix, unix-compat - , unordered-containers, word-trie, xdg-basedir, yi-language - , yi-rope - }: - mkDerivation { - pname = "yi-core"; - version = "0.13.7"; - sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg"; - libraryHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state dyre exceptions filepath hashable - Hclip ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras safe semigroups split - text text-icu time transformers-base unix unix-compat - unordered-containers word-trie xdg-basedir yi-language yi-rope - ]; - testHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state dyre exceptions filepath hashable - Hclip ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras quickcheck-text safe - semigroups split tasty tasty-hunit tasty-quickcheck text text-icu - time transformers-base unix unix-compat unordered-containers - word-trie xdg-basedir yi-language yi-rope - ]; - benchmarkHaskellDepends = [ - array attoparsec base binary bytestring containers criterion - data-default deepseq directory dlist dynamic-state dyre exceptions - filepath hashable Hclip ListLike microlens-platform mtl old-locale - oo-prototypes parsec pointedlist process process-extras safe - semigroups split text text-icu time transformers-base unix - unix-compat unordered-containers word-trie 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_14_0" = callPackage - ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, criterion, data-default, deepseq, directory, dlist - , dynamic-state, dyre, 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 + , 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.0"; - sha256 = "176frh7q1bd4sa1fx2dgip70a4vyla09qw5n2v58qwhpfq14zwi0"; + version = "0.14.1"; + sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state dyre filepath hashable ListLike + 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 @@ -209546,7 +210468,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 @@ -209555,8 +210476,8 @@ self: { }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.14.0"; - sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls"; + version = "0.14.1"; + sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw"; libraryHaskellDepends = [ base dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -209586,8 +210507,9 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.14.0"; - sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5"; + version = "0.14.1"; + sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl oo-prototypes pango pointedlist text transformers-base yi-core @@ -209605,8 +210527,8 @@ self: { }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.13.7"; - sha256 = "0sgk9cx6q7mxjc1w7396mrrlds0gbilky2w04j4cj7c57nq42n93"; + version = "0.14.1"; + sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -209616,25 +210538,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_14_0" = 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.0"; - sha256 = "0055npls7dhlx68fwnhfb7kk4nzpy8vvmlpplm3m36rlvk85gyma"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core @@ -209642,8 +210545,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.13.7"; - sha256 = "0gqab3cdl2mrdp7wymhn6gy63mnd438m6ax6wis22kq1xpc5hdqd"; + 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 @@ -209653,25 +210556,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_14_0" = 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.0"; - sha256 = "0plpxc4p3wa2ak32j0s8y0z6ha5x8wgnzpgzj71bs7rkaf5bf8dd"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yi-gtk" = callPackage ({ mkDerivation }: mkDerivation { @@ -209690,8 +210574,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.7"; - sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj"; + version = "0.14.1"; + sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -209701,56 +210585,20 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_14_0" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , microlens-platform, text, yi-core, yi-language, yi-rope - }: - mkDerivation { - pname = "yi-ireader"; - version = "0.14.0"; - sha256 = "0lqxa4m4agha9fd9lwf8xf2cxpj8mh2q93rkjchlksrjav3khz6q"; - 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; - 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.13.7"; - sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf"; + 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yi-keymap-cua_0_14_0" = callPackage - ({ mkDerivation, base, microlens-platform, text, yi-core - , yi-keymap-emacs, yi-rope - }: - mkDerivation { - pname = "yi-keymap-cua"; - version = "0.14.0"; - sha256 = "0l7r8vyigmcmp9biskf13qnn8in16s6pliwrc12lxa5ikym7r59r"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -209760,8 +210608,8 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.7"; - sha256 = "1whxh7jznfq27ps9wnqaarhc8dcmfx19i01m0h6pbh7zmlyl2ddn"; + 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 @@ -209770,27 +210618,6 @@ 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-emacs_0_14_0" = 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.0"; - sha256 = "0mlizcb2aj10kfmcavdzbdli0sxq0id02ihnpr23ix4dk3wgznqn"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -209802,8 +210629,9 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.7"; - sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j"; + 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 @@ -209819,36 +210647,6 @@ 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-keymap-vim_0_14_0" = 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.0"; - sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-language" = callPackage @@ -209860,36 +210658,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.7"; - sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66"; - 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 oo-prototypes 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_14_0" = 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.0"; - sha256 = "1dpiqh46b2z627ry0smq4a0ynna1m166qf0yqhlh80v67myyg9jr"; + version = "0.14.1"; + sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -209905,7 +210675,6 @@ 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 @@ -209915,8 +210684,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.7"; - sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg"; + version = "0.14.1"; + sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope @@ -209925,65 +210694,16 @@ 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-misc-modes_0_14_0" = 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.0"; - sha256 = "0khyy4iacp8fah1lrp6ffvn2vy5xxrgizd4mzdlb6shc7sliaifz"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage - ({ mkDerivation, alex, array, base, binary, containers - , data-default, filepath, hashable, hspec, microlens-platform - , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell - , text, transformers-base, unordered-containers, yi-core - , yi-language, yi-rope - }: - mkDerivation { - pname = "yi-mode-haskell"; - version = "0.13.7"; - sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq"; - libraryHaskellDepends = [ - array base binary data-default microlens-platform text yi-core - yi-language yi-rope - ]; - libraryToolDepends = [ alex ]; - testHaskellDepends = [ - array base binary containers data-default filepath hashable hspec - microlens-platform pointedlist QuickCheck regex-base regex-tdfa - template-haskell text transformers-base unordered-containers - yi-core yi-language yi-rope - ]; - 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-haskell_0_14_0" = 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.0"; - sha256 = "0yqwshj1hms1q2r78fi0hsqyrazy5cyv0znxcjpmx2f6mnifjxd9"; + version = "0.14.1"; + sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -209992,7 +210712,6 @@ 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 @@ -210002,8 +210721,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.7"; - sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a"; + version = "0.14.1"; + sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -210012,27 +210731,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-mode-javascript_0_14_0" = 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.0"; - sha256 = "00ap00h9lz0b2r75m0dn741aasi18455srwq6mcpbbq6j4v3jzfz"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -210049,27 +210747,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.8"; - sha256 = "0khl687zd2rly3qfy256hix0hc55j982qknln8fm9vp31zhlbkza"; - 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_9" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , criterion, data-default, deepseq, fingertree, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -210088,7 +210765,6 @@ 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 @@ -210098,30 +210774,8 @@ self: { }: mkDerivation { pname = "yi-snippet"; - version = "0.13.7"; - sha256 = "18h67vc2fb35jfmz4zq3sc7av5nrl5cqa8q5vhdywhhhp6bsvi00"; - libraryHaskellDepends = [ - base binary containers data-default free microlens-platform mtl - text vector yi-core yi-rope - ]; - testHaskellDepends = [ - base binary containers data-default free microlens-platform mtl - tasty-hunit tasty-th text vector yi-core yi-rope - ]; - homepage = "https://github.com/yi-editor/yi#readme"; - description = "Snippet support for yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-snippet_0_14_0" = 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.0"; - sha256 = "152g3bsy50viydnhhx4b7vyyaq4frw43cbb9r3pm56wmnk4ixn7k"; + version = "0.14.1"; + sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope @@ -210132,7 +210786,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 @@ -210179,6 +210832,7 @@ self: { pname = "yices"; version = "0.0.0.12"; sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base parsec process ]; description = "Haskell programming interface to Yices SMT solver"; license = stdenv.lib.licenses.bsd3; @@ -210228,6 +210882,7 @@ self: { sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory ftphs haskeline mtl process unix ]; @@ -210262,7 +210917,6 @@ self: { libraryHaskellDepends = [ base HaXml ]; description = "make SVG string from Haskell data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yjtools" = callPackage @@ -210300,11 +210954,12 @@ self: { pname = "yoctoparsec"; version = "0.1.0.0"; sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp"; + revision = "1"; + editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9"; libraryHaskellDepends = [ base free mtl ]; homepage = "https://github.com/mniip/yoctoparsec"; description = "A truly tiny monadic parsing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoga" = callPackage @@ -210316,6 +210971,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ieee754 ]; + executableHaskellDepends = [ base ]; description = "Bindings to Facebook's Yoga layout library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -210357,10 +211013,11 @@ self: { ({ mkDerivation, base, bytestring, process, utility-ht }: mkDerivation { pname = "youtube"; - version = "0.2.1"; - sha256 = "1lb50xpz032nrxbcfihj08cwbw2cn22sf8f4xlpfqnp36jvn1rvx"; + version = "0.2.1.1"; + sha256 = "098fhkyw70sxb58bj9hbshg12j57s23qrv9r1r7m13rxbxw6lf9f"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base bytestring process utility-ht ]; description = "Upload video to YouTube via YouTube API"; license = stdenv.lib.licenses.bsd3; @@ -210406,6 +211063,7 @@ self: { sha256 = "1b33q6k76bwg5614b670mvls0iwyp2yqfdqc9r86m95x7ar7brq8"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base containers csv directory filepath HDBC HDBC-sqlite3 HStringTemplate lucid old-locale old-time pandoc parsec scientific @@ -210439,6 +211097,7 @@ self: { sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers curl deepseq directory filepath haskell98 mtl network parsec @@ -210489,7 +211148,6 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "z3" = callPackage @@ -210497,8 +211155,8 @@ self: { }: mkDerivation { pname = "z3"; - version = "4.1.0"; - sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9"; + version = "4.1.1"; + sha256 = "07nmaaa6dldvysvh9jbx3m2cakx1x824hgnbh22w4nyia9hqjd8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; @@ -210638,6 +211296,7 @@ self: { sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers directory ghc ghc-paths mtl parallel process random text transformers @@ -210921,8 +211580,8 @@ self: { }: mkDerivation { pname = "zifter-stack"; - version = "0.0.0.4"; - sha256 = "0vgklhbq846xh020n4mp4j96zbpc2asnsn1zk716pfnkgvk9syqn"; + version = "0.0.0.6"; + sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc"; libraryHaskellDepends = [ base Cabal directory filepath path path-io process safe zifter ]; @@ -210995,7 +211654,33 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; + + "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 + , QuickCheck, resourcet, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "0.2.0"; + sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath monad-control + mtl path path-io plan-b resourcet text time transformers + transformers-base + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage @@ -211007,12 +211692,15 @@ self: { pname = "zip-archive"; version = "0.3.1.1"; sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly"; + revision = "1"; + editedCabalFile = "0n8f1075gz5q2k9mqzadca6is0fi1bgi91sfw1yq2kqakkbrbkqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib ]; + executableHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ base bytestring directory HUnit old-time process temporary time unix @@ -211083,6 +211771,7 @@ self: { pname = "zipedit"; version = "0.2.3"; sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory mtl process ]; homepage = "http://code.haskell.org/~byorgey/code/zipedit"; description = "Create simple list editor interfaces"; @@ -211126,8 +211815,10 @@ self: { }: mkDerivation { pname = "zippers"; - version = "0.2.3"; - sha256 = "0pgb33nr1cc6krvzl4wks9mhy5ikbgji8546fhmydqxw4ywlr9qv"; + version = "0.2.4"; + sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb"; + revision = "1"; + editedCabalFile = "18a7wlklxvl9fhk8j7njf8ifn2781vfiqz0vxk6ljx30f1p7plq1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens profunctors semigroupoids ]; testHaskellDepends = [ base doctest ]; @@ -211192,19 +211883,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zlib_0_5_4_2" = callPackage - ({ mkDerivation, base, bytestring, zlib }: - mkDerivation { - pname = "zlib"; - version = "0.5.4.2"; - sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - description = "Compression and decompression in the gzip and zlib formats"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zlib;}; - "zlib" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, zlib @@ -211301,7 +211979,6 @@ self: { homepage = "http://github.com/tittoassini/zm"; description = "Language independent, reproducible, absolute types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zmcat" = callPackage @@ -211492,6 +212169,7 @@ self: { editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base monads-tf ]; description = "Zot language"; license = stdenv.lib.licenses.bsd3; @@ -211569,8 +212247,8 @@ self: { pname = "ztail"; version = "1.2"; sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "1"; - editedCabalFile = "0hp1mhyys3qxlvr2iyj3mh3cb48zb8vcny6f51dhv6w2z8a86lkk"; + revision = "2"; + editedCabalFile = "0da9vwpn7nv37zznav18vp9h4knr0d433964dp3mvnh42ajb0490"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index b6063f6ef977..38e8dfd24c4e 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -52,7 +52,10 @@ let This index includes documentation for many Haskell modules. ''; - docPackages = lib.closePropagation packages; + # TODO: closePropagation is deprecated; replace + docPackages = lib.closePropagation + # we grab the doc outputs + (map (lib.getOutput "doc") packages); in stdenv.mkDerivation { @@ -64,10 +67,14 @@ stdenv.mkDerivation { inherit docPackages; buildPhase = '' + ${lib.optionalString (packages != [] -> docPackages == []) + ("echo WARNING: localHoogle package list empty, even though" + + " the following were specified: " + + lib.concatMapStringsSep ", " (p: p.name) packages)} mkdir -p $out/share/doc/hoogle echo importing builtin packages - for docdir in ${ghcDocLibDir}/*; do + for docdir in ${ghcDocLibDir}"/"*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then @@ -76,17 +83,13 @@ stdenv.mkDerivation { done echo importing other packages - for i in $docPackages; do - if [[ ! $i == $out ]]; then - for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do - name="$(basename $docdir)" - docdir=$docdir/html - if [[ -d $docdir ]]; then - ln -sfn $docdir $out/share/doc/hoogle/$name - fi - done - fi - done + ${lib.concatMapStringsSep "\n" (el: '' + ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}" + '') + (lib.filter (el: el.haddockDir != null) + (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null; + name = p.pname; }) + docPackages))} echo building hoogle database hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle @@ -96,8 +99,7 @@ stdenv.mkDerivation { cd $out/share/doc/hoogle args= - for hdfile in `ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort` - do + for hdfile in $(ls -1 *"/"*.haddock | grep -v '/ghc\.haddock' | sort); do name_version=`echo "$hdfile" | sed 's#/.*##'` args="$args --read-interface=$name_version,$hdfile" done diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 30d82d3efc93..43723b807741 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -1,7 +1,9 @@ -{ pkgs }: +# TODO(@Ericson2314): Remove `pkgs` param, which is only used for +# `buildStackProject` and `justStaticExecutables` +{ pkgs, lib }: rec { - makePackageSet = pkgs.callPackage ./make-package-set.nix {}; + makePackageSet = import ./make-package-set.nix; overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; @@ -25,7 +27,7 @@ rec { dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; }); appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); - removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); }); + removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); }); addBuildTool = drv: x: addBuildTools drv [x]; addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; }); @@ -71,8 +73,11 @@ rec { disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); - sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { + sdistTarball = pkg: lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; + # Since we disable the haddock phase, we also need to override the + # outputs since the separate doc output will not be produced. + outputs = ["out"]; buildPhase = "./Setup sdist"; haddockPhase = ":"; checkPhase = ":"; @@ -89,12 +94,11 @@ rec { isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - } // (if pkgs.stdenv.isDarwin then { + } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) { configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; - } else {}) - ); + }); - buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { + buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b259192ce24f..e53ae797c415 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,20 +1,36 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -# required dependencies: -{ pkgs, stdenv, all-cabal-hashes }: +{ # package-set used for non-haskell dependencies (all of nixpkgs) + pkgs -# arguments: -# * ghc package to use -# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second -# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality -{ ghc, package-set, extensible-self }: +, # stdenv to use for building haskell packages + stdenv + +, haskellLib + +, # hashes for downloading Hackage packages + all-cabal-hashes + +, # compiler to use + ghc + +, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self` + # as second, and returns a set of haskell packages + package-set + +, # The final, fully overriden package set usable with the nixpkgs fixpoint + # overriding functionality + extensible-self +}: # return value: a function from self to the package set -self: let +self: + +let inherit (stdenv.lib) fix' extends makeOverridable callPackageWith; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 147a021ff534..ec7d961581a4 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -97,7 +97,7 @@ symlinkJoin { fi done '' + (lib.optionalString stdenv.isDarwin '' - # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix): + # 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" mkdir -p $dynamicLinksDir diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 95641a8f9fa1..6de3f8b16669 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,16 +1,23 @@ # Build one of the packages that come with idris # name: The name of the package # deps: The dependencies of the package -{ idris, build-idris-package, lib }: name: deps: build-idris-package { - inherit name; +{ idris, build-idris-package, lib }: name: deps: +let + inherit (builtins.parseDrvName idris.name) version; +in +build-idris-package { + name = "${name}-${version}"; propagatedBuildInputs = deps; inherit (idris) src; postUnpack = '' - mv $sourceRoot/libs/${name} $IDRIS_LIBRARY_PATH - sourceRoot=$IDRIS_LIBRARY_PATH/${name} + sourceRoot=$sourceRoot/libs/${name} + ''; + + postPatch = '' + sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g" ''; meta = idris.meta // { diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index a00f5e74b845..9dfa3430ed8b 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -4,8 +4,13 @@ # name and src. { stdenv, idris, gmp }: args: stdenv.mkDerivation ({ preHook = '' - mkdir idris-libs + # Library import path export IDRIS_LIBRARY_PATH=$PWD/idris-libs + mkdir -p $IDRIS_LIBRARY_PATH + + # Library install path + export IBCSUBDIR=$out/lib/${idris.name} + mkdir -p $IBCSUBDIR addIdrisLibs () { if [ -d $1/lib/${idris.name} ]; then @@ -16,10 +21,6 @@ envHooks+=(addIdrisLibs) ''; - configurePhase = '' - export TARGET=$out/lib/${idris.name} - ''; - buildPhase = '' ${idris}/bin/idris --build *.ipkg ''; @@ -33,7 +34,7 @@ ''; installPhase = '' - ${idris}/bin/idris --install *.ipkg + ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR ''; buildInputs = [ gmp ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index d1c8cf15fcee..c2ae87582df6 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; + homepage = https://github.com/ashinn/chibi-scheme; description = "Small Footprint Scheme for use as a C Extension Language"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index cf923d409172..b597ba6fe789 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A Tool for Building Expert Systems"; - homepage = "http://www.clipsrules.net/"; + homepage = http://www.clipsrules.net/; longDescription = '' Developed at NASA's Johnson Space Center from 1985 to 1996, CLIPS is a rule-based programming language useful for creating diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index c088f02ed698..8c724577359b 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "A Lisp dialect for the JVM"; - homepage = http://clojure.org/; + homepage = https://clojure.org/; license = stdenv.lib.licenses.bsd3; longDescription = '' Clojure is a dynamic programming language that targets the Java diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index d32f415732b9..3d19f7ba2911 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { platforms = [ "i686-linux" "x86_64-linux" ]; - homepage = "https://www.dartlang.org/"; + homepage = https://www.dartlang.org/; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 9fc25ad46fdc..28ea05066c23 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = with stdenv.lib; { - homepage = "http://www.eff-lang.org"; + homepage = http://www.eff-lang.org; description = "A functional programming language based on algebraic effects and their handlers"; longDescription = '' Eff is a functional language with handlers of not only exceptions, diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index d9e2e9c16c62..e85d25002235 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.0-rc.0"; - sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j"; + version = "1.5.1"; + sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index ff63406aea36..8f83a338484c 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -59,7 +59,7 @@ in ''; meta = with stdenv.lib; { - homepage = "http://elixir-lang.org/"; + homepage = https://elixir-lang.org/; description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index 89c97f5a0eb7..a5f79c197d63 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -42,7 +42,7 @@ mkDerivation rec { ''; meta = { - homepage = "https://github.com/basho/otp/"; + homepage = https://github.com/basho/otp/; description = "Programming language used for massively scalable soft real-time systems, Basho fork"; longDescription = '' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 3434603f3028..897f84f94ada 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -47,9 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - buildInputs = - [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc - ] + nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + + buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages @@ -102,7 +102,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = "http://www.erlang.org/"; + homepage = http://www.erlang.org/; downloadPage = "http://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 1928d51d3e58..e203a1d09f40 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w"; + sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 277912f76670..381144c68c2c 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "gtk-server for interpreted GUI programming"; - homepage = "http://www.gtk-server.org/"; + homepage = http://www.gtk-server.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.tohl]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 19217476b140..fe9f94beed17 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -22,8 +22,8 @@ nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; - propagatedBuildInputs = [ gmp boehmgc ] + propagatedBuildInputs = [ gmp boehmgc ] # XXX: These ones aren't normally needed here, but since # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 14afe0279c38..2177ae22db56 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; + preConfigure = "unset STRIP"; + configureFlags = [ "--enable-char-encoding=utf8" # require that the UTF-8 encoding is always used "--disable-path-canonicalization" diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 8fed11829ca8..0ea1bf19231f 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, callPackage, fetchurl, makeWrapper, jre }: -stdenv.mkDerivation rec { +let +# The version number here is whatever is reported by the RUBY_VERSION string +rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; +jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.5.0"; + version = "9.1.12.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "0rmpbg62cy06pq8xxmnkqc2m2c5kg1kj816wbrf7qjdlzfpg7r18"; + sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx"; }; buildInputs = [ makeWrapper ]; @@ -18,16 +21,42 @@ stdenv.mkDerivation rec { rm $out/bin/*.{bat,dll,exe,sh} mv $out/COPYING $out/LICENSE* $out/docs - for i in $out/bin/*; do + for i in $out/bin/jruby{,.bash}; do wrapProgram $i \ --set JAVA_HOME ${jre} done + + ln -s $out/bin/jruby $out/bin/ruby + + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook < tcl != null - && tk != null - && xproto != null - && libX11 != null; - -with stdenv.lib; - -let - majorVersion = "3.3"; - minorVersion = "6"; - minorVersionSuffix = ""; - pythonVersion = majorVersion; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite readline ncurses openssl ] - ++ optionals x11Support [ tcl tk libX11 xproto ] - ++ optionals stdenv.isDarwin [ CF configd ]; - -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - inherit buildInputs; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; - }; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python doesn't try to update them when we freeze timestamps in nix store. - DETERMINISTIC_BUILD=1; - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; - - postPatch = '' - # Determinism - substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" -# # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist. - '' + optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - - configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" - ) - ''; - - setupHook = python-setup-hook sitePackages; - - postInstall = '' - # needed for some packages, especially packages that backport functionality - # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* ]]; then - rm -rf "$item" - else - echo $item - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - # Determinism: Windows installers were not deterministic. - # We're also not interested in building Windows installers. - find "$out" -name 'wininst*.exe' | xargs -r rm -f - - # Use Python3 as default python - ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pip3" "$out/bin/pip" - ln -s "$out/bin/pydoc3" "$out/bin/pydoc" - ln -s "$out/bin/python3" "$out/bin/python" - ln -s "$out/bin/python3-config" "$out/bin/python-config" - ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" - - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level - find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit libPrefix sitePackages x11Support; - executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy3 = true; - isPy33 = true; - is_py3k = true; # deprecated - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = http://python.org; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 4d20a21a4d13..5799e319ba04 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "6"; + minorVersion = "7"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "0h2z248hkf8x1ix1z8npkqs9cq62i322sl4rcjdkp7mawsxjhd7i"; + sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -127,7 +127,6 @@ in stdenv.mkDerivation { # Use Python3 as default python ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pip3" "$out/bin/pip" ln -s "$out/bin/pydoc3" "$out/bin/pydoc" ln -s "$out/bin/python3" "$out/bin/python" ln -s "$out/bin/python3-config" "$out/bin/python-config" diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index a4aec241a1aa..1b71dba42c41 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.5"; - 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 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf"; + sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -65,11 +65,7 @@ in stdenv.mkDerivation { ''; patches = [ - (fetchpatch { - name = "glibc-2.25-enosys.patch"; - url = https://github.com/python/cpython/commit/035ba5da3e53e.patch; - sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71"; - }) + ./no-ldconfig.patch ]; postPatch = '' @@ -129,7 +125,6 @@ in stdenv.mkDerivation { # Use Python3 as default python ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pip3" "$out/bin/pip" ln -s "$out/bin/pydoc3" "$out/bin/pydoc" ln -s "$out/bin/python3" "$out/bin/python" ln -s "$out/bin/python3-config" "$out/bin/python-config" diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch new file mode 100644 index 000000000000..c96de5d0e914 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch @@ -0,0 +1,164 @@ +From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Sat, 29 Jul 2017 20:33:56 +0200 +Subject: [PATCH] Don't use ldconfig and speed up uuid load + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + Lib/uuid.py | 52 ---------------------------------------- + 2 files changed, 2 insertions(+), 120 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 7684eab81d..e9957d7951 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -95,46 +95,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -256,34 +217,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = os.fsencode( +- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def find_library(name): + return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) +diff --git a/Lib/uuid.py b/Lib/uuid.py +index e96e7e034c..a099ab4b4a 100644 +--- a/Lib/uuid.py ++++ b/Lib/uuid.py +@@ -455,58 +455,6 @@ def _netbios_getnode(): + continue + return int.from_bytes(bytes, 'big') + +-# Thanks to Thomas Heller for ctypes and for his help with its use here. +- +-# If ctypes is available, use it to find system routines for UUID generation. +-# XXX This makes the module non-thread-safe! +-_uuid_generate_time = _UuidCreate = None +-try: +- import ctypes, ctypes.util +- import sys +- +- # The uuid_generate_* routines are provided by libuuid on at least +- # Linux and FreeBSD, and provided by libc on Mac OS X. +- _libnames = ['uuid'] +- if not sys.platform.startswith('win'): +- _libnames.append('c') +- for libname in _libnames: +- try: +- lib = ctypes.CDLL(ctypes.util.find_library(libname)) +- except Exception: +- continue +- if hasattr(lib, 'uuid_generate_time'): +- _uuid_generate_time = lib.uuid_generate_time +- break +- del _libnames +- +- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted +- # in issue #8621 the function generates the same sequence of values +- # in the parent process and all children created using fork (unless +- # those children use exec as well). +- # +- # Assume that the uuid_generate functions are broken from 10.5 onward, +- # the test can be adjusted when a later version is fixed. +- if sys.platform == 'darwin': +- import os +- if int(os.uname().release.split('.')[0]) >= 9: +- _uuid_generate_time = None +- +- # On Windows prior to 2000, UuidCreate gives a UUID containing the +- # hardware address. On Windows 2000 and later, UuidCreate makes a +- # random UUID and UuidCreateSequential gives a UUID containing the +- # hardware address. These routines are provided by the RPC runtime. +- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last +- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear +- # to bear any relationship to the MAC address of any network device +- # on the box. +- try: +- lib = ctypes.windll.rpcrt4 +- except: +- lib = None +- _UuidCreate = getattr(lib, 'UuidCreateSequential', +- getattr(lib, 'UuidCreate', None)) +-except: +- pass + + def _unixdll_getnode(): + """Get the hardware address on Unix using ctypes.""" +-- +2.13.3 + diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index d2d922ce4955..0b0f9c8be6ab 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 = "1"; + minorVersion = "2"; 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 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650"; + sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -64,6 +64,10 @@ in stdenv.mkDerivation { substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; + patches = [ + ./no-ldconfig.patch + ]; + postPatch = '' # Determinism substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" @@ -121,7 +125,6 @@ in stdenv.mkDerivation { # Use Python3 as default python ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pip3" "$out/bin/pip" ln -s "$out/bin/pydoc3" "$out/bin/pydoc" ln -s "$out/bin/python3" "$out/bin/python" ln -s "$out/bin/python3-config" "$out/bin/python-config" diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch new file mode 100644 index 000000000000..da6afe04d6e7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch @@ -0,0 +1,163 @@ +From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Sat, 29 Jul 2017 20:17:40 +0200 +Subject: [PATCH] Don't use ldconfig and speed up uuid load + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + Lib/uuid.py | 51 --------------------------------------- + 2 files changed, 2 insertions(+), 119 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 339ae8aa8a..2944985c30 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -85,46 +85,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -246,34 +207,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +diff --git a/Lib/uuid.py b/Lib/uuid.py +index 200c800b34..a099ab4b4a 100644 +--- a/Lib/uuid.py ++++ b/Lib/uuid.py +@@ -455,57 +455,6 @@ def _netbios_getnode(): + continue + return int.from_bytes(bytes, 'big') + +-# Thanks to Thomas Heller for ctypes and for his help with its use here. +- +-# If ctypes is available, use it to find system routines for UUID generation. +-# XXX This makes the module non-thread-safe! +-_uuid_generate_time = _UuidCreate = None +-try: +- import ctypes, ctypes.util +- import sys +- +- # The uuid_generate_* routines are provided by libuuid on at least +- # Linux and FreeBSD, and provided by libc on Mac OS X. +- _libnames = ['uuid'] +- if not sys.platform.startswith('win'): +- _libnames.append('c') +- for libname in _libnames: +- try: +- lib = ctypes.CDLL(ctypes.util.find_library(libname)) +- except Exception: +- continue +- if hasattr(lib, 'uuid_generate_time'): +- _uuid_generate_time = lib.uuid_generate_time +- break +- del _libnames +- +- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted +- # in issue #8621 the function generates the same sequence of values +- # in the parent process and all children created using fork (unless +- # those children use exec as well). +- # +- # Assume that the uuid_generate functions are broken from 10.5 onward, +- # the test can be adjusted when a later version is fixed. +- if sys.platform == 'darwin': +- if int(os.uname().release.split('.')[0]) >= 9: +- _uuid_generate_time = None +- +- # On Windows prior to 2000, UuidCreate gives a UUID containing the +- # hardware address. On Windows 2000 and later, UuidCreate makes a +- # random UUID and UuidCreateSequential gives a UUID containing the +- # hardware address. These routines are provided by the RPC runtime. +- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last +- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear +- # to bear any relationship to the MAC address of any network device +- # on the box. +- try: +- lib = ctypes.windll.rpcrt4 +- except: +- lib = None +- _UuidCreate = getattr(lib, 'UuidCreateSequential', +- getattr(lib, 'UuidCreate', None)) +-except: +- pass + + def _unixdll_getnode(): + """Get the hardware address on Unix using ctypes.""" +-- +2.13.3 + diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix deleted file mode 100644 index 055224dd740b..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-html-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2; - sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix deleted file mode 100644 index 8c6b842d0b94..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-pdf-a4-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-a4.tar.bz2; - sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix deleted file mode 100644 index 046abe8f83d7..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-pdf-letter-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-letter.tar.bz2; - sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix deleted file mode 100644 index 4d99c25bf598..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-text-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-text.tar.bz2; - sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index 89e60f961f63..60e0a0bf1e6e 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -4,36 +4,24 @@ let pythonDocs = { html = { recurseForDerivations = true; - python33 = import ./3.3-html.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; }; pdf_a4 = { recurseForDerivations = true; - python33 = import ./3.3-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; }; pdf_letter = { recurseForDerivations = true; - python33 = import ./3.3-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; }; text = { recurseForDerivations = true; - python33 = import ./3.3-text.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 1c74e612b559..37bd5b097395 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -66,7 +66,9 @@ wrapPythonProgramsIn() { # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH") + --prefix PATH ':' "$program_PATH" + --set PYTHONNOUSERSITE "true" + ) # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index b4bd532dc1d9..9f355ddefda7 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -6,8 +6,7 @@ # Create a python executable that knows about additional packages. let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; - env = ( - let + env = let paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; in buildEnv { name = "${python.name}-env"; @@ -29,26 +28,31 @@ let for prg in *; do if [ -f "$prg" ]; then rm -f "$out/bin/$prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" + if [ -x "$prg" ]; then + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" + fi fi done fi done '' + postBuild; - passthru.env = stdenv.mkDerivation { - name = "interactive-${python.name}-environment"; - nativeBuildInputs = [ env ]; - - buildCommand = '' - echo >&2 "" - echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; - }; - }) // { - inherit python; inherit (python) meta; + + passthru = python.passthru // { + interpreter = "${env}/bin/${python.executable}"; + inherit python; + env = stdenv.mkDerivation { + name = "interactive-${python.name}-environment"; + nativeBuildInputs = [ env ]; + + buildCommand = '' + echo >&2 "" + echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; }; in env diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix new file mode 100644 index 000000000000..01b95adf92f4 --- /dev/null +++ b/pkgs/development/interpreters/red/default.nix @@ -0,0 +1,92 @@ +{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: + +stdenv.mkDerivation rec { + name = "red-v${version}"; + version = "0.6.3"; + src = fetchFromGitHub { + rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; + owner = "red"; + repo = "red"; + sha256 = "1zh6xc728bs7r4v5jz1jjrdk0xd838xsxmvy9gfg75a3zffm0slr"; + }; + + rebol = fetchurl { + url = "http://www.rebol.com/downloads/v278/rebol-core-278-4-2.tar.gz"; + sha256 = "1c1v0pyhf3d8z98qc93a5zmx0bbl0qq5lr8mbkdgygqsq2bv2xbz"; + }; + + buildInputs = [ pkgsi686Linux.curl stdenv_32bit ]; + + r2 = "./rebol/releases/rebol-core/rebol"; + + configurePhase = '' + # Download rebol + mkdir rebol/ + tar -xzvf ${rebol} -C rebol/ + patchelf --set-interpreter \ + ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ + ${r2} + ''; + + buildPhase = '' + # Do tests + #${r2} -qw run-all.r + + # Build test + ${r2} -qw red.r tests/hello.red + + # Compiling the Red console... + ${r2} -qw red.r -r environment/console/console.red + + # Generating docs... + cd docs + ../${r2} -qw makedoc2.r red-system-specs.txt + ../${r2} -qw makedoc2.r red-system-quick-test.txt + cd ../ + ''; + + installPhase = '' + mkdir $out + + # Install + install -d $out/opt/red + find quick-test -type f -executable -print0 | xargs -0 rm + cp -R * $out/opt/red/ + rm -rf $out/opt/red/rebol + install -Dm755 console $out/bin/red + install -Dm644 BSD-3-License.txt \ + $out/share/licenses/${name}/BSD-3-License.txt + install -Dm644 BSL-License.txt \ + $out/share/licenses/${name}/BSL-License.txt + install -Dm644 docs/red-system-quick-test.html \ + $out/share/doc/${name}/red-system-quick-test.html + install -Dm644 docs/red-system-specs.html \ + $out/share/doc/${name}/red-system-specs.html + + # PathElf + patchelf --set-interpreter \ + ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ + $out/opt/red/console + patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \ + $out/opt/red/console + patchelf --set-interpreter \ + ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ + $out/bin/red + patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \ + $out/bin/red + + ''; + + meta = with stdenv.lib; { + description = '' + New programming language strongly inspired by Rebol, but with a + broader field of usage thanks to its native-code compiler, from system + programming to high-level scripting, while providing modern support for + concurrency and multi-core CPUs + ''; + maintainers = with maintainers; [ uralbash ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.bsd3; + homepage = http://www.red-lang.org/; + }; +} diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 0d0cbbab2b52..c2eae32c5b60 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; - homepage = "http://renpy.org/"; + homepage = http://renpy.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to diff --git a/pkgs/development/interpreters/spidermonkey/24.nix b/pkgs/development/interpreters/spidermonkey/24.nix deleted file mode 100644 index 6e354c542963..000000000000 --- a/pkgs/development/interpreters/spidermonkey/24.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }: - -stdenv.mkDerivation rec { - version = "24.2.0"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/mozjs-${version}.tar.bz2"; - sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"; - }; - - outputs = [ "out" "dev" "lib" ]; - - propagatedBuildInputs = [ nspr ]; - - buildInputs = [ pkgconfig perl python2 zip libffi readline icu ]; - - postPatch = '' - # Fixes an issue with version detection under perl 5.22.x - sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl - ''; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ''; - - setOutputFlags = false; - configureFlags = [ - "--libdir=$(lib)/lib" - "--includedir=$(dev)/include" - "--enable-threadsafe" - "--with-system-icu" - "--with-system-nspr" - "--with-system-ffi" - "--enable-readline" - ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; - - enableParallelBuilding = true; - - doCheck = true; - preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 - - postInstall = '' - rm "$lib"/lib/*.a # halve the output size - moveToOutput "bin/js*-config" "$dev" # break the cycle - ''; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index e2a4ad2e3020..b4823817d4b7 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f8c98c727f49..642fd928f41d 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming language for real time audio synthesis"; - homepage = "http://supercollider.sourceforge.net/"; + homepage = http://supercollider.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 719329bd528f..877b10f69a33 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = "http://www.libsdl.org/"; + homepage = http://www.libsdl.org/; license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index cee0a81ccfbd..a7ef0290734b 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = "https://sourceforge.net/projects/sdlgfx/"; + homepage = https://sourceforge.net/projects/sdlgfx/; license = licenses.zlib; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 22282e1a10c5..78e0f4ed9725 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; + homepage = http://www.libsdl.org/projects/SDL_image/; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 9fef76c799b9..0203b8a1a8d9 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.linux; - homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + homepage = https://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 15a3305c7f44..cf81fc0cac83 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multiplatform networking library"; - homepage = "https://www.libsdl.org/projects/SDL_net"; + homepage = https://www.libsdl.org/projects/SDL_net; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 71aeecb3a809..010ca46695a3 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; platforms = platforms.linux; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + homepage = https://www.libsdl.org/projects/SDL_ttf/; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index ff8c081af93b..0f66f0afb178 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = "https://sourceforge.net/projects/sdlgfx/"; + homepage = https://sourceforge.net/projects/sdlgfx/; license = licenses.zlib; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index b151d0ee83ee..a159a0691f49 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "SDL networking library"; platforms = platforms.unix; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; + homepage = https://www.libsdl.org/projects/SDL_net/release-1.2.html; }; } diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 8d088b6bbf47..e471c3cc556f 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "SDL sound library"; platforms = platforms.linux; license = licenses.lgpl21; - homepage = "https://www.icculus.org/SDL_sound/"; + homepage = https://www.icculus.org/SDL_sound/; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 2a4ddac524c2..7f276387c834 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stretch Functions For SDL"; - homepage = "http://sdl-stretch.sourceforge.net/"; + homepage = http://sdl-stretch.sourceforge.net/; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 4875d9ab5a1a..1f290bf7044f 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; + homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 2615cac7b90c..69d736d44768 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix deleted file mode 100644 index a1f229ca5fb0..000000000000 --- a/pkgs/development/libraries/accelio/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent - -# Linux only deps -, numactl, kernel ? null -}: - -stdenv.mkDerivation rec { - name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "1.5"; - - src = fetchFromGitHub { - owner = "accelio"; - repo = "accelio"; - rev = "v1.5"; - sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7"; - }; - - hardeningDisable = [ "format" "pic" ]; - - patches = [ ./fix-printfs.patch ]; - - postPatch = '' - # Don't build broken examples - sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac - - # Allow the installation of xio kernel headers - sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in - - # Don't install ldconfig entries - sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am - sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libevent ]; - propagatedBuildInputs = [ libibverbs librdmacm ] - ++ stdenv.lib.optional stdenv.isLinux numactl; - - configureFlags = [ - "--enable-rdma" - "--disable-raio-build" - ] ++ stdenv.lib.optionals (kernel != null) [ - "--enable-kernel-module" - "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - INSTALL_MOD_PATH = "\${out}"; - - meta = with stdenv.lib; { - homepage = http://www.accelio.org/; - description = "High-performance messaging and RPC library"; - longDescription = '' - A high-performance asynchronous reliable messaging and RPC library - optimized for hardware acceleration. - ''; - license = licenses.bsd3; - platforms = with platforms; linux ++ freebsd; - maintainers = with maintainers; [ wkennington ]; - # kernel 4.2 is the most recent supported kernel - broken = kernel != null && - (builtins.compareVersions kernel.version "4.2" == 1); - }; -} diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch deleted file mode 100644 index 23b2f40e42fe..000000000000 --- a/pkgs/development/libraries/accelio/fix-printfs.patch +++ /dev/null @@ -1,615 +0,0 @@ -diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c ---- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:59:13.258697472 -0400 -@@ -246,7 +246,7 @@ static void *worker_thread(void *data) - } else { - vmsg_sglist_set_nents(&msg->out, 0); - } -- msg->user_context = (void *)get_cycles(); -+ msg->user_context = (void *)(intptr_t)get_cycles(); - /* send first message */ - if (xio_send_request(tdata->conn, msg) == -1) { - if (xio_errno() != EAGAIN) -@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio - { - struct thread_data *tdata = (struct thread_data *)cb_user_context; - -- cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context); -+ cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context); - - if (tdata->do_stat) { - if (rtt > tdata->stat.max_rtt) -@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio - msg->in.header.iov_len = 0; - vmsg_sglist_set_nents(&msg->in, 0); - -- msg->user_context = (void *)get_cycles(); -+ msg->user_context = (void *)(intptr_t)get_cycles(); - if (xio_send_request(tdata->conn, msg) == -1) { - if (xio_errno() != EAGAIN) - printf("**** [%p] Error - xio_send_request " \ -@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete - sess_data.min_lat_us, - sess_data.max_lat_us); - if (fd) -- fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n", -+ fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n", - data_len, - threads_iter, - sess_data.tps, -diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h ---- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:57:30.856215123 -0400 -@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb; - /* The format of the results */ - #define RESULT_FMT " #bytes #threads #TPS BW average[MBps] Latency average[usecs] Latency low[usecs] Latency peak[usecs]\n" - /* Result print format */ --#define REPORT_FMT " %-7lu %-2d %-9.2lu %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" -+#define REPORT_FMT " %-7" PRIu64 " %-2d %-9.2" PRIu64 " %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" - - - struct perf_parameters { -diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c ---- accelio/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:42:19.983984370 -0400 -@@ -224,7 +224,7 @@ static void process_response(struct sess - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (rsp->request->sn + 1), str); - str[len] = tmp; - } -@@ -236,7 +236,7 @@ static void process_response(struct sess - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%zd] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", - (rsp->request->sn + 1), i, sglist[i].iov_len, str); - str[len] = tmp; - } -diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c ---- accelio/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:43:07.353204184 -0400 -@@ -203,7 +203,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (req->sn + 1), str); - str[len] = tmp; - } -@@ -215,7 +215,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%zd] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", - (req->sn + 1), i, sglist[i].iov_len, str); - str[len] = tmp; - } -@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi - struct server_data *sdata = (struct server_data *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c ---- accelio/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:36:25.612337524 -0400 -+++ accelio.new/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:43:32.748322028 -0400 -@@ -87,7 +87,7 @@ static void process_response(struct sess - { - if (++session_data->cnt == PRINT_COUNTER) { - ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; -- printf("message: [%lu] - %s\n", -+ printf("message: [%" PRIu64 "] - %s\n", - (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); - session_data->cnt = 0; - } -diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c ---- accelio/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:36:25.612337524 -0400 -+++ accelio.new/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:43:50.556404665 -0400 -@@ -82,7 +82,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (req->sn + 1), str); - str[len] = tmp; - } -@@ -94,7 +94,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%d] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%d] - %s\n", - (req->sn + 1), i, len, str); - str[len] = tmp; - } -diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c ---- accelio/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:41:13.493675827 -0400 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "libxio.h" - -@@ -133,7 +134,7 @@ static void process_response(struct thre - { - if (++tdata->cnt == PRINT_COUNTER) { - ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; -- printf("thread [%d] - tid:%p - message: [%lu] - %s\n", -+ printf("thread [%d] - tid:%p - message: [%" PRIu64 "] - %s\n", - tdata->affinity, - (void *)pthread_self(), - (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); -diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c ---- accelio/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:41:31.730760455 -0400 -@@ -104,7 +104,7 @@ static void process_request(struct threa - struct xio_msg *req) - { - if (++tdata->cnt == PRINT_COUNTER) { -- printf("thread [%d] tid:%p - message: [%lu] - %s\n", -+ printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n", - tdata->affinity, - (void *)pthread_self(), - (req->sn + 1), (char *)req->in.header.iov_base); -diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c ---- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 20:00:15.169989095 -0400 -@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi - struct thread_data *tdata = conn_entry->tdata; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- DEBUG("**** [%p] message %lu failed. reason: %s\n", -+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, req->sn, xio_strerror(error)); - } else { - xio_release_response(req); -- DEBUG("**** [%p] message %lu failed. reason: %s\n", -+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, req->request->sn, xio_strerror(error)); - } - obj_pool_put(tdata->req_pool, req); -diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c ---- accelio/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:40:06.398364476 -0400 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #define cpusmask_test_bit(nr, addr) (*(addr) & (1ULL << (nr))) - #define cpusmask_set_bit(nr, addr) (*(addr) |= (1ULL << (nr))) -@@ -244,7 +245,7 @@ int main(int argc, char *argv[]) - } - intf_cpusmask_str(cpusmask, cpusnum, cpus_str); - -- printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n", -+ printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n", - ifa->ifa_name, host, flags, numa_node, cpusmask, - "cpus", cpusnum, cpus_str); - } -diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c ---- accelio/src/tools/usr/xio_mem_usage.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/src/tools/usr/xio_mem_usage.c 2015-09-03 19:38:57.596044838 -0400 -@@ -73,7 +73,7 @@ - while (i++ < 48) { \ - printf("."); \ - } \ -- printf(" %6lu\n", sizeof(type)); \ -+ printf(" %zu\n", sizeof(type)); \ - } - - int main(int argc, char **argv) -diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c ---- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:56:25.521908028 -0400 -@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio - * this flag must be on */ - rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP; - -- rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr; -+ rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr; - rdma_test_buf.length = rdma_reg_mem.length; - rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp); - -diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c ---- accelio/tests/usr/hello_test/xio_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test/xio_client.c 2015-09-03 19:45:43.055926711 -0400 -@@ -181,13 +181,13 @@ static void process_response(struct test - - double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); - double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB); -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, - test_params->stat.txlen, test_params->stat.rxlen); - get_time(timeb, 40); - -- printf("**** [%s] - message [%zd] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s - - switch (event_data->event) { - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("nsent:%lu, nrecv:%lu, " \ -- "delta:%lu\n", -+ printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->nrecv, - test_params->nsent-test_params->nrecv); - -@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi - struct test_params *test_params = (struct test_params *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c ---- accelio/tests/usr/hello_test/xio_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test/xio_server.c 2015-09-03 19:46:35.777171360 -0400 -@@ -112,7 +112,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: - if (event_data->reason != XIO_E_SESSION_REJECTED) { -- printf("last sent:%lu, last comp:%lu, " \ -- "delta:%lu\n", -+ printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->ncomp, - test_params->nsent-test_params->ncomp); - test_params->connection = NULL; -@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi - { - struct test_params *test_params = (struct test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - msg_pool_put(test_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c ---- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:49:10.164887785 -0400 -@@ -114,7 +114,7 @@ static void process_request(struct xio_m - if (++cnt == print_counter) { - struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); - -- printf("**** request [%lu] %s - %s\n", -+ printf("**** request [%" PRIu64 "] %s - %s\n", - (req->sn+1), - (char *)req->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -171,11 +171,11 @@ static void process_response(struct xio_ - double txbw = (1.0*pps*txlen/ONE_MB); - double rxbw = (1.0*pps*rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -- printf("**** [%s] - response [%lu] %s - %s\n", -+ printf("**** [%s] - response [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi - { - switch (msg->type) { - case XIO_MSG_TYPE_REQ: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - msg_pool_put(pool, msg); - switch (error) { -@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi - }; - break; - case XIO_MSG_TYPE_RSP: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - /* message is no longer needed */ - switch (error) { -diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c ---- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:49:52.860085909 -0400 -@@ -143,11 +143,11 @@ static void process_response(struct xio_ - double txbw = (1.0*pps*txlen/ONE_MB); - double rxbw = (1.0*pps*rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -- printf("**** [%s] - response complete [%lu] %s - %s\n", -+ printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -171,7 +171,7 @@ static void process_request(struct xio_m - if (++cnt == print_counter) { - struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); - -- printf("**** request complete [%lu] %s - %s [%zd]\n", -+ printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n", - (req->sn+1), - (char *)req->in.header.iov_base, - (char *)sglist[0].iov_base, -@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi - { - switch (msg->type) { - case XIO_MSG_TYPE_REQ: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - msg_pool_put(pool, msg); - switch (error) { -@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi - }; - break; - case XIO_MSG_TYPE_RSP: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - /* message is no longer needed */ - switch (error) { -diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c ---- accelio/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:50:51.111356220 -0400 -@@ -139,7 +139,7 @@ static void process_response(struct xio_ - double rxbw = (1.0*pps*rxlen/ONE_MB); - double lat = (1000000.0/pps); - -- printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, lat, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(pool, msg); -diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c ---- accelio/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:51:16.803475442 -0400 -@@ -103,7 +103,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(pool, msg); -diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c ---- accelio/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:47:39.218465755 -0400 -@@ -179,12 +179,12 @@ static void process_response(struct thre - double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB); - double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \ - "RX: %zd B\n", - pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen); - get_time(timeb, 40); -- printf("[%s] thread [%d] - tid:%p - message [%lu] " \ -+ printf("[%s] thread [%d] - tid:%p - message [%" PRIu64 "] " \ - "%s - %s\n", - timeb, - tdata->affinity, -@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi - struct thread_data *tdata = (struct thread_data *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c ---- accelio/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:48:02.876575538 -0400 -@@ -171,7 +171,7 @@ static void process_request(struct threa - if (++tdata->stat.cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("thread [%d] - message [%lu] %s - %s\n", -+ printf("thread [%d] - message [%" PRIu64 "] %s - %s\n", - tdata->affinity, - (msg->sn+1), - (char *)msg->in.header.iov_base, -@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi - { - struct thread_data *tdata = (struct thread_data *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - msg_pool_put(tdata->pool, msg); -diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c ---- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:54:18.142316932 -0400 -@@ -150,11 +150,11 @@ static void process_rx_message(struct ow - - double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "RX: %.2f MB/s, RX: %zd B\n", - pps, rxbw, ow_params->rx_stat.xlen); - get_time(timeb, 40); -- printf("**** [%s] - message [%lu] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (msg->sn + 1), - (char *)msg->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -202,11 +202,11 @@ static void process_tx_message(struct ow - - double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s,length: TX: %zd B\n", - pps, txbw, ow_params->tx_stat.xlen); - get_time(timeb, 40); -- printf("**** [%s] - message [%lu] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (msg->sn + 1), - (char *)msg->out.header.iov_base, - (char *)(onents > 0 ? osglist[0].iov_base : NULL)); -@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi - struct ow_test_params *ow_params = - (struct ow_test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(ow_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c ---- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:54:32.797384938 -0400 -@@ -112,7 +112,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi - struct ow_test_params *ow_params = - (struct ow_test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(ow_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c ---- accelio/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:52:24.905791466 -0400 -@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++) - - double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, length: TX: %zd B\n", - pps, txbw, - test_params->stat.txlen); -@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s - test_params->closed = 1; - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("nsent:%lu, ncomp:%lu, " \ -- "delta:%lu\n", -+ printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->ncomp, - test_params->nsent-test_params->ncomp); - -@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi - { - struct test_params *test_params = (struct test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(test_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c ---- accelio/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:52:57.947944796 -0400 -@@ -110,7 +110,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s - xio_disconnect(event_data->conn); - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("last recv:%lu\n", -+ printf("last recv:%" PRIu64 "\n", - test_params->nrecv); - - xio_connection_destroy(event_data->conn); -@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - return 0; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 883d0d65aa53..e45a9f2f3871 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt library for accessing the online accounts database"; - homepage = "http://code.google.com/p/accounts-sso/"; + homepage = https://gitlab.com/accounts-sso; license = licenses.lgpl21; maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 9bc714c5538b..42988e334b07 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.2"; + version = "6.4.3"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73"; + sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index b29a12e6f412..dc9e4e6ff18b 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"; }; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ gettext ]; buildInputs = [ attr ]; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 88c8a9005700..3db15892a144 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; + homepage = http://www.chiark.greenend.org.uk/~ian/adns/; description = "Asynchronous DNS Resolver Library"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 8b7dddf0e151..7c697d3e60c9 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,19 +3,18 @@ }: stdenv.mkDerivation rec { - version = "3.7.15"; + version = "3.7.16"; name = "afflib-${version}"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw"; + sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; }; buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; - meta = { homepage = http://afflib.sourceforge.net/; description = "Advanced forensic format library"; diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix index a9c037edba76..6ab7455915cc 100644 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = []; meta = { - homepage = "https://github.com/jonsterling/Agda-Sheaves"; + homepage = https://github.com/jonsterling/Agda-Sheaves; description = "Sheaves in Agda"; license = stdenv.lib.licenses.cc-by-40; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix index 226a39890c2d..ac9ce9dd84f4 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -16,7 +16,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "../$sourceRoot" ]; meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html"; + homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html; description = "A monadic parser combinator library which guarantees termination of parsing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix index 40eef9328224..146e44182ed2 100644 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ b/pkgs/development/libraries/agda/agda-base/default.nix @@ -13,7 +13,7 @@ agda.mkDerivation (self: rec { everythingFile = "README.agda"; meta = { - homepage = "https://github.com/pcapriotti/agda-base"; + homepage = https://github.com/pcapriotti/agda-base; description = "Base library for HoTT in Agda"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index cda2cd9bb05d..ce25521ad2e5 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -17,7 +17,7 @@ agda.mkDerivation (self: rec { ''; meta = { - homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; + homepage = https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/; description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index a2d29ff08dc8..e3dcf765dfd4 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { everythingFile = "src/Prelude.agda"; meta = with stdenv.lib; { - homepage = "https://github.com/UlfNorell/agda-prelude"; + homepage = https://github.com/UlfNorell/agda-prelude; description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index eb2fa2927cac..866bccd3fd61 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -19,7 +19,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "src" ]; meta = with stdenv.lib; { - homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; + homepage = http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary; description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix index b3b3cb5bbfeb..6306bb89b5c7 100644 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ b/pkgs/development/libraries/agda/bitvector/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = [ "Data" ]; meta = { - homepage = "https://github.com/copumpkin/bitvector"; + homepage = https://github.com/copumpkin/bitvector; description = "Sequences of bits and common operations on them"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix index b4ac4b79bf1e..ea232f2853d6 100644 --- a/pkgs/development/libraries/agda/categories/default.nix +++ b/pkgs/development/libraries/agda/categories/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = [ "Categories" "Graphs" ]; meta = { - homepage = "https://github.com/copumpkin/categories"; + homepage = https://github.com/copumpkin/categories; description = "Categories parametrized by morphism equality, in Agda"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 6aaaa44b00f0..25e6ff6667fe 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -16,7 +16,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "../$sourceRoot" ]; meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html"; + homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html; description = "Correct-by-Construction Pretty-Printing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 7efccfad2432..f1402e4ad9ed 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.2.1.1"; + version = "5.2.2.0"; - src = fetchurl { - url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; - sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm"; + src = fetchFromGitHub { + owner = "liballeg"; + repo = "allegro5"; + rev = version; + sha256 = "1sf0dr0ahrzsy6gzzpvys9d7d9w0grayhak4cyymjv7w857hf51m"; }; buildInputs = [ diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1829b3306ebc..3251693f5742 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -13,11 +13,11 @@ assert ldapSupport -> openldap != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "apr-util-1.5.4"; + name = "apr-util-1.6.0"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; + sha256 = "0k6a90d67xl36brz69s7adgkswjmw7isnjblm1naqmjblwzwjx44"; }; patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 329cd77ad267..9abf48289ae0 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.5.2"; + name = "apr-1.6.2"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx"; + sha256 = "1gffipa87pflvgvw01dbkvgh75p8n2sr56m1pcl01avv6zm9q409"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 4433a3df45d4..ad930a705c57 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; + homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 9b6ba128512c..28039cc01686 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; + homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1; license = licenses.lgpl21; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index f922aacf4d40..1ac00c3fe882 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for access to chipcards"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=02&showall=1"; + homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=02&showall=1; license = licenses.lgpl21; maintainers = with maintainers; [ aszlig ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index d5a601f09ba0..514c73f5e0fc 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -12,9 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openblasCompat superlu hdf5 ]; - cmakeFlags = [ "-DDETECT_HDF5=ON" ]; + cmakeFlags = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in [ + "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}" + "-DDETECT_HDF5=ON" + ]; - patches = [ ./use-unix-config-on-OS-X.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix new file mode 100644 index 000000000000..96acfe6c2a88 --- /dev/null +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -0,0 +1,35 @@ +# Create a derivation that contains aspell and selected dictionaries. +# Composition is done using `pkgs.buildEnv`. + +{ aspell +, aspellDicts +, makeWrapper +, symlinkJoin +, runCommand +}: + +f: + +let + # Dictionaries we want + dicts = f aspellDicts; + + # A tree containing the dictionaries + dictEnv = symlinkJoin { + name = "aspell-dicts"; + paths = dicts; + }; + +in runCommand "aspell-env" { + buildInputs = [ makeWrapper ]; +} '' + # Construct wrappers in /bin + mkdir -p $out/bin + pushd "${aspell}/bin" + for prg in *; do + if [ -f "$prg" ]; then + makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "dict-dir ${dictEnv}/lib/aspell" + fi + done + popd +'' diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 7cab14a8e10c..6a94cb0c0e23 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; }; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index b625bb18b88f..a21f698fa896 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://bs2b.sourceforge.net/"; + homepage = http://bs2b.sourceforge.net/; description = "Bauer stereophonic-to-binaural DSP library"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 3bc048dd22f0..9a87e31cbd29 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; - homepage = "https://bitbucket.org/mpyne/game-music-emu/overview"; + homepage = https://bitbucket.org/mpyne/game-music-emu/overview; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ lheckemann ]; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 2f5b9183f66f..e3c0f0394772 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index a15ae7dad40d..578bc7f4a2dc 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 7aa7244e2342..00a0a5082137 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Resample library by Fons Adriaensen"; version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 69f86e020c79..098378701d57 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -8,11 +8,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { name = "avahi-${version}"; - version = "0.6.32"; + version = "0.7"; src = fetchurl { url = "https://github.com/lathiat/avahi/releases/download/v${version}/avahi-${version}.tar.gz"; - sha256 = "0m5l3ny9i2z1l27y4wm731c0zdkmfn6l1szbajx0ljjiblc92jfm"; + sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; patches = [ ./no-mkdir-localstatedir.patch ]; diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch index a8a1878cc90e..72965c9f0282 100644 --- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch +++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch @@ -1,12 +1,12 @@ Don't "mkdir $(localstatedir)" since we can't do it (/var). ---- avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 05:06:35.000000000 +0200 -+++ avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 18:03:45.000000000 +0200 -@@ -1554,7 +1554,6 @@ xmllint: +--- a/avahi-daemon/Makefile.in ++++ b/avahi-daemon/Makefile.in +@@ -1625,7 +1625,6 @@ xmllint: done install-data-local: -- test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run" +- test -z "$(avahi_runtime_dir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_runtime_dir)" update-systemd: curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9f97b18b4d77..fe06bcfab6d3 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.0.153"; + version = "1.1.18"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08"; + sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix new file mode 100644 index 000000000000..42621a1792cc --- /dev/null +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "backward-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "bombela"; + repo = "backward-cpp"; + rev = "v${version}"; + sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp backward.hpp $out/include + + runHook postInstall + ''; + + meta = with lib; { + description = "Beautiful stack trace pretty printer for C++"; + homepage = "https://github.com/bombela/backward-cpp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 7f127522f058..18a15c70223a 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { name = "beignet-${version}"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { url = "https://01.org/sites/default/files/${name}-source.tar.gz"; - sha256 = "07y8ga545654jdbijmplga7a7j3jn04q5gfdjsl8cax16hsv0kmp"; + sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr"; }; patches = [ ./clang_llvm.patch ]; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://cgit.freedesktop.org/beignet/"; + homepage = https://cgit.freedesktop.org/beignet/; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' The package provides an open source implementation of the OpenCL specification for Intel GPUs. diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 96b53e1ad630..4ae47d338a67 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast multi-dimensional array library for C++"; - homepage = http://sourceforge.net/projects/blitz/; + homepage = https://sourceforge.net/projects/blitz/; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.aherrmann ]; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 62d61e6cb5d5..0f899e4324c1 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig }: -let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in +let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in stdenv.mkDerivation rec { name = "boolstuff-0.1.15"; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 92e02c6ca08f..b90006a5e979 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://www.highscore.de/boost/process0.5/"; + homepage = http://www.highscore.de/boost/process0.5/; description = "Library to manage system processes"; license = licenses.boost; platforms = platforms.unix; diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix new file mode 100644 index 000000000000..1cf9bfa51f4b --- /dev/null +++ b/pkgs/development/libraries/boost/1.64.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.64.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_64_0.html + sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332"; + }; + +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 9a6c5d7b413a..22ef02023f88 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation { inherit src patches; meta = { - homepage = "http://boost.org/"; + homepage = http://boost.org/; description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 3a5378212987..ff48ffe67f0a 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, cmake, perl, go }: +# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { name = "boringssl-${version}"; - version = "2016-03-08"; + version = "2017-02-23"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122"; - sha256 = "0bm7vqg3bk716xmw2af99p44zizfhknq9z3cphf7klfdrr7ibqm5"; + rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; + sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; }; buildInputs = [ cmake perl go ]; @@ -17,8 +18,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/include $out/lib - mv tool/bssl $out/bin - mv ssl/libssl.a $out/lib + mv tool/bssl $out/bin + + mv ssl/libssl.a $out/lib + mv crypto/libcrypto.a $out/lib + mv decrepit/libdecrepit.a $out/lib + mv ../include/openssl $out/include ''; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 12670ab711ae..313ac086726f 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://sourceforge.net/projects/buddy/"; + homepage = https://sourceforge.net/projects/buddy/; description = "Binary decision diagram package"; license = "as-is"; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index a8d350d9e37d..0c9f0903f148 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bullet-${version}"; - version = "2.83.7"; + version = "2.86.1"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; + sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz"; }; buildInputs = [ cmake ] ++ diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index a3233c03712d..6dc658c03e3e 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = "http://tcl.activestate.com/software/tcllib/"; + homepage = http://tcl.activestate.com/software/tcllib/; description = "High-level widget set for Tcl/Tk"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 482cf9fdfadd..14ff7a5f16c3 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "c-ares-1.12.0"; + name = "c-ares-1.13.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; + sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3"; }; meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; - homepage = http://c-ares.haxx.se; + homepage = https://c-ares.haxx.se; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 1c55aa7f8347..66ced59c26d7 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = "http://catch-lib.net"; + homepage = http://catch-lib.net; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix deleted file mode 100644 index 01812b7baa91..000000000000 --- a/pkgs/development/libraries/ccnx/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, openssl, expat, libpcap }: -let - version = "0.8.2"; -in -stdenv.mkDerivation { - name = "ccnx-${version}"; - src = fetchurl { - url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; - sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; - }; - buildInputs = [ openssl expat libpcap ]; - preConfigure = '' - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/bin - substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" - ''; - meta = with stdenv.lib; { - homepage = "http://www.ccnx.org/"; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - To address the Internet’s modern-day requirements with a better - fitting model, PARC has created a new networking architecture - called Content-Centric Networking (CCN), which operates by addressing - and delivering Content Objects directly by Name instead of merely - addressing network end-points. In addition, the CCN security model - explicitly secures individual Content Objects rather than securing - the connection or “pipe”. Named and secured content resides in - distributed caches automatically populated on demand or selectively - pre-populated. When requested by name, CCN delivers named content to - the user from the nearest cache, thereby traversing fewer network hops, - eliminating redundant requests, and consuming less resources overall. - ''; - license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; - }; -} diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 5574e18ffa05..0bdffc9d3570 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; - homepage = "http://www.gnu.org/software/ccrtp/"; + homepage = http://www.gnu.org/software/ccrtp/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 550a660b9667..818eb6db8c69 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; + homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 673fb77f01aa..77e0cb7735d9 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; - homepage = "http://ceres-solver.org"; + homepage = http://ceres-solver.org; maintainers = with maintainers; [ giogadi ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index d49bd7eac1bc..93c187ec35ef 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -14,7 +14,7 @@ ''; meta = with stdenv.lib; { - homepage = http://heasarc.gsfc.nasa.gov/fitsio/; + homepage = https://heasarc.gsfc.nasa.gov/fitsio/; description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 09c5eeb611ba..41bde5374e8d 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; meta = with stdenv.lib; { - homepage = "http://acoustid.org/chromaprint"; + homepage = https://acoustid.org/chromaprint; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 90cfbb1865cc..b65e794a92aa 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/clucene/${name}.tar.bz2"; sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; }; - + + patches = [ ./gcc6.patch ]; + meta = { description = "Core library for full-featured text search engine"; longDescription = '' diff --git a/pkgs/development/libraries/clucene-core/gcc6.patch b/pkgs/development/libraries/clucene-core/gcc6.patch new file mode 100644 index 000000000000..f78b26d24f6a --- /dev/null +++ b/pkgs/development/libraries/clucene-core/gcc6.patch @@ -0,0 +1,146 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=998477 + +diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h +--- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 2008-10-23 12:44:35.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h 2013-08-27 13:17:35.754234297 -0500 +@@ -58,7 +58,7 @@ public: + __cl_refcount--; + return __cl_refcount; + } +- virtual ~LuceneBase(){}; ++ virtual ~LuceneBase() throw(CLuceneError&) {}; + }; + + class LuceneVoidBase{ +diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp +--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 2013-08-27 13:17:35.754234297 -0500 ++++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp 2013-08-27 13:18:02.844949386 -0500 +@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D + ) + } + +-CompoundFileReader::~CompoundFileReader(){ ++CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) { + close(); + } + +diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h +--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 2008-10-23 12:44:37.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h 2013-08-27 13:17:35.755234286 -0500 +@@ -95,7 +95,7 @@ protected: + + public: + CompoundFileReader(CL_NS(store)::Directory* dir, char* name); +- ~CompoundFileReader(); ++ ~CompoundFileReader() throw(CLuceneError&); + CL_NS(store)::Directory* getDirectory(); + const char* getName() const; + +diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp +--- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 2008-10-23 12:44:37.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp 2013-08-27 13:17:35.755234286 -0500 +@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR + set(fld,txt); + } + +-Term::~Term(){ ++Term::~Term() throw (CLuceneError&) { + //Func - Destructor. + //Pre - true + //Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false +diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h +--- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 2008-10-23 12:44:37.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/index/Term.h 2013-08-27 13:17:35.755234286 -0500 +@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE { + Term(const TCHAR* fld, const TCHAR* txt); + + ///Destructor. +- ~Term(); ++ ~Term() throw(CLuceneError&); + + ///Returns the field of this term, an interned string. The field indicates + ///the part of a document which this term came from. +diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h +--- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/Directory.h 2013-08-27 13:17:35.756234276 -0500 +@@ -41,7 +41,7 @@ CL_NS_DEF(store) + public: + DEFINE_MUTEX(THIS_LOCK) + +- virtual ~Directory(){ }; ++ virtual ~Directory() throw(CLuceneError&) { }; + + // Returns an null terminated array of strings, one for each file in the directory. + char** list() const{ +diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp +--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 2008-10-23 13:01:52.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2013-08-27 13:17:35.756234276 -0500 +@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte + strcat(buffer,name); + } + +- FSDirectory::~FSDirectory(){ ++ FSDirectory::~FSDirectory() throw(CLuceneError&) { + } + + void FSDirectory::list(vector* names) const{ //todo: fix this, ugly!!! +diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h +--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 2008-10-23 13:00:43.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2013-08-27 13:17:35.756234276 -0500 +@@ -155,7 +155,7 @@ + ///Destructor - only call this if you are sure the directory + ///is not being used anymore. Otherwise use the ref-counting + ///facilities of _CLDECDELETE +- ~FSDirectory(); ++ ~FSDirectory() throw(CLuceneError&); + + /// Get a list of strings, one for each file in the directory. + void list(vector* names) const; +diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp +--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 +@@ -219,7 +219,7 @@ CL_NS_DEF(store) + { + } + +- RAMDirectory::~RAMDirectory(){ ++ RAMDirectory::~RAMDirectory() throw(CLuceneError&) { + //todo: should call close directory? + } + +diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h +--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 +@@ -131,7 +131,7 @@ CL_NS_DEF(store) + ///Destructor - only call this if you are sure the directory + ///is not being used anymore. Otherwise use the ref-counting + ///facilities of dir->close +- virtual ~RAMDirectory(); ++ virtual ~RAMDirectory() throw(CLuceneError&); + RAMDirectory(Directory* dir); + + /** +diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp +--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 +@@ -16,7 +16,7 @@ CL_NS_USE(util) + { + transOpen = false; + } +- TransactionalRAMDirectory::~TransactionalRAMDirectory(){ ++ TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) { + } + + bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) { +diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h +--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 ++++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 +@@ -44,7 +44,7 @@ CL_NS_DEF(store) + + public: + TransactionalRAMDirectory(); +- virtual ~TransactionalRAMDirectory(); ++ virtual ~TransactionalRAMDirectory() throw(CLuceneError&); + + bool transIsOpen() const; + void transStart(); diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 063d07e35243..fcd37239e911 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://cppcms.com"; + homepage = http://cppcms.com; description = "High Performance C++ Web Framework"; platforms = platforms.linux ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 68fcb2ba25b7..72fa309b721f 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "--no-warn-unused-cli" ]; meta = with stdenv.lib; { - homepage = "http://cppcms.com/sql/cppdb/"; + homepage = http://cppcms.com/sql/cppdb/; description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; platforms = platforms.linux ; license = licenses.boost; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 4c64cb715e4e..8d2c4bb7dd38 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://sourceforge.net/apps/mediawiki/cppunit/"; + homepage = https://sourceforge.net/apps/mediawiki/cppunit/; description = "C++ unit testing framework"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index 56154c060d1e..2dce60d4b2c4 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://cpputest.github.io/"; + homepage = http://cpputest.github.io/; description = "Unit testing and mocking framework for C/C++"; platforms = stdenv.lib.platforms.linux ; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index b1860872df36..301b245a9f54 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "2016-11-16"; + version = "4.2.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5"; - sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p"; + rev = "v${version}"; + sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk"; }; - installPhase = '' - install -Dm644 zmq.hpp $out/include/zmq.hpp - ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zeromq ]; meta = with stdenv.lib; { - homepage = "https://github.com/zeromq/cppzmq"; + homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 9baa9aba480d..c1579b717484 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 = http://josephp91.github.io/curlcpp/; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 91fb94ec048a..c620777dc5bf 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -16,7 +16,7 @@ in python2Packages.buildPythonApplication rec { sourceRoot = "${name}-src/python"; meta = with stdenv.lib; { - homepage = "http://cxxtest.com"; + homepage = http://cxxtest.com; description = "Unit testing framework for C++"; platforms = platforms.unix ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index c677ae6d867d..5dd48794f5e2 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://www.tntnet.org/cxxtools.html"; + homepage = http://www.tntnet.org/cxxtools.html; description = "Comprehensive C++ class library for Unix and Linux"; platforms = stdenv.lib.platforms.linux ; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 07f323699b1b..5dbf134cf450 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext kerberos ] + ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isFreeBSD autoreconfHook ++ lib.optional stdenv.isLinux pam ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -29,12 +30,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-openssl=${openssl.dev}" - ]; + ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"; # Set this variable at build-time to make sure $out can be evaluated. preConfigure = '' configureFlagsArray=( --with-plugindir=$out/lib/sasl2 - --with-configdir=$out/lib/sasl2 --with-saslauthd=/run/saslauthd --enable-login ) @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://cyrusimap.web.cmu.edu/"; + homepage = http://cyrusimap.web.cmu.edu/; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index 69b64629bd83..0b4aeeb0801d 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zeromq ]; meta = with stdenv.lib; { - homepage = "http://czmq.zeromq.org/"; + homepage = http://czmq.zeromq.org/; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index dd957d07340c..971d15686cab 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zeromq ]; meta = with stdenv.lib; { - homepage = "http://czmq.zeromq.org/"; + homepage = http://czmq.zeromq.org/; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index c32045559019..4a11c2b98935 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (rec { ''; meta = with stdenv.lib; { - homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; + homepage = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html; description = "Berkeley DB"; license = license; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f569f53861dc..17a5c65376b2 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.18"; - sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0"; + version = "1.10.22"; + sha256 = "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index f7d7eee91edf..47f3794f5ad5 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "https://github.com/agl/dclxvi"; + homepage = https://github.com/agl/dclxvi; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; maintainers = with maintainers; [ wkennington ]; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index e4d12de28fd4..1288f4ac2f57 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobjectIntrospection icu ]; nativeBuildInputs = [ python pkgconfig ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6 + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; - homepage = "https://launchpad.net/dee"; + homepage = https://launchpad.net/dee; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index c6f7684ecf39..47c165c1bad1 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = "https://github.com/google/double-conversion"; + homepage = https://github.com/google/double-conversion; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 2ba97af133ed..672fed2f015a 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://software.ecmwf.int/wiki/display/ECC/"; + homepage = https://software.ecmwf.int/wiki/display/ECC/; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 582b4fed9df9..94652b129345 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - + + postInstall = '' + sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc + ''; + meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 8825df657d29..b784088dc652 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Where you had a simple non-structrured string in syslog() you have a combination of description and tag/value pairs. ''; - homepage = "http://www.balabit.com/support/community/products/"; + homepage = http://www.balabit.com/support/community/products/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index ed6728482aa3..b486a327466d 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; meta = with stdenv.lib; { - homepage = http://libopenraw.freedesktop.org/wiki/Exempi/; + homepage = https://libopenraw.freedesktop.org/wiki/Exempi/; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a11be14df109..a1a07b43197f 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, zlib, expat, gettext }: stdenv.mkDerivation rec { - name = "exiv2-0.25"; + name = "exiv2-0.26"; src = fetchurl { - url = "http://www.exiv2.org/${name}.tar.gz"; - sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8"; + url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; + sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; }; postPatch = "patchShebangs ./src/svn_version.sh"; diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix deleted file mode 100644 index aa55a7f0d1dc..000000000000 --- a/pkgs/development/libraries/exosip/3.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, libosip, openssl, pkgconfig }: - -stdenv.mkDerivation rec { - version = "3.6.0"; - src = fetchurl { - url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; - }; - name = "libexosip2-${version}"; - - buildInputs = [ libosip openssl pkgconfig ]; - - meta = { - license = stdenv.lib.licenses.gpl2Plus; - description = "Library that hides the complexity of using the SIP protocol"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 3cbfc4c568d9..0a2deab796bb 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchpatch, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.1"; + name = "expat-2.2.3"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q"; + sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; + patches = [ + (fetchpatch { + name = "fix-aarch-build.patch"; + url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch"; + sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w"; + stripLen = 1; + excludes = [ "coverage.sh" ]; + }) + ]; + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index abbe07224b56..554337860028 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,27 +8,13 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { name = "faac-${version}"; - version = "1.28"; + version = "1.29.3"; src = fetchurl { url = "mirror://sourceforge/faac/${name}.tar.gz"; - sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565"; + sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf"; }; - patches = [ - (fetchpatch { - name = "faac-mp4v2-1.9.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-1.9.patch?h=packages/faac"; - sha256 = "1pja822zw9q3cg8bjkw5z0bpxsk4q92qix26zpiqbvi7vg314hyc"; - }) - (fetchpatch { - name = "faac-mp4v2-2.0.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-2.0.0.patch?h=packages/faac"; - sha256 = "07kmkrl0600rs01xqpkkw9n8p1215n485xqf8hwimp60dw3vc0wn"; - addPrefixes = true; - }) - ]; - configureFlags = [ ] ++ optional mp4v2Support "--with-external-mp4v2" ++ optional drmSupport "--enable-drm"; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 4c4ddc3ba579..6cedb4d555a5 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast json library for C"; - homepage = "https://github.com/rsyslog/libfastjson"; + homepage = https://github.com/rsyslog/libfastjson; license = licenses.mit; maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 43a5eb2103dd..59dc4721812c 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-quality implementation of the AAC codec from Android"; - homepage = http://sourceforge.net/projects/opencore-amr/; + homepage = https://sourceforge.net/projects/opencore-amr/; license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index 1222aef12f86..e5b0592daab3 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://linbox-team.github.io/fflas-ffpack/"; + homepage = https://linbox-team.github.io/fflas-ffpack/; }; } diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 7d0cb339a43a..22f4b6ceef08 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://linbox-team.github.io/fflas-ffpack/"; + homepage = https://linbox-team.github.io/fflas-ffpack/; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6246026e9ea7..d9239989cf65 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -100,7 +100,7 @@ , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code -#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder +, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder @@ -155,7 +155,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame + * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -231,16 +231,21 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r"; + sha256 = "07is8msrhxr1dk6vgwa192k2pl2a0in1h9w8f9cknlvbvhn01afj"; }; patchPhase = ''patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c + '' + stdenv.lib.optionalString (frei0r != null) '' + substituteInPlace libavfilter/vf_frei0r.c \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + substituteInPlace doc/filters.texi \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; configureFlags = [ @@ -355,7 +360,7 @@ stdenv.mkDerivation rec { (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") - #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") + (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") #(enableFeature (openh264 != null) "openh264") @@ -398,7 +403,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump + libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals nonfreeLicensing [ fdk_aac openssl ] diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index 342137553135..bf414e0865d1 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.2"; - sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91"; + branch = "3.3.3"; + sha256 = "0wx421d7vp4nz8kgp0kg16sswikj8ff1pd18x9mmcbpmqy7sqs8h"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index a34b378552a0..1bd8b7392601 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { postPatch = ''patchShebangs .''; inherit patches; - outputs = [ "bin" "dev" "out" ] + outputs = [ "bin" "dev" "out" "man" ] ++ optional (reqMin "1.0") "doc" ; # just dev-doc setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 5aa62a638fe8..6b95d0f1692f 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ffmpeg ]; meta = with stdenv.lib; { - homepage = http://github.com/FFMS/ffms2/; + homepage = https://github.com/FFMS/ffms2/; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; maintainers = with maintainers; [ fuuzetsu ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 4bbc515831e6..5cf83752aa70 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -4,7 +4,10 @@ with lib; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let version = "3.3.6-pl1"; in +let + version = "3.3.6-pl1"; + withDoc = stdenv.cc.isGNU; +in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; @@ -14,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y"; }; - outputs = [ "out" "dev" "doc" ]; # it's dev-doc only + outputs = [ "out" "dev" "man" ] + ++ optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom configureFlags = @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional stdenv.cc.isGNU "--enable-openmp" # doc generation causes Fortran wrapper generation which hard-codes gcc - ++ optional (!stdenv.cc.isGNU) "--disable-doc"; + ++ optional (!withDoc) "--disable-doc"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 145d2b42a9db..3cc518fee501 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,18 +1,17 @@ -{stdenv, fetchurl, unzip, cmake, python}: +{ stdenv, fetchFromGitHub, unzip, cmake, python }: stdenv.mkDerivation { - name = "flann-1.8.4"; + name = "flann-1.9.1"; - src = fetchurl { - url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; - sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; + src = fetchFromGitHub { + owner = "mariusmuja"; + repo = "flann"; + rev = "1.9.1"; + sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; buildInputs = [ unzip cmake python ]; - # patch out examples in Darwin because they do not compile. - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ]; - meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch deleted file mode 100644 index 95a6f0eed8eb..000000000000 --- a/pkgs/development/libraries/flann/no-examples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,7 +155,7 @@ - - add_subdirectory( cmake ) - add_subdirectory( src ) --add_subdirectory( examples ) -+#add_subdirectory( examples ) - add_subdirectory( test ) - add_subdirectory( doc ) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index be158684b5b8..94cc7688cc8b 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://www.flintlib.org/"; + homepage = http://www.flintlib.org/; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; }; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1e8d7ce543f2..286e4ac56b58 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,15 +3,23 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016.12.19.00"; + version = "2017.07.24.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn"; + sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169"; }; + patches = [ + # Fix compilation + (fetchpatch { + url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch"; + sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl"; + }) + ]; + nativeBuildInputs = [ autoreconfHook python pkgconfig ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; @@ -26,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = "https://github.com/facebook/folly"; + homepage = https://github.com/facebook/folly; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 826a44989c58..8dd78c41b14a 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; - homepage = "http://fox-toolkit.org"; + homepage = http://fox-toolkit.org; license = licenses.lgpl3; maintainers = []; platforms = platforms.all; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 87c6739e2e02..98becb8e2da1 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; - homepage = "http://fox-toolkit.org"; + homepage = http://fox-toolkit.org; license = stdenv.lib.licenses.lgpl3; maintainers = []; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 4e8be2a4f501..2f5374851d82 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = "https://launchpad.net/frame"; + homepage = https://launchpad.net/frame; description = "Handles the buildup and synchronization of a set of simultaneous touches"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 2c9a893284be..c6ea5bbd23ba 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = "http://openal.org/"; + homepage = http://openal.org/; description = "Free implementation of OpenAL's ALUT standard"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 136f18b06143..c77c3b3640b7 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X"; + description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; inherit version; homepage = http://openkinect.org; license = with stdenv.lib.licenses; [ gpl2 asl20 ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 3ed308a34920..2e06c3bbec78 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = "http://www.freetds.org"; + homepage = http://www.freetds.org; license = "lgpl"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index f3c9b95d6b47..9614762ef2a3 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "frei0r-plugins-${version}"; - version = "1.4"; + version = "1.6.1"; src = fetchurl { url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; - sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; + sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; buildInputs = [ autoconf cairo opencv pkgconfig ]; diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix index 0a4a6e6b9b00..d4afc7ad481a 100644 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; + homepage = https://sourceforge.net/apps/mediawiki/ftgl/; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 8fc69ec75685..5e94618376ba 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [freetype mesa]; meta = { - homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; + homepage = https://sourceforge.net/apps/mediawiki/ftgl/; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 8f532ae8e0b6..dd16ebd5c886 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5"; + sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48"; }; buildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A microbenchmark support library"; - homepage = "https://github.com/google/benchmark"; + homepage = https://github.com/google/benchmark; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 07f370b42100..0bb91951a28d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; -composableDerivation.composableDerivation {} (fixed: rec { - version = "2.1.3"; +stdenv.mkDerivation rec { + version = "2.2.1"; name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -22,16 +22,6 @@ composableDerivation.composableDerivation {} (fixed: rec { ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; - hardeningDisable = [ "format" ]; - - # - Unset CC and CXX as they confuse libtool. - # - teach gdal that libdf is the legacy name for libhdf - preConfigure = '' - unset CC CXX - substituteInPlace configure \ - --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" - ''; - configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) @@ -50,6 +40,25 @@ composableDerivation.composableDerivation {} (fixed: rec { (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; + hardeningDisable = [ "format" ]; + + CXXFLAGS = "-fpermissive"; + + postPatch = '' + sed -i '/ifdef bool/i\ + #ifdef swap\ + #undef swap\ + #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + ''; + + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; + preBuild = '' substituteInPlace swig/python/GNUmakefile \ --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" @@ -59,6 +68,8 @@ composableDerivation.composableDerivation {} (fixed: rec { wrapPythonPrograms ''; + enableParallelBuilding = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; @@ -66,4 +77,4 @@ composableDerivation.composableDerivation {} (fixed: rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; -}) +} diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f40ebf00590a..38c1b6197a5f 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,16 @@ let ver_maj = "2.36"; - ver_min = "6"; + ver_min = "7"; + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which apparently requires access to shared_mime_info files during runtime. in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c"; + sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5a7bff7459e3..6e043f5994df 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=pedantic"; + NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python3 dbus_libs evemu frame grail libX11 libXext libXi libXtst xorgserver ]; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 77ea6b6a0165..60d40b10aa42 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,10 +1,10 @@ # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP # e.g. geolite-legacy -{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }: +{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: -let version = "1.6.2"; in - -stdenv.mkDerivation { +let version = "1.6.2"; + dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; +in stdenv.mkDerivation { name = "${drvName}-${version}"; src = fetchurl { @@ -12,11 +12,8 @@ stdenv.mkDerivation { sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; }; - postInstall = '' - DB=${toString geoipDatabase} - if [ -n "$DB" ]; then - ln -s $DB/share/GeoIP $out/share/GeoIP - fi + postPatch = '' + find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; meta = { @@ -24,7 +21,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.raskin ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; - homepage = "http://geolite.maxmind.com/"; + homepage = http://geolite.maxmind.com/; downloadPage = "http://geolite.maxmind.com/download/"; }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 5dbf22df552d..22e7d216e6cd 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { name = "getdata-${version}"; - version = "0.9.4"; + version = "0.10.0"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.xz"; - sha256 = "0kikla8sxv6f1rlh77m86dajcsa7b1029zb8iigrmksic27mj9ja"; + sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; + buildInputs = [ libtool ]; + meta = with stdenv.lib; { description = "Reference implementation of the Dirfile Standards"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index d70588841045..b96c4599994b 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" "info" ]; # FIXME stackprotector needs gcc 4.9 in bootstrap tools hardeningDisable = [ "format" "stackprotector" ]; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index cf27249064fc..0d53d00737ba 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Git linkable library"; - homepage = http://libgit2.github.com/; + homepage = https://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index 9ba0cf081ce9..00b9cff95764 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = http://glfw.sourceforge.net/; license = licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index ec3c2f5569dd..52673061b72c 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://www.glfw.org/"; + homepage = http://www.glfw.org/; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 84c044682779..071941d66c32 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library of programming buildings blocks"; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 0b966c65f38d..5c318c9b46a2 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the GLib library"; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a4b0090296f9..4ab61a2d2826 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.62"; + name = "glpk-4.63"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9"; + sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci"; }; doCheck = true; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 1cb7fd42ccec..36067cc0786d 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -60,7 +60,7 @@ let self = stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - homepage = http://gmplib.org/; + homepage = https://gmplib.org/; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 14104b30d12d..b39b56ec116f 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -51,7 +51,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://gmplib.org/"; + homepage = https://gmplib.org/; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 92dd602fc4d8..e3bacc86d58e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -50,7 +50,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://gmplib.org/"; + homepage = https://gmplib.org/; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index c6240c40578c..e3b345b31ee9 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU EFI development toolchain"; - homepage = http://sourceforge.net/projects/gnu-efi/; + homepage = https://sourceforge.net/projects/gnu-efi/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 48aa3fb96737..0b633f0a2f17 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,7 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring +, unbound, dns-root-data, gettext # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -32,13 +33,15 @@ stdenv.mkDerivation { ++ [ "--disable-dependency-tracking" "--enable-fast-install" + "--with-unbound-root-key-file=${dns-root-data}/root.key" ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv + ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 8b4103dec7fa..7971448133ea 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.34"; + name = "goffice-0.10.35"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603"; + sha256 = "c19001afca09dc5446e06605a113d81a57124018a09c5889aeebba16cf1d5738"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8ae88944dd14..9773ef8b896e 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -32,12 +32,15 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gnupg}/bin" ]; - # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html NIX_CFLAGS_COMPILE = - lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + # qgpgme uses Q_ASSERT which retains build inputs at runtime unless + # debugging is disabled + lib.optional (qtbase != null) "-DQT_NO_DEBUG" + # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; meta = with stdenv.lib; { - homepage = "https://gnupg.org/software/gpgme/index.html"; + homepage = https://gnupg.org/software/gpgme/index.html; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 3464e2294952..c8b1c0bdd9be 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "grail-${version}"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9"; + sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; buildInputs = [ pkgconfig python3 frame ] @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = "https://launchpad.net/canonical-multitouch/grail"; + homepage = https://launchpad.net/canonical-multitouch/grail; description = "Gesture Recognition And Instantiation Library"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5/default.nix similarity index 60% rename from pkgs/development/libraries/grantlee/5.x.nix rename to pkgs/development/libraries/grantlee/5/default.nix index fb6af9c895d3..6fae90a8d890 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "grantlee-${version}"; version = "5.1.0"; + grantleeCompatVersion = "5.1"; + grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; @@ -13,7 +15,19 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - meta = { + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" "dev" ]; + postFixup = + # Disabuse CMake of the notion that libraries are in $dev + '' + sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ + -e "s|\''${_IMPORT_PREFIX}|$out|" + ''; + + setupHook = ./setup-hook.sh; + + meta = with lib; { description = "Qt5 port of Django template system"; longDescription = '' Grantlee is a plugin based String Template system written using the Qt @@ -25,7 +39,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ ]; + maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch new file mode 100644 index 000000000000..f6c13dbd6d55 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch @@ -0,0 +1,19 @@ +Index: grantlee-5.1.0/templates/lib/engine.cpp +=================================================================== +--- grantlee-5.1.0.orig/templates/lib/engine.cpp ++++ grantlee-5.1.0/templates/lib/engine.cpp +@@ -48,6 +48,14 @@ Engine::Engine(QObject *parent) + + d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths(); + d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH); ++ ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib")); ++ } ++ } + } + + Engine::~Engine() diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch new file mode 100644 index 000000000000..d78ef74ce352 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -0,0 +1,27 @@ +Index: grantlee-5.1.0/templates/lib/templateloader.cpp +=================================================================== +--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp ++++ grantlee-5.1.0/templates/lib/templateloader.cpp +@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB + + QLatin1Char('/') + fileName); + const QFileInfo fi(file); + +- if (file.exists() +- && !fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- return Template(); + ++i; + } + +@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + + QLatin1Char('/') + fileName); + + const QFileInfo fi(file); +- if (!fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) { +- ++i; +- continue; +- } + + if (file.exists()) { + auto path = fi.absoluteFilePath(); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series new file mode 100644 index 000000000000..9c4015a1c197 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/series @@ -0,0 +1,2 @@ +grantlee-nix-profiles.patch +grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh new file mode 100644 index 000000000000..d11ef5883a1f --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -0,0 +1,23 @@ +grantleePluginPrefix=@grantleePluginPrefix@ + +providesGrantleeRuntime() { + [ -d "$1/$grantleePluginPrefix" ] +} + +_grantleeCrossEnvHook() { + if providesQtRuntime "$1"; then + propagatedBuildInputs+=" $1" + propagatedUserEnvPkgs+=" $1" + fi +} +crossEnvHooks+=(_grantleeCrossEnvHook) + +_grantleeEnvHook() { + if providesGrantleeRuntime "$1"; then + propagatedNativeBuildInputs+=" $1" + if [ -z "$crossConfig" ]; then + propagatedUserEnvPkgs+=" $1" + fi + fi +} +envHooks+=(_grantleeEnvHook) diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 80e05b8d7434..f091fedeb2de 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { - homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; + homepage = https://software.ecmwf.int/wiki/display/GRIB/Home; license = licenses.asl20; platforms = with platforms; linux ++ darwin; description = "ECMWF Library for the GRIB file format"; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 89abd93180d9..7d44b8e2dbfc 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -1,19 +1,32 @@ -{ stdenv, fetchurl, unzip, m4, bison, flex, openssl, zlib }: +{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: -stdenv.mkDerivation rec { +let + majorVersion = "2.8"; + +in stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.42"; + version = "${majorVersion}.49"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; - sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7"; + url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; + sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj"; }; - buildInputs = [ unzip m4 bison flex openssl zlib ]; + buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ autoreconfHook bison flex m4 unzip ]; + # Parallel building doesn't work as of 2.8.49 + enableParallelBuilding = false; + + # Future versions of automake require subdir-objects if the source is structured this way + # As of 2.8.49 (maybe earlier) this is needed to silence warnings + prePatch = '' + substituteInPlace configure.ac \ + --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' + ''; meta = with stdenv.lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; - homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; + homepage = http://www.cs.fsu.edu/~engelen/soap.html; # gsoap is dual/triple licensed (see homepage for details): # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1). # Components NOT covered by the gSOAP Public License are: @@ -27,6 +40,6 @@ stdenv.mkDerivation rec { # restrictions) license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4efef2582118..69378d95a301 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null +, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms , libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg @@ -10,6 +11,7 @@ }: assert faacSupport -> faac != null; +assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc - faad2 libass libkate libmms + faad2 gtk3 libass libkate libmms libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optional faacSupport faac + # for gtksink + ++ optional gtkSupport gtk3 ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 960805cdcfc9..70aa9101ad8b 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { meta = { description = "Base plugins and helper libraries"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = http://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 54ff189caeff..4bd7fb5396ac 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source multimedia framework"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = http://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c28cfca31c56..c18d8332b0c0 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -4,6 +4,7 @@ , libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca , libsoup, libpulseaudio, libintlOrEmpty +, darwin }: let @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { libsoup libshout ] ++ libintlOrEmpty + ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; preFixup = '' diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index a1e28efbff46..a41695655114 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface for GStreamer"; - homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html; + homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; maintainers = with maintainers; [ romildo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 0e8dfec65f4b..608be6538890 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" + "https://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gstreamer pkgconfig ]; meta = { - homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 484075f73f75..953f8900ade9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { - homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; + homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg; description = "GStreamer's plug-in using FFmpeg"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 304d02087b49..c20d32e810c4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Library for constructing graphs of media-handling components"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index f181aa029bd7..8acaefcedf46 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = http://www.gtkmm.org/; + homepage = https://www.gtkmm.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ plcplc ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c67a3c708b32..f312a14de24f 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -4,7 +4,7 @@ }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See -# http://gstreamer.freedesktop.org/releases/1.6/ for more info. +# https://gstreamer.freedesktop.org/releases/1.6/ for more info. assert withSystemLibav -> libav != null; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { name = "gst-libav-1.10.4"; meta = { - homepage = "http://gstreamer.freedesktop.org"; + homepage = http://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index ae32c8f95aec..caca54400841 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = "http://gstreamer.freedesktop.org"; + homepage = http://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index d973bc1f3b61..b537ad2897d7 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = { description = "Integration testing infrastructure for the GStreamer framework"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = http://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index b94cd88869bf..8a023be56299 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://foicica.com/gtdialog"; + homepage = http://foicica.com/gtdialog; downloadPage = "http://foicica.com/gtdialog/download"; }; } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index f6e718d82e9a..45222b7d7fcc 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 917371678e9d..1071af614480 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "15"; + ver_min = "18"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb"; + sha256 = "b64b1c2ec20adf128ac08ee704d1f4e7b0a8d3df097d51f62edb271c7bb1bf69"; }; outputs = [ "out" "dev" ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { royalties. ''; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 85550b5d5289..ffbab3fce421 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK+"; - homepage = "https://gtkd.org"; + homepage = https://gtkd.org; licence = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 1ec2a7cd6f0d..469c6adc6f76 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 49055f6b4a95..89230fab6581 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index c6cc51b1e1f8..5376482e58a5 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ enchant ]; meta = with stdenv.lib; { - homepage = "http://gtkspell.sourceforge.net/"; + homepage = http://gtkspell.sourceforge.net/; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 5116e39562c8..0157fa1762c7 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "GLib libusb wrapper"; - homepage = http://people.freedesktop.org/~hughsient/releases/; + homepage = https://people.freedesktop.org/~hughsient/releases/; license = stdenv.lib.licenses.lgpl21; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f225f34c3364..11c3134e10bb 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # ToDo: one probably should specify schemas for samba and others here preFixup = '' - wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + for f in $out/libexec/*; do + wrapProgram $f \ + ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 191d3365d6c2..8885f2a2c432 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.4.6"; + version = "1.4.8"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293"; + sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 452a159bb28c..6b08a0fd86f7 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ standard library for concurrency and parallelism"; - homepage = "https://github.com/STEllAR-GROUP/hpx"; + homepage = https://github.com/STEllAR-GROUP/hpx; license = stdenv.lib.licenses.boost; platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ bobakker ]; diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index fd456ca6209b..ec6b304dc3ce 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -4,6 +4,7 @@ let dict = a: stdenv.mkDerivation ({ inherit (hspell) src patchPhase nativeBuildInputs; meta = hspell.meta // { + broken = true; description = "${a.buildFlags} Hebrew dictionary"; } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 952050f0e8f7..dfb45aa598d7 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla Firefox 3 & Thunderbird, Google Chrome, and it is also used by - proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and + proprietary software packages, like macOS, InDesign, memoQ, Opera and SDL Trados. Main features: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { * C++ library under GPL/LGPL/MPL tri-license. * Interfaces and ports: * Enchant (Generic spelling library from the Abiword project), - * XSpell (Mac OS X port, but Hunspell is part of the OS X from version 10.6 (Snow Leopard), and + * XSpell (macOS port, but Hunspell is part of the macOS from version 10.6 (Snow Leopard), and now it is enough to place Hunspell dictionary files into ~/Library/Spelling or /Library/Spelling for spell checking), * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO. diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 0d21649a9b1f..37c00f3e2aa8 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,30 +1,13 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: -with stdenv.lib; let - mkDict = - { name, src, meta, readmeFile, dictFileName, ... }: - let - isFrench = hasSuffix "fr_" dictFileName; - isItaly = hasSuffix "it_" dictFileName; - isSpanish = hasSuffix "es_" dictFileName; - isEnglish = hasSuffix "en_" dictFileName; - in - stdenv.mkDerivation rec { - inherit name src meta; - buildInputs = [ unzip ]; - sourceRoot = "."; - phases = "unpackPhase installPhase" + (if isItaly then "patchPhase" else ""); - unpackCmd = "unzip $src ${readmeFile} ${dictFileName}.dic ${dictFileName}.aff"; - prePatch = if isItaly then '' - # Fix dic file empty lines (FS#22275) - sed '/^\/$/d' -i it_IT.dic - '' else ""; - + { name, readmeFile, dictFileName, ... }@args: + stdenv.mkDerivation (rec { + inherit name; installPhase = '' # hunspell dicts install -dm755 "$out/share/hunspell" @@ -38,7 +21,45 @@ let install -dm755 "$out/share/doc" install -m644 ${readmeFile} $out/share/doc/${name}.txt ''; - }; + } // args); + + mkDictFromRla = + { shortName, shortDescription, dictFileName }: + mkDict rec { + inherit dictFileName; + version = "2.2"; + name = "hunspell-dict-${shortName}-rla-${version}"; + readmeFile = "README.txt"; + src = fetchFromGitHub { + owner = "sbosio"; + repo = "rla-es"; + rev = "v${version}"; + sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8"; + }; + meta = with stdenv.lib; { + description = "Hunspell dictionary for ${shortDescription} from rla"; + homepage = https://github.com/sbosio/rla-es; + license = with licenses; [ gpl3 lgpl3 mpl11 ]; + maintainers = with maintainers; [ renzo ]; + platforms = platforms.all; + }; + phases = "unpackPhase patchPhase buildPhase installPhase"; + buildInputs = [ bash coreutils unzip which zip ]; + patchPhase = '' + substituteInPlace ortograf/herramientas/make_dict.sh \ + --replace /bin/bash bash \ + --replace /dev/stderr stderr.log + + substituteInPlace ortograf/herramientas/remover_comentarios.sh \ + --replace /bin/bash bash \ + ''; + buildPhase = '' + cd ortograf/herramientas + bash -x ./make_dict.sh -l ${dictFileName} -2 + unzip ${dictFileName}.zip \ + ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; + }; mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: @@ -54,11 +75,17 @@ let meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = "http://www.dicollecte.org/home.php?prj=fr"; + homepage = https://www.dicollecte.org/home.php?prj=fr; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; mkDictFromWordlist = @@ -75,9 +102,15 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; - mkLinguistico = + mkDictFromLinguistico = { shortName, shortDescription, dictFileName, src }: mkDict rec { inherit src dictFileName; @@ -85,11 +118,21 @@ let name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/linguistico/; + homepage = https://sourceforge.net/projects/linguistico/; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase patchPhase installPhase"; + sourceRoot = "."; + prePatch = '' + # Fix dic file empty lines (FS#22275) + sed '/^\/$/d' -i ${dictFileName}.dic + ''; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; mkDictFromXuxen = @@ -169,6 +212,134 @@ in { }; }; + /* SPANISH */ + + es-any = mkDictFromRla { + shortName = "es-any"; + shortDescription = "Spanish (any variant)"; + dictFileName = "es_ANY"; + }; + + es-ar = mkDictFromRla { + shortName = "es-ar"; + shortDescription = "Spanish (Argentina)"; + dictFileName = "es_AR"; + }; + + es-bo = mkDictFromRla { + shortName = "es-bo"; + shortDescription = "Spanish (Bolivia)"; + dictFileName = "es_BO"; + }; + + es-cl = mkDictFromRla { + shortName = "es-cl"; + shortDescription = "Spanish (Chile)"; + dictFileName = "es_CL"; + }; + + es-co = mkDictFromRla { + shortName = "es-co"; + shortDescription = "Spanish (Colombia)"; + dictFileName = "es_CO"; + }; + + es-cr = mkDictFromRla { + shortName = "es-cr"; + shortDescription = "Spanish (Costra Rica)"; + dictFileName = "es_CR"; + }; + + es-cu = mkDictFromRla { + shortName = "es-cu"; + shortDescription = "Spanish (Cuba)"; + dictFileName = "es_CU"; + }; + + es-do = mkDictFromRla { + shortName = "es-do"; + shortDescription = "Spanish (Dominican Republic)"; + dictFileName = "es_DO"; + }; + + es-ec = mkDictFromRla { + shortName = "es-ec"; + shortDescription = "Spanish (Ecuador)"; + dictFileName = "es_EC"; + }; + + es-es = mkDictFromRla { + shortName = "es-es"; + shortDescription = "Spanish (Spain)"; + dictFileName = "es_ES"; + }; + + es-gt = mkDictFromRla { + shortName = "es-gt"; + shortDescription = "Spanish (Guatemala)"; + dictFileName = "es_GT"; + }; + + es-hn = mkDictFromRla { + shortName = "es-hn"; + shortDescription = "Spanish (Honduras)"; + dictFileName = "es_HN"; + }; + + es-mx = mkDictFromRla { + shortName = "es-mx"; + shortDescription = "Spanish (Mexico)"; + dictFileName = "es_MX"; + }; + + es-ni = mkDictFromRla { + shortName = "es-ni"; + shortDescription = "Spanish (Nicaragua)"; + dictFileName = "es_NI"; + }; + + es-pa = mkDictFromRla { + shortName = "es-pa"; + shortDescription = "Spanish (Panama)"; + dictFileName = "es_PA"; + }; + + es-pe = mkDictFromRla { + shortName = "es-pe"; + shortDescription = "Spanish (Peru)"; + dictFileName = "es_PE"; + }; + + es-pr = mkDictFromRla { + shortName = "es-pr"; + shortDescription = "Spanish (Puerto Rico)"; + dictFileName = "es_PR"; + }; + + es-py = mkDictFromRla { + shortName = "es-py"; + shortDescription = "Spanish (Paraguay)"; + dictFileName = "es_PY"; + }; + + es-sv = mkDictFromRla { + shortName = "es-sv"; + shortDescription = "Spanish (El Salvador)"; + dictFileName = "es_SV"; + }; + + es-uy = mkDictFromRla { + shortName = "es-uy"; + shortDescription = "Spanish (Uruguay)"; + dictFileName = "es_UY"; + }; + + es-ve = mkDictFromRla { + shortName = "es-ve"; + shortDescription = "Spanish (Venezuela)"; + dictFileName = "es_VE"; + }; + /* FRENCH */ fr-any = mkDictFromDicollecte { @@ -215,7 +386,7 @@ in { /* ITALIAN */ - it-it = mkLinguistico rec { + it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 4506d3c41048..ed500ca518fd 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-static" "--enable-shared" ]; meta = with stdenv.lib; { - homepage = "https://www.openprinting.org/download/ijs/"; + homepage = https://www.openprinting.org/download/ijs/; description = "Raster printer driver architecture"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 2ae8aad5ffc4..4af2bba9160d 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; + homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html; updateWalker = true; }; } diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 7db9b1a0e421..b4fea7c1fa4a 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; @@ -45,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)"; - homepage = "https://launchpad.net/indicators-gtk2"; + homepage = https://launchpad.net/indicators-gtk2; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 4847eba22ed4..03afd6f1e878 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Indicator to take menus from applications and place them in the panel"; - homepage = "https://launchpad.net/indicator-application"; + homepage = https://launchpad.net/indicator-application; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 5a3085ba7285..70ed2d00fead 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "http://www.digip.org/jansson/"; + homepage = http://www.digip.org/jansson/; description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index eb4406572788..9a5527b5a131 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.zeromq.org"; + homepage = http://www.zeromq.org; description = "Java bindings for ZeroMQ"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 35eabdd35563..2bda74b44939 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; + homepage = http://www.cl.cam.ac.uk/~mgk25/jbigkit/; description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 3c725223979e..0766a589a2e0 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -4,7 +4,7 @@ mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index ec4deae6cb40..9717e770ed51 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -7,7 +7,7 @@ mkDerivation { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 9e4a40b22aba..c8382ed3408b 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,9 +1,13 @@ -{ mkDerivation, lib, extra-cmake-modules, qtsvg }: +{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg }: mkDerivation { name = "breeze-icons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; outputs = [ "out" ]; # only runtime outputs + postInstall = '' + gtk-update-icon-cache "''${out:?}/share/icons/breeze" + gtk-update-icon-cache "''${out:?}/share/icons/breeze-dark" + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d92e7d19c650..d5995459fd4f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -86,7 +86,7 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { - homepage = "http://www.kde.org"; + homepage = http://www.kde.org; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index dfdb6a11803d..86be0398e06f 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -13,7 +13,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = "http://www.kde.org"; + homepage = http://www.kde.org; license = licenses.bsd2; maintainers = [ maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 480b11622c05..a0fe6a17e8d8 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.37/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 1f90db2bc028..8c55f8da6a0c 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -8,7 +8,7 @@ mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 lzma zlib ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch deleted file mode 100644 index e82ce7d592c8..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kcmutils-5.33.0/src/kcmoduleloader.cpp -=================================================================== ---- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp -+++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con - if (module) { - return module; - } else { -- KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); -+ KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { - qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series index 6fbc4ca65635..f2c22554a455 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/series +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series @@ -1,3 +1,2 @@ kcmutils-follow-symlinks.patch kcmutils-debug-module-loader.patch -kcmutils-fix-plugin-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 90c9a963a60e..978db644a56f 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,13 +1,13 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, gperf }: mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools ]; + buildInputs = [ qttools gperf ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 78b554017ee8..2650843aa55d 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -4,7 +4,7 @@ mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 34073d64f89f..6658e4dca100 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared_mime_info ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index d0c744da8864..c94167d5d76d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 91b596cc4d38..8418863eabb5 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -11,6 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews - kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet + kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet ]; + propagatedBuildInputs = [ qttools ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 9382db43e2d5..9e2f827eff59 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 7f325c88049e..ac2092168285 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib + attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,8 +9,8 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib + attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia + taglib ]; - propagatedBuildInputs = [ qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 5cc7e3607828..66cd8ddf64f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 3724d078afff..5bb3078ea867 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -3,7 +3,7 @@ extra-cmake-modules, perl, giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, - kxmlgui, phonon, qtx11extras, sonnet + kxmlgui, phonon, qtx11extras, sonnet, gperf }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { buildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon - qtx11extras sonnet + qtx11extras sonnet gperf ]; propagatedBuildInputs = [ kjs ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 805cb201bd74..3b9ca74bbd07 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -8,7 +8,7 @@ mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python ]; diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 69d83eb0ff5f..a1e53bb408bd 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index faeb5b16c34d..91bc3e2b98d4 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index c4c0e804e2d3..004d1ac77a6d 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 5ff37fb1db12..380fd8fc5e34 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 9782320a4873..826999f2f9be 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, - qtdeclarative, solid, threadweaver + qtdeclarative, solid, threadweaver, kwindowsystem }: mkDerivation { @@ -13,5 +13,5 @@ mkDerivation { kconfig kcoreaddons ki18n kio kservice qtdeclarative solid threadweaver ]; - propagatedBuildInputs = [ plasma-framework qtbase ]; + propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch deleted file mode 100644 index 00f3d8baedf9..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in -index 76eb90e..7a78e83 100644 ---- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in -+++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in -@@ -1,3 +1,3 @@ - [D-BUS Service] - Name=org.kde.kwalletd5 --Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5 -+Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5 diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index ece915071ad0..fca0dedd083e 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -15,5 +15,4 @@ mkDerivation { knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme ]; propagatedBuildInputs = [ qtbase ]; - patches = [ ./kwallet-dbus.patch ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 096100980d61..ee19b39bd159 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ wayland ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index e607f90de8db..63a95bc217c8 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index fa9078eeb205..ffad3b1a7fde 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index cdf09a48b4fa..195e90feef6f 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -8,7 +8,7 @@ mkDerivation { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 3ed56bbf718d..4ded321674f7 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -8,7 +8,7 @@ mkDerivation { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index 24705d6c114a..d1beb03fa620 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -8,9 +8,9 @@ mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; - nativeBuildInputs = [ bison extra-cmake-modules flex ]; + nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; propagatedUserEnvPkgs = [ media-player-info ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 90e2169c1667..cccd92513583 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -7,7 +7,7 @@ mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ hunspell qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 88a943c4fcda..090478ad04d0 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,603 @@ { attica = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz"; - sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53"; - name = "attica-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/attica-5.37.0.tar.xz"; + sha256 = "13jqk4w9crh8pca6n9334l1gb8bmwf86pa36k0mfh5j19dq72g2p"; + name = "attica-5.37.0.tar.xz"; }; }; baloo = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz"; - sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya"; - name = "baloo-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/baloo-5.37.0.tar.xz"; + sha256 = "19sl07lhjrri40vfi8wl6azgmg08lgfb98xx110j6spjbbbnww79"; + name = "baloo-5.37.0.tar.xz"; }; }; bluez-qt = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz"; - sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df"; - name = "bluez-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz"; + sha256 = "1x6nj7vsn0sp9rckzkcbl6fwm7qzj5w98w2qys1fndb1spl7av8s"; + name = "bluez-qt-5.37.0.tar.xz"; }; }; breeze-icons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz"; - sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a"; - name = "breeze-icons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz"; + sha256 = "17nr2phd0nxyx49igvl170ksikapgc4365z26pw0dmmw41llcbxw"; + name = "breeze-icons-5.37.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz"; - sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5"; - name = "extra-cmake-modules-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz"; + sha256 = "1jr7nmhh4kyz1g454qkldfhimfjvvylqa19zna5iak08bkq8q696"; + name = "extra-cmake-modules-5.37.0.tar.xz"; }; }; frameworkintegration = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz"; - sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20"; - name = "frameworkintegration-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz"; + sha256 = "0pcy3hjqbahbx65yxz5bl0h2ah4y3fb7mq3pj1rrp2cpp92s135a"; + name = "frameworkintegration-5.37.0.tar.xz"; }; }; kactivities = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz"; - sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m"; - name = "kactivities-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kactivities-5.37.0.tar.xz"; + sha256 = "005xvzp10kvwcsl2w6ghcqgqnr2rdvv9w61i4y44y25vcb85g26v"; + name = "kactivities-5.37.0.tar.xz"; }; }; kactivities-stats = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz"; - sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r"; - name = "kactivities-stats-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz"; + sha256 = "09zsdzf77palmww7x3dzinl0hxrm4z0q0yc2fmf0d7z6cfl695y2"; + name = "kactivities-stats-5.37.0.tar.xz"; }; }; kapidox = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz"; - sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg"; - name = "kapidox-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kapidox-5.37.0.tar.xz"; + sha256 = "1xwkaamifxjghv158rwslndfd9z70rm9ixnp1mmkgw8radwsqg5v"; + name = "kapidox-5.37.0.tar.xz"; }; }; karchive = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz"; - sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw"; - name = "karchive-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/karchive-5.37.0.tar.xz"; + sha256 = "1599lql0kcx705313bfvbazr7rayr6vsiwrpiq6iwljzc7lli1im"; + name = "karchive-5.37.0.tar.xz"; }; }; kauth = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz"; - sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d"; - name = "kauth-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kauth-5.37.0.tar.xz"; + sha256 = "0ciz28bvbvxlv0iz0cgs31x2m1czkki21ypzqj8rg2ix8jw2p65w"; + name = "kauth-5.37.0.tar.xz"; }; }; kbookmarks = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz"; - sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v"; - name = "kbookmarks-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz"; + sha256 = "0l6rkj0b7hk2wg6dypj1dkl8pcd1vx89gaiixbhkd3vf7jp46n41"; + name = "kbookmarks-5.37.0.tar.xz"; }; }; kcmutils = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz"; - sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy"; - name = "kcmutils-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz"; + sha256 = "1ik1505f16swsmvrv62dacis33f1ccnmkw3zbhb84vbrbqyskvzx"; + name = "kcmutils-5.37.0.tar.xz"; }; }; kcodecs = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz"; - sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash"; - name = "kcodecs-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz"; + sha256 = "0kmk97b5vbnyb3xjxwmg3l47aka8mkf50g4p7wvr096qwplffbva"; + name = "kcodecs-5.37.0.tar.xz"; }; }; kcompletion = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz"; - sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw"; - name = "kcompletion-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz"; + sha256 = "0qhjkqmd1jjy50hlzsdxwgnjwpfdrz3njl5n88h3nzp83yjv1ljz"; + name = "kcompletion-5.37.0.tar.xz"; }; }; kconfig = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz"; - sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x"; - name = "kconfig-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kconfig-5.37.0.tar.xz"; + sha256 = "1f0y2gmwy05b17clr7vg1zp18l1z0fd757v02ha7cwd64yznyr5d"; + name = "kconfig-5.37.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz"; - sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk"; - name = "kconfigwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz"; + sha256 = "001d1nj8q6xpl71rwm15rnvy5ajyxpvknvf4ic7p5pbik3021bs6"; + name = "kconfigwidgets-5.37.0.tar.xz"; }; }; kcoreaddons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz"; - sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90"; - name = "kcoreaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz"; + sha256 = "0a45sz11d7b2d8sbr9z57mv337nbhd94fiqk3issw470n0y46g3y"; + name = "kcoreaddons-5.37.0.tar.xz"; }; }; kcrash = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz"; - sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3"; - name = "kcrash-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kcrash-5.37.0.tar.xz"; + sha256 = "16k2pwf3s3adgayd9vq7kk8c5gnq9g6wra4psrvs3a3c5k5am5y0"; + name = "kcrash-5.37.0.tar.xz"; }; }; kdbusaddons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz"; - sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h"; - name = "kdbusaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz"; + sha256 = "0745arkp4wnpwyhjq02h7lfac049cmlg5qwhf96i7ss0w54vch4i"; + name = "kdbusaddons-5.37.0.tar.xz"; }; }; kdeclarative = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz"; - sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2"; - name = "kdeclarative-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz"; + sha256 = "1ish46m2dpnpqjnf8g660clcg7ky65w11cbk2m79pwyhqvhxgggj"; + name = "kdeclarative-5.37.0.tar.xz"; }; }; kded = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz"; - sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq"; - name = "kded-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kded-5.37.0.tar.xz"; + sha256 = "162s5qx2qb0bi889f8jjvd3ci31azd8iwp25i04vwi0lzglwb8gy"; + name = "kded-5.37.0.tar.xz"; }; }; kdelibs4support = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz"; - sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0"; - name = "kdelibs4support-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz"; + sha256 = "1zz100m1sqfmg3ni7023b99qn79jhdd2ryw6534axl5zgn0sglh9"; + name = "kdelibs4support-5.37.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz"; - sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah"; - name = "kdesignerplugin-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz"; + sha256 = "1197003bqcdpsyn6faasr2nhaadh7ryg92vjpqim78af3vwinsdw"; + name = "kdesignerplugin-5.37.0.tar.xz"; }; }; kdesu = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz"; - sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id"; - name = "kdesu-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdesu-5.37.0.tar.xz"; + sha256 = "1qfhkzk6l9rfdyiad8y6k30zlhziz3q2dxvxkmnghxmkg98yhdza"; + name = "kdesu-5.37.0.tar.xz"; }; }; kdewebkit = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz"; - sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk"; - name = "kdewebkit-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz"; + sha256 = "1ph3a50wix42hmsbc9jbfxla172aihjx9yzp9rza09j1a7va3hg1"; + name = "kdewebkit-5.37.0.tar.xz"; }; }; kdnssd = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz"; - sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80"; - name = "kdnssd-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz"; + sha256 = "03rd6znn2qwndn4m3bb03slwyic06ry535rawgyh06lfps0fcc5z"; + name = "kdnssd-5.37.0.tar.xz"; }; }; kdoctools = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz"; - sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h"; - name = "kdoctools-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz"; + sha256 = "0gbc5qqim6262hvkl9pf6rynnblxb3hsw3c4ars03ip7n761y0zl"; + name = "kdoctools-5.37.0.tar.xz"; }; }; kemoticons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz"; - sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8"; - name = "kemoticons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz"; + sha256 = "1cx978s1dm3v1jh4aymncxs44iizdqp174dqg9m5mf043fcvvinq"; + name = "kemoticons-5.37.0.tar.xz"; }; }; kfilemetadata = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz"; - sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5"; - name = "kfilemetadata-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz"; + sha256 = "17mbm6pdi6ac61kj2qzxf7y3rbxhxg9rwqr7qy766gh3img2vq8p"; + name = "kfilemetadata-5.37.0.tar.xz"; }; }; kglobalaccel = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz"; - sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a"; - name = "kglobalaccel-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz"; + sha256 = "1d84q3r6q5n2lclym9a9m1brfqnq3p3dykfpzvhcba3bjxh3cdsb"; + name = "kglobalaccel-5.37.0.tar.xz"; }; }; kguiaddons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz"; - sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx"; - name = "kguiaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz"; + sha256 = "13g6nlw8fk135i6z3f8ichy8whxd6v4rycg80dlvm25h66rg6vn5"; + name = "kguiaddons-5.37.0.tar.xz"; }; }; khtml = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz"; - sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv"; - name = "khtml-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz"; + sha256 = "1n0mx2xy9n5ffhvh58z3kn61aa7dhppsrwgxk697pybqy1h45ah2"; + name = "khtml-5.37.0.tar.xz"; }; }; ki18n = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz"; - sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7"; - name = "ki18n-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/ki18n-5.37.0.tar.xz"; + sha256 = "1c1sy4pbhlwsajs2972brdmma5val72gkil6k0a0f58nfvvg952d"; + name = "ki18n-5.37.0.tar.xz"; }; }; kiconthemes = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz"; - sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii"; - name = "kiconthemes-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz"; + sha256 = "1j7mgfsvxa24nf1d9xyn2jv9y9j523vghsvsm73x8d3ijibchfxq"; + name = "kiconthemes-5.37.0.tar.xz"; }; }; kidletime = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz"; - sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g"; - name = "kidletime-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kidletime-5.37.0.tar.xz"; + sha256 = "01m4q3l2yq83f2dpbv6jry7cjkj6bqdgfpy5b8byaf1gf9w2firs"; + name = "kidletime-5.37.0.tar.xz"; }; }; kimageformats = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz"; - sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw"; - name = "kimageformats-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz"; + sha256 = "1knha6wjzjs0vnkljwpfinzg3hg2jyh9c07ifqvd47cprl96ickg"; + name = "kimageformats-5.37.0.tar.xz"; }; }; kinit = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz"; - sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1"; - name = "kinit-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kinit-5.37.0.tar.xz"; + sha256 = "0b7dyy4hqyf6wk7gg2l23ldnji2zl8vzyj5wd5qh4yi7rdl6js5r"; + name = "kinit-5.37.0.tar.xz"; }; }; kio = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz"; - sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva"; - name = "kio-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kio-5.37.0.tar.xz"; + sha256 = "0nxchbhs8p2d4243dyp7qa65g1p6r3ic2h6dz7w0aa0qzsy8wi29"; + name = "kio-5.37.0.tar.xz"; + }; + }; + kirigami2 = { + version = "5.37.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz"; + sha256 = "1z42rsi8nzshrbv8m8vxkay4dq46kggglhgxbbgg2q00y8gjq9dd"; + name = "kirigami2-5.37.0.tar.xz"; }; }; kitemmodels = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz"; - sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5"; - name = "kitemmodels-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz"; + sha256 = "1nlpzzp4m0ghfz1p2hrwn4lbhjhxc8b8q8kbzqbh9hmwmimbzzrr"; + name = "kitemmodels-5.37.0.tar.xz"; }; }; kitemviews = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz"; - sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk"; - name = "kitemviews-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz"; + sha256 = "17r7vnlyiiifhrz4gb4fifshn1jb4c67lhadczi8d301rzk7wwsm"; + name = "kitemviews-5.37.0.tar.xz"; }; }; kjobwidgets = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz"; - sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf"; - name = "kjobwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz"; + sha256 = "1162dxhpspd7p1735npp0amrxr5b0j467f5651k2rv6mvqfmqr4b"; + name = "kjobwidgets-5.37.0.tar.xz"; }; }; kjs = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz"; - sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq"; - name = "kjs-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz"; + sha256 = "046hy8ji4i6p2xp5gnqa8dk82sv6sbh4xg67y79i82bbi97dvq9b"; + name = "kjs-5.37.0.tar.xz"; }; }; kjsembed = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz"; - sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk"; - name = "kjsembed-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz"; + sha256 = "0w2wk5azf1b45db58qj0cdc1l056x9s1xcd09ibavx5xmdvq6br0"; + name = "kjsembed-5.37.0.tar.xz"; }; }; kmediaplayer = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz"; - sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86"; - name = "kmediaplayer-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz"; + sha256 = "0fqxrkcwwzg11zsax9q169lisnfp9jsqg4ccd6xvv8kpkz3g04jp"; + name = "kmediaplayer-5.37.0.tar.xz"; }; }; knewstuff = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz"; - sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82"; - name = "knewstuff-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz"; + sha256 = "1scnxhxx4g8j4wml6x8i5v00rpaxyzzcm7vqbra2axbql5d8g8ny"; + name = "knewstuff-5.37.0.tar.xz"; }; }; knotifications = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz"; - sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9"; - name = "knotifications-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/knotifications-5.37.0.tar.xz"; + sha256 = "0gvv6jal7n4m3y30ragjlyhghq3y2782d422im9klxqzlgdgvkb6"; + name = "knotifications-5.37.0.tar.xz"; }; }; knotifyconfig = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz"; - sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk"; - name = "knotifyconfig-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz"; + sha256 = "14kjckynszv8015p17j578l3knmkmw25d8r8ks4wavgj3db9bik5"; + name = "knotifyconfig-5.37.0.tar.xz"; }; }; kpackage = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz"; - sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q"; - name = "kpackage-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kpackage-5.37.0.tar.xz"; + sha256 = "1ikf55q2pk8vm70pqm7rmakja309zjh9z1lg0xqslq1pqd6xki7s"; + name = "kpackage-5.37.0.tar.xz"; }; }; kparts = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz"; - sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7"; - name = "kparts-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kparts-5.37.0.tar.xz"; + sha256 = "0jrd8idkz8nhkda2rwgf8rysqngiv4r5ajmrzp2kfz1pr91a6l5h"; + name = "kparts-5.37.0.tar.xz"; }; }; kpeople = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz"; - sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh"; - name = "kpeople-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kpeople-5.37.0.tar.xz"; + sha256 = "1qgp4wqp985ac1m9wakpsvk3c2driwkwrjkc3aic7dyr1p456qsf"; + name = "kpeople-5.37.0.tar.xz"; }; }; kplotting = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz"; - sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh"; - name = "kplotting-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kplotting-5.37.0.tar.xz"; + sha256 = "0k4s0qvhjm9h1bmg16l32g4bsdrp2jrcila4dgzvrb56447px0zw"; + name = "kplotting-5.37.0.tar.xz"; }; }; kpty = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz"; - sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950"; - name = "kpty-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kpty-5.37.0.tar.xz"; + sha256 = "0wb873r1ycgi11s0qx3lhvz54703yz5sax6fb6wdmri5c05gzd5a"; + name = "kpty-5.37.0.tar.xz"; }; }; kross = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz"; - sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq"; - name = "kross-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz"; + sha256 = "06pk6f6v82pd7x9rsmkhkp5r9sgcbrc503lqckl8d7argbb7j4k1"; + name = "kross-5.37.0.tar.xz"; }; }; krunner = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz"; - sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5"; - name = "krunner-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/krunner-5.37.0.tar.xz"; + sha256 = "171qbhr1yszl2gcffm47p5wiwj71w9yhvk6srhvfpiwfyh61a4ld"; + name = "krunner-5.37.0.tar.xz"; }; }; kservice = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz"; - sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37"; - name = "kservice-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kservice-5.37.0.tar.xz"; + sha256 = "1zxs5yzd3rmy33vsip4c4igk9g38kzaggw8c29sxmgr8vgdrnvhr"; + name = "kservice-5.37.0.tar.xz"; }; }; ktexteditor = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz"; - sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw"; - name = "ktexteditor-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz"; + sha256 = "0y04s1nwkf0np6iymjxf0jssin28qw2901kpb3iw8gd52ni5rrks"; + name = "ktexteditor-5.37.0.tar.xz"; }; }; ktextwidgets = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz"; - sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw"; - name = "ktextwidgets-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz"; + sha256 = "1p8ns75sbnapm6ds16hx36q9vlnz9phgy28rx0gm1ckxqvm4yzr5"; + name = "ktextwidgets-5.37.0.tar.xz"; }; }; kunitconversion = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz"; - sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm"; - name = "kunitconversion-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz"; + sha256 = "1qvq61sbv9naj5ndi5xjwx7ami0xa6bqiajr912kbbbp2257cjsi"; + name = "kunitconversion-5.37.0.tar.xz"; }; }; kwallet = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz"; - sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5"; - name = "kwallet-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kwallet-5.37.0.tar.xz"; + sha256 = "1l7jl3y0rzx2whnbp6w5p6kg71vwyccp2nwxxgcxr6541m0nihsz"; + name = "kwallet-5.37.0.tar.xz"; }; }; kwayland = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz"; - sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib"; - name = "kwayland-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kwayland-5.37.0.tar.xz"; + sha256 = "0d4c8l8k38pgj73kzlf1hsq52w31wy9wgpwph1bv0cq5yn2rjiyr"; + name = "kwayland-5.37.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz"; - sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg"; - name = "kwidgetsaddons-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz"; + sha256 = "1jmk377r1h4is2il7chh6bq8wbj21psf4b1yiw84iivg38vlpid4"; + name = "kwidgetsaddons-5.37.0.tar.xz"; }; }; kwindowsystem = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz"; - sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83"; - name = "kwindowsystem-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz"; + sha256 = "0pd2n0j5pdv1x7wf4mwcpimnah73g6l0xidhqbpg37p829jix2k2"; + name = "kwindowsystem-5.37.0.tar.xz"; }; }; kxmlgui = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz"; - sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy"; - name = "kxmlgui-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz"; + sha256 = "0jrvjlxkg9knj61b2gj2w6l96jlmww9kn4ij808ir35365x3cdg2"; + name = "kxmlgui-5.37.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz"; - sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md"; - name = "kxmlrpcclient-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz"; + sha256 = "1jn9v86dpfx43qcdcsp6lpnga9q6aa5vxjkkg4wg0wbxmw4w9gvq"; + name = "kxmlrpcclient-5.37.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz"; - sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h"; - name = "modemmanager-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz"; + sha256 = "1fqf43kvj1v1mcdlbfxbh6sh3ycvg35aml2ywh2a684iz4qzq1aq"; + name = "modemmanager-qt-5.37.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz"; - sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl"; - name = "networkmanager-qt-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz"; + sha256 = "01px9n97gyvyyfg3dp1k7dik9fprgx9i28hg8wjr2rb5dlr99jd1"; + name = "networkmanager-qt-5.37.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz"; - sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5"; - name = "oxygen-icons5-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz"; + sha256 = "1rns7n93f83qp5q11a7r5y87y0hvc0q95ar57cqy0fxsqrg4614h"; + name = "oxygen-icons5-5.37.0.tar.xz"; }; }; plasma-framework = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz"; - sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9"; - name = "plasma-framework-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz"; + sha256 = "0kamvxfzrbx3msn0cp3k20clqchz9jg5wlazz3h6p6zmrk5v16bh"; + name = "plasma-framework-5.37.0.tar.xz"; }; }; prison = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz"; - sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx"; - name = "prison-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/prison-5.37.0.tar.xz"; + sha256 = "1icsirwfh7zscm8x9g2gp7aqzhs81ahhjflwjcwpz9bh0r9f1wb7"; + name = "prison-5.37.0.tar.xz"; }; }; solid = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz"; - sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib"; - name = "solid-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/solid-5.37.0.tar.xz"; + sha256 = "1gb9gnp1a11q5abl97b7sq1if2rqcrcs0f33sakpxf1z9y0ppg8l"; + name = "solid-5.37.0.tar.xz"; }; }; sonnet = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz"; - sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs"; - name = "sonnet-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/sonnet-5.37.0.tar.xz"; + sha256 = "0sb6i464riadgb2q73nj0vy6xavr2m1sszrvghr20nj7i64f3kk0"; + name = "sonnet-5.37.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz"; - sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8"; - name = "syntax-highlighting-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz"; + sha256 = "1l56pb84z7sy0qq8xkd5w5v5418bm9n4qds0vd39ch655d47bl72"; + name = "syntax-highlighting-5.37.0.tar.xz"; }; }; threadweaver = { - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz"; - sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr"; - name = "threadweaver-5.34.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz"; + sha256 = "1hb3721r1zbbyj211886sfkcxk18k0rsdhcg9ssagx10f29rpxx4"; + name = "threadweaver-5.37.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 82c8f323a0d2..ceb8200d4c63 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 8861d2853bab..b95f70dd6743 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -8,7 +8,7 @@ mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix new file mode 100644 index 000000000000..853f02f566a0 --- /dev/null +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, fetchurl, lib, + extra-cmake-modules, qttools, + qtbase, qtsvg, +}: + +mkDerivation { + name = "kdiagram-2.6.0"; + src = fetchurl { + url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz"; + sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02"; + }; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + propagatedBuildInputs = [ qtbase qtsvg ]; + meta = { + shortDescription = "Libraries for creating business diagrams"; + license = lib.licenses.gpl2; + platforms = qtbase.meta.platforms; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index f791f3a8d6e0..81f878daaaaa 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -11,13 +11,14 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-2015-09-13"; + name = "${type}heimdal-${version}"; + version = "7.4.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b"; - sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s"; + rev = "heimdal-${version}"; + sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 8e7971d8087c..11388f25a99d 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace stdc++ c++ ''; + patches = [(fetchurl { + name = "gcc6.patch"; + url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; + sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; + })]; + buildInputs = [ zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix new file mode 100644 index 000000000000..c80c28eb14bc --- /dev/null +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, icu +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frog.json); +in + +stdenv.mkDerivation { + name = "frog"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "frog-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + libxml2 icu + languageMachines.ticcutils + languageMachines.timbl + languageMachines.mbt + languageMachines.libfolia + languageMachines.ucto + languageMachines.frogdata + ]; + + preConfigure = '' + sh bootstrap.sh + ''; + postInstall = '' + # frog expects the data files installed in the same prefix + mkdir -p $out/share/frog/; + for f in ${languageMachines.frogdata}/share/frog/*; do + ln -s $f $out/share/frog/; + done; + + make check + ''; + + meta = with stdenv.lib; { + description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; + homepage = https://languagemachines.github.io/frog; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + Frog is an integration of memory-based natural language processing (NLP) modules developed for Dutch. All NLP modules are based on Timbl, the Tilburg memory-based learning software package. Most modules were created in the 1990s at the ILK Research Group (Tilburg University, the Netherlands) and the CLiPS Research Centre (University of Antwerp, Belgium). Over the years they have been integrated into a single text processing tool, which is currently maintained and developed by the Language Machines Research Group and the Centre for Language and Speech Technology at Radboud University Nijmegen. A dependency parser, a base phrase chunker, and a named-entity recognizer module were added more recently. Where possible, Frog makes use of multi-processor support to run subtasks in parallel. + + Various (re)programming rounds have been made possible through funding by NWO, the Netherlands Organisation for Scientific Research, particularly under the CGN project, the IMIX programme, the Implicit Linguistics project, the CLARIN-NL programme and the CLARIAH programme. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix new file mode 100644 index 000000000000..d9578c380e6d --- /dev/null +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, icu +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frogdata.json); +in + +stdenv.mkDerivation { + name = "frogdata"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "frogdata-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + ]; + + preConfigure = '' + sh bootstrap.sh + ''; + + meta = with stdenv.lib; { + description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; + homepage = https://languagemachines.github.io/frog; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix new file mode 100644 index 000000000000..9cddbdd22d94 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, icu +, languageMachines }: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-libfolia.json); +in + +stdenv.mkDerivation { + name = "libfolia"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "libfolia-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 icu languageMachines.ticcutils ]; + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; + homepage = https://proycon.github.io/folia/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + A high-level C++ API to read, manipulate, and create FoLiA documents. FoLiA is an XML-based annotation format, suitable for the representation of linguistically annotated language resources. FoLiA’s intended use is as a format for storing and/or exchanging language resources, including corpora. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch b/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch new file mode 100644 index 000000000000..9037f1093bb9 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch @@ -0,0 +1,13 @@ +--- a/configure.ac 2017-06-12 06:48:15.000000000 +0200 ++++ b/configure.ac 2017-06-12 06:50:06.000000000 +0200 +@@ -76,6 +76,10 @@ + CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS" + LIBS="$LIBS $ticcutils_LIBS" + ++PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.6.16] ) ++CXXFLAGS="$CXXFLAGS $libxml2_CFLAGS" ++LIBS="$LIBS $libxml2_LIBS" ++ + AC_CONFIG_FILES([ + Makefile + mbt.pc diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix new file mode 100644 index 000000000000..0ba7e686e434 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2 +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-mbt.json); +in + +stdenv.mkDerivation { + name = "mbt"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "mbt-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + libxml2 + languageMachines.ticcutils + languageMachines.timbl + ]; + patches = [ ./mbt-add-libxml2-dep.patch ]; + preConfigure = '' + sh bootstrap.sh + ''; + + meta = with stdenv.lib; { + description = "Memory Based Tagger"; + homepage = https://languagemachines.github.io/mbt/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + MBT is a memory-based tagger-generator and tagger in one. The tagger-generator part can generate a sequence tagger on the basis of a training set of tagged sequences; the tagger part can tag new sequences. MBT can, for instance, be used to generate part-of-speech taggers or chunkers for natural language processing. It has also been used for named-entity recognition, information extraction in domain-specific texts, and disfluency chunking in transcribed speech. + + Mbt is used by Frog for Dutch tagging. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix new file mode 100644 index 000000000000..c2d449ed13c6 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/packages.nix @@ -0,0 +1,14 @@ +{ callPackage }: +{ + ticcutils = callPackage ./ticcutils.nix { }; + libfolia = callPackage ./libfolia.nix { }; + ucto = callPackage ./ucto.nix { }; + uctodata = callPackage ./uctodata.nix { }; + timbl = callPackage ./timbl.nix { }; + timblserver = callPackage ./timblserver.nix { }; + mbt = callPackage ./mbt.nix { }; + frog = callPackage ./frog.nix { }; + frogdata = callPackage ./frogdata.nix { }; + + test = callPackage ./test.nix { }; +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json new file mode 100644 index 000000000000..55c2ec20a312 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json @@ -0,0 +1,5 @@ +{ + "version": "v0.13.7", + "url": "https://api.github.com/repos/LanguageMachines/frog/tarball/v0.13.7", + "sha256": "0swyfi3g862n888qj8v8kd18745hasy0vnc70i9qlv0ji0321bnf" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json new file mode 100644 index 000000000000..1147322be6da --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json @@ -0,0 +1,5 @@ +{ + "version": "v0.13", + "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", + "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json new file mode 100644 index 000000000000..792d958213fb --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json @@ -0,0 +1,5 @@ +{ + "version": "v1.7", + "url": "https://api.github.com/repos/LanguageMachines/libfolia/tarball/v1.7", + "sha256": "0hpxdry7n2887klryc587xv46p6z6jp6hz9x7k2pk5v7jb0z4s65" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json new file mode 100644 index 000000000000..f1bbff47a28e --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json @@ -0,0 +1,5 @@ +{ + "version": "v3.2.16", + "url": "https://api.github.com/repos/LanguageMachines/mbt/tarball/v3.2.16", + "sha256": "0f9f5l84m0lmmv4km9myn3yhy67jbmk3qn2fi40dy025gx4l0x3x" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json new file mode 100644 index 000000000000..11069c6b02c7 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json @@ -0,0 +1,5 @@ +{ + "version": "v0.15", + "url": "https://api.github.com/repos/LanguageMachines/ticcutils/tarball/v0.15", + "sha256": "0lssb1klx2flmr6fy78j37i5lbq3gfhzjx24j6n72ndm2rvprvcn" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json new file mode 100644 index 000000000000..d35f2c8333aa --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json @@ -0,0 +1,5 @@ +{ + "version": "v6.4.9", + "url": "https://api.github.com/repos/LanguageMachines/timbl/tarball/v6.4.9", + "sha256": "1279npc3xlq05hnkylpbkgg941gjhvl6sd5fw4vgwcx2rwmmlaay" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json new file mode 100644 index 000000000000..d588da3f8b6e --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json @@ -0,0 +1,5 @@ +{ + "version": "v1.11", + "url": "https://api.github.com/repos/LanguageMachines/timblserver/tarball/v1.11", + "sha256": "02k8c704wr5miy82w6zj0imm7sdfnxf3db34qiaa8l3myhn17qlw" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json new file mode 100644 index 000000000000..9b05cf3e1393 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json @@ -0,0 +1,5 @@ +{ + "version": "v0.9.6", + "url": "https://api.github.com/repos/LanguageMachines/ucto/tarball/v0.9.6", + "sha256": "0fxq4j32g7kp6789xz23651c4v2j7zlz87cshfv9g1xjs7jxns3f" +} diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json new file mode 100644 index 000000000000..08069bb333bc --- /dev/null +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json @@ -0,0 +1,5 @@ +{ + "version": "v0.4", + "url": "https://api.github.com/repos/LanguageMachines/uctodata/tarball/v0.4", + "sha256": "02c78qmwi9ijpk5wila3p62fmfdy1rpmlvvzbxs3wg0rdb0nwvd2" +} diff --git a/pkgs/development/libraries/languagemachines/test.nix b/pkgs/development/libraries/languagemachines/test.nix new file mode 100644 index 000000000000..48c41ac52f22 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/test.nix @@ -0,0 +1,25 @@ +{ runCommand +, languageMachines +}: + +runCommand "frog-test" {} '' + ${languageMachines.frog}/bin/frog >$out </dev/null || expected "Stemming works" + grep "een" $out | grep "onbep" >/dev/null || expected "Tagging works" + + deps="$(echo $(awk 'BEGIN { FS = "\t*" } ; {print $1 " -> " $9 "; "}' <$out))" + test "1 -> 2; 2 -> 0; 3 -> 4; 4 -> 2; -> ;" = "$deps" || expected "Dependency parsing works" +'' diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix new file mode 100644 index 000000000000..f1cb62e68020 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, zlib, bzip2, libtar }: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ticcutils.json); +in + +stdenv.mkDerivation { + name = "ticcutils"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "ticcutils-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 + # optional: + zlib bzip2 libtar + # broken but optional: boost + ]; + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "This module contains useful functions for general use in the TiCC software stack and beyond."; + homepage = https://github.com/LanguageMachines/ticcutils; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix new file mode 100644 index 000000000000..6a60996dc604 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2 +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timbl.json); +in + +stdenv.mkDerivation { + name = "timbl"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "timbl-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + libxml2 + languageMachines.ticcutils + ]; + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "TiMBL implements several memory-based learning algorithms"; + homepage = https://github.com/LanguageMachines/timbl/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + TiMBL is an open source software package implementing several memory-based learning algorithms, among which IB1-IG, an implementation of k-nearest neighbor classification with feature weighting suitable for symbolic feature spaces, and IGTree, a decision-tree approximation of IB1-IG. All implemented algorithms have in common that they store some representation of the training set explicitly in memory. During testing, new cases are classified by extrapolation from the most similar stored cases. + + For over fifteen years TiMBL has been mostly used in natural language processing as a machine learning classifier component, but its use extends to virtually any supervised machine learning domain. Due to its particular decision-tree-based implementation, TiMBL is in many cases far more efficient in classification than a standard k-nearest neighbor algorithm would be. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix new file mode 100644 index 000000000000..d8659c9a86b3 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2 +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timblserver.json); +in + +stdenv.mkDerivation { + name = "timblserver"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "timblserver-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + libxml2 + languageMachines.ticcutils + languageMachines.timbl + ]; + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "This server for TiMBL implements several memory-based learning algorithms"; + homepage = https://github.com/LanguageMachines/timblserver/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + This implements a server for TiMBL. TiMBL is an open source software package implementing several memory-based learning algorithms, among which IB1-IG, an implementation of k-nearest neighbor classification with feature weighting suitable for symbolic feature spaces, and IGTree, a decision-tree approximation of IB1-IG. All implemented algorithms have in common that they store some representation of the training set explicitly in memory. During testing, new cases are classified by extrapolation from the most similar stored cases. + + For over fifteen years TiMBL has been mostly used in natural language processing as a machine learning classifier component, but its use extends to virtually any supervised machine learning domain. Due to its particular decision-tree-based implementation, TiMBL is in many cases far more efficient in classification than a standard k-nearest neighbor algorithm would be. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix new file mode 100644 index 000000000000..d60bca412720 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, icu +, languageMachines +}: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ucto.json); +in + +stdenv.mkDerivation { + name = "ucto"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "ucto-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + icu libxml2 + languageMachines.ticcutils + languageMachines.libfolia + languageMachines.uctodata + # TODO textcat from libreoffice? Pulls in X11 dependencies? + ]; + preConfigure = "sh bootstrap.sh;"; + + postInstall = '' + # ucto expects the data files installed in the same prefix + mkdir -p $out/share/ucto/; + for f in ${languageMachines.uctodata}/share/ucto/*; do + echo "Linking $f" + ln -s $f $out/share/ucto/; + done; + ''; + + meta = with stdenv.lib; { + description = "A rule-based tokenizer for natural language"; + homepage = https://languagemachines.github.io/ucto/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + Ucto tokenizes text files: it separates words from punctuation, and splits sentences. It offers several other basic preprocessing steps such as changing case that you can all use to make your text suited for further processing such as indexing, part-of-speech tagging, or machine translation. + + Ucto comes with tokenisation rules for several languages and can be easily extended to suit other languages. It has been incorporated for tokenizing Dutch text in Frog, a Dutch morpho-syntactic processor. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix new file mode 100644 index 000000000000..33037dbb87fa --- /dev/null +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl +, automake, autoconf, libtool, pkgconfig, autoconf-archive +, libxml2, icu +, languageMachines }: + +let + release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); +in + +stdenv.mkDerivation { + name = "uctodata"; + version = release.version; + src = fetchurl { inherit (release) url sha256; + name = "uctodata-${release.version}.tar.gz"; }; + buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive ]; + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "A rule-based tokenizer for natural language"; + homepage = https://languagemachines.github.io/ucto/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; + + longDescription = '' + Ucto tokenizes text files: it separates words from punctuation, and splits sentences. It offers several other basic preprocessing steps such as changing case that you can all use to make your text suited for further processing such as indexing, part-of-speech tagging, or machine translation. + + Ucto comes with tokenisation rules for several languages and can be easily extended to suit other languages. It has been incorporated for tokenizing Dutch text in Frog, a Dutch morpho-syntactic processor. + ''; + }; + +} diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update new file mode 100755 index 000000000000..3189637df746 --- /dev/null +++ b/pkgs/development/libraries/languagemachines/update @@ -0,0 +1,79 @@ +#!/usr/bin/env nix-shell +#!nix-shell --packages curl +#!nix-shell --packages jq +#!nix-shell --packages parallel +#!nix-shell -i bash + +# Exit immediately if a command exits with a non-zero status. +# Exit when a producer fails in a pipe +# Treat undefined variable references as errors +set -e -o pipefail -u + +# Check if working directory is (probably) right +test "./update" = $0 || { + echo "The working directory ought to be the same is the update script location. Please invoke as ./update" 1>&2 + exit 1 +} + +# Create temporary directory with automatic cleanup +readonly MY_TMP="$(mktemp -d)" +cleanup () { + rm -rf "$MY_TMP" +} +trap cleanup EXIT + +# stdout: file containing release info and a convenient placeholder +# for the sha256 attribute +getRelease () { + local owner="$1" + local repo="$2" + local out="$MY_TMP/$owner--$repo-release" + curl -fSs https://api.github.com/repos/"$owner"/"$repo"/releases/latest \ + | jq '{ version: .name, url: .tarball_url, sha256: "__SHA256__" }' \ + > "$out" + echo "$out" +} + +# 'getters' for the release info file + +# stdout: unquoted tarball url +releaseUrl () { + local file="$1" + jq -r '.url' <"$file" +} + +# stdout: unquoted version +releaseVersion () { + local file="$1" + jq -r '.version' <"$file" +} + +# Fetch release tarball and compute hash +# stdout: base32 sha256 to be used in fetchurl +getReleaseHash () { + local file="$1" + local name="$2" + nix-prefetch-url "$(releaseUrl "$file")" --name "$name-$(releaseVersion "$file").tar.gz" +} + +# Write a release info file to release-info/$owner-$repo.json +updateRelease () { + local owner="$1" + local repo="$2" + local r="$(getRelease "$owner" "$repo")" + local hash="$(getReleaseHash "$r" "$repo")" + sed \ + -e s/__SHA256__/"$hash"/\ + <"$r" \ + >"release-info/$owner-$repo.json" +} + +updateRelease LanguageMachines frogdata +updateRelease LanguageMachines frog +updateRelease LanguageMachines libfolia +updateRelease LanguageMachines mbt +updateRelease LanguageMachines ticcutils +updateRelease LanguageMachines timbl +updateRelease LanguageMachines timblserver +updateRelease LanguageMachines ucto +updateRelease LanguageMachines uctodata diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 91eb7aecea90..f465cf1cc441 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, perl}: +{stdenv, fetchurl, openssl, perl, dns-root-data}: stdenv.mkDerivation rec { pname = "ldns"; @@ -15,21 +15,35 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "examples" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; - configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"]; + configureFlags = [ + "--with-ssl=${openssl.dev}" + "--with-trust-anchor=${dns-root-data}/root.key" + "--with-drill" + "--disable-gost" + ]; postInstall = '' moveToOutput "bin/ldns-config" "$dev" + + pushd examples + configureFlagsArray+=( "--bindir=$examples/bin" ) + configurePhase + make + make install + popd + + sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g" ''; meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; - homepage = "http://www.nlnetlabs.nl/projects/ldns/"; + homepage = http://www.nlnetlabs.nl/projects/ldns/; platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index d45a616606d9..a9c7a9b70bb4 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.11.2"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; + sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index c32372e841ce..0057611ed0f6 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { - homepage = "https://code.google.com/p/leveldb/"; + homepage = https://code.google.com/p/leveldb/; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index fc27f3a2c6b5..0d67c6b4dcb2 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "libaacs-${version}"; - version = "0.8.1"; + version = "0.9.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; - sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; + sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; }; buildInputs = [ libgcrypt libgpgerror ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = "https://www.videolan.org/developers/libaacs.html"; + homepage = https://www.videolan.org/developers/libaacs.html; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index d3cb1283331b..3a1c89384050 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; buildInputs = [ pkgconfig ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { programs to output audio using a simple API on a wide variety of platforms. ''; - homepage = http://xiph.org/ao/; + homepage = https://xiph.org/ao/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 0c1c51d6f47a..3a26dd407e4e 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -43,8 +43,10 @@ in stdenv.mkDerivation rec { substituteInPlace configure.ac \ --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ @@ -66,7 +68,7 @@ in stdenv.mkDerivation rec { meta = { description = "A library to allow applications to export a menu into the Unity Menu bar"; - homepage = "https://launchpad.net/libappindicator"; + homepage = https://launchpad.net/libappindicator; license = with licenses; [ lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index ccc2af8c3946..745736559aba 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; - homepage = "http://www.eterm.org"; + homepage = http://www.eterm.org; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 28d435fbb9ca..94ebaed9c2a1 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -118,7 +118,7 @@ let passthru = { inherit vdpauSupport; }; meta = with stdenv.lib; { - homepage = http://libav.org/; + homepage = https://libav.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 51f62b9bd5f4..ab8b507e98b2 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = http://sourceforge.net/projects/libavc1394/; + homepage = https://sourceforge.net/projects/libavc1394/; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 83bd81456c07..a427bd99dd58 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://github.com/binaryanalysisplatform/bap-bindings; + homepage = https://github.com/binaryanalysisplatform/bap-bindings; description = "A C library for interacting with BAP"; maintainers = [ stdenv.lib.maintainers.maurer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 4531546f33fd..83b9367f9923 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = "http://www.videolan.org/developers/libbdplus.html"; + homepage = http://www.videolan.org/developers/libbdplus.html; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 792a29eb1fb2..5e906c7ac5de 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions found on BSD systems"; - homepage = http://libbsd.freedesktop.org/; + homepage = https://libbsd.freedesktop.org/; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 02e4529b759e..31a1b8b4bf5c 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C Library for parsing, editing, and creating BSON documents"; - homepage = "https://github.com/mongodb/libbson"; + homepage = https://github.com/mongodb/libbson; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 5738245a0bd1..f49c449f9ea3 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "http://libburnia-project.org/"; + homepage = http://libburnia-project.org/; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 115ea6636394..15c40b430401 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; - homepage = "http://libcec.pulse-eight.com"; + homepage = http://libcec.pulse-eight.com; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index d21f1b1404e5..228dccea3e39 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Platform library for libcec and Kodi addons"; - homepage = "https://github.com/Pulse-Eight/platform"; + homepage = https://github.com/Pulse-Eight/platform; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 9fb01df930a9..3386b081a104 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zita X11 library"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = licenses.lgpl21; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 24ec3d74d36f..2fccee0160b3 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.7.2"; + version = "2.7.6"; src = fetchFromGitHub { owner = "couchbase"; - repo ="libcouchbase"; + repo = "libcouchbase"; rev = version; - sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar"; + sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C client library for Couchbase"; - homepage = "https://github.com/couchbase/libcouchbase"; + homepage = https://github.com/couchbase/libcouchbase; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 22bda89c6030..e217f5d96db1 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = http://sourceforge.net/projects/libcue/; + homepage = https://sourceforge.net/projects/libcue/; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index e20b1c95a199..57b56c372339 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; - homepage = http://www.opendap.org/download/libdap; + homepage = https://www.opendap.org/download/libdap; license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 46846e992f68..75cf69035cbe 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { cmakeFlags = "-DWITH_DOC=OFF"; meta = with stdenv.lib; { - homepage = "http://launchpad.net/libdbusmenu-qt"; + homepage = https://launchpad.net/libdbusmenu-qt; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 90880fd4d52e..96e9c0624f21 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for passing menu structures across DBus"; - homepage = "https://launchpad.net/dbusmenu"; + homepage = https://launchpad.net/dbusmenu; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 036adcef74cb..be7852e6cdd2 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/libdc1394/; + homepage = https://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index e060f8c1d767..f8d896bda376 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = http://www.id.ee/; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 5ddc63031269..a8b2e4b34209 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = http://www.id.ee/; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index a8cf28648079..96d346ad77ec 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.81"; + name = "libdrm-2.4.82"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae"; + sha256 = "43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c"; }; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; meta = { - homepage = http://dri.freedesktop.org/libdrm/; + homepage = https://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index e8c374297d37..a5058de597ef 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; - homepage = http://sourceforge.net/projects/libdv/; + homepage = https://sourceforge.net/projects/libdv/; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index f40f45d0e41d..5f422f7018b8 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.flamingspork.com/projects/libeatmydata/; + homepage = https://www.flamingspork.com/projects/libeatmydata/; license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 7b7f880ab9ed..4b233301cce7 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.4"; + name = "libebml-1.3.5"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "11zka6z9ncywyjr1gfm5cnii33ln7y3w6s86kiacchip2g7kw3f5"; + url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz"; + sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; }; meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; license = licenses.lgpl21; - homepage = http://dl.matroska.org/downloads/libebml/; + homepage = https://dl.matroska.org/downloads/libebml/; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 0dae76243a8a..be9f5e772d91 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++/Qt wrapper around the Echo Nest API"; - homepage = "http://projects.kde.org/projects/playground/libs/libechonest"; + homepage = http://projects.kde.org/projects/playground/libs/libechonest; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index f5809b391979..a34ff5edbe2d 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [pkgconfig libestr]; meta = { - homepage = "http://www.libee.org/"; + homepage = http://www.libee.org/; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d2ba84bb5dd9..6fa0caa97e91 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,28 +1,14 @@ { stdenv, fetchurl, openssl, findutils }: -let version = "2.0.22"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libevent-${version}"; + version = "2.1.8"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; + sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"; }; - prePatch = let - # https://lwn.net/Vulnerabilities/714581/ - debian = fetchurl { - url = "http://http.debian.net/debian/pool/main/libe/libevent/" - + "libevent_2.0.21-stable-3.debian.tar.xz"; - sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5"; - }; - in '' - tar xf '${debian}' - patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \ - | grep -v '^20d6d445.patch' \ - | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')" - ''; - # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" "openssl" ]; diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix deleted file mode 100644 index 4765f0b7d9af..000000000000 --- a/pkgs/development/libraries/libevhtp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: - -stdenv.mkDerivation rec { - name = "libevhtp-${version}"; - version = "1.2.11"; - - src = fetchFromGitHub { - owner = "ellzey"; - repo = "libevhtp"; - rev = version; - sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg"; - }; - - buildInputs = [ cmake openssl libevent ]; - - buildPhase = "cmake"; - - meta = with stdenv.lib; { - description = "A more flexible replacement for libevent's httpd API"; - homepage = "https://github.com/ellzey/libevhtp"; - license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 06f0bc89c2b3..ec53b50b5af2 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; - homepage = http://sourceforge.net/projects/libewf/; + homepage = https://sourceforge.net/projects/libewf/; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.raskin ] ; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 0f21180f691c..a6fb4ec515a8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.3"; + name = "libextractor-1.4"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6"; + sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4"; }; preConfigure = diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix index 4c637485086a..5ac7a244df20 100644 --- a/pkgs/development/libraries/libfann/default.nix +++ b/pkgs/development/libraries/libfann/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = { - homepage = "http://leenissen.dk/fann/wp/"; + homepage = http://leenissen.dk/fann/wp/; description = "Fast Artificial Neural Network Library"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 47814ef2f253..9639f4008f56 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Foreign function call library"; - homepage = http://www.haible.de/bruno/packages-ffcall.html; + homepage = https://www.haible.de/bruno/packages-ffcall.html; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index ca149bd3db35..284705e88d33 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "info" ]; buildInputs = stdenv.lib.optional doCheck dejagnu; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index b0f1046aa594..679f6ba79026 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "1qrvddjqz5jv6920gcfqsrsjksi2845hn96g0z3vpcsm6nifhqn1"; + sha256 = "10ik96s4r8kbgc5z4z5mqk8w1p3plakqavf6j86a48gl8in1f45x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index ad400a0aef61..d42425c8e185 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34 -, extraOnly ? false }: +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34 +, extraOnly ? false +, withGtk3 ? false, gtk2, gtk3 }: let + gtk = if withGtk3 then gtk3 else gtk2; inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { @@ -14,13 +16,16 @@ stdenv.mkDerivation rec { sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ] + buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only"; + configureFlags = [ (optional extraOnly "--with-extra-only") + (optional withGtk3 "--with-gtk=3") ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://blog.lxde.org/?cat=28/"; + homepage = http://blog.lxde.org/?cat=28/; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index aad6214f2d4f..8b384a51f018 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "libfprint-0.6.0"; + name = "libfprint-0.7.0"; src = fetchurl { - url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5"; + url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; + sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; }; buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; meta = with stdenv.lib; { - homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/"; + homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/; description = "A library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 180aab09188e..17cf93473d68 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to talk to FTDI chips using libusb"; - homepage = http://www.intra2net.com/en/developer/libftdi/; + homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index f0d05c0b263f..2f499d3af87f 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; - homepage = http://www.intra2net.com/en/developer/libftdi/; + homepage = https://www.intra2net.com/en/developer/libftdi/; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ac54858b1de3..5bcb8c5fe98a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,22 +1,26 @@ -{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.8"; + version = "1.8.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"; + sha256 = "06w97l88y2c29zf8p8cg0m4k2kiiyj6pqxdl0cxigi3wp2brdr13"; }; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; - buildInputs = - [ libgpgerror ] - ++ lib.optional enableCapabilities libcap; + # The CPU Jitter random number generator must not be compiled with + # optimizations and the optimize -O0 pragma only works for gcc. + # The build enables -O2 by default for everything else. + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + + buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix index e30641f0e766..51487b41573f 100644 --- a/pkgs/development/libraries/libgee/0.6.nix +++ b/pkgs/development/libraries/libgee/0.6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; license = licenses.lgpl21Plus; platforms = platforms.linux; - homepage = "http://live.gnome.org/Libgee"; + homepage = http://live.gnome.org/Libgee; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix index aba06d861078..747cb9d4b237 100644 --- a/pkgs/development/libraries/libgee/0.8.nix +++ b/pkgs/development/libraries/libgee/0.8.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; license = licenses.lgpl21Plus; platforms = platforms.linux; - homepage = "http://live.gnome.org/Libgee"; + homepage = http://live.gnome.org/Libgee; maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 389f899e3ef7..3d49fa064509 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; - homepage = http://www.remotesensing.org/geotiff/geotiff.html; + homepage = https://www.remotesensing.org/geotiff/geotiff.html; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index e96ef7329a20..7bd551e70d56 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { user. It provides X authentication facilities for running programs in an X session. ''; - homepage = "http://www.nongnu.org/gksu/"; + homepage = http://www.nongnu.org/gksu/; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 07d63c66b781..cc285979c6c1 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; - homepage = "https://github.com/NVIDIA/libglvnd"; + homepage = https://github.com/NVIDIA/libglvnd; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 2495c1505f0f..e46da4dc9fb2 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, perl, zlib, gnutls, gss, openssl, libssh2, libidn, libpsl, openldap }: +{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl +, libssh2, libidn, libpsl, openldap }: stdenv.mkDerivation rec { - version = "7.48.0"; + version = "7.54.1"; name = "libgnurl-${version}"; src = fetchurl { - url = "https://gnunet.org/sites/default/files/gnurl-7_48_0.tar.bz2"; - sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a"; + url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2"; + sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ]; preConfigure = '' diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index c183a2c98ef8..56bf9b177b56 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; + homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index f2f062785b69..6e036522b1cb 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME's Structured File Library"; - homepage = http://www.gnome.org/projects/libgsf; + homepage = https://www.gnome.org/projects/libgsf; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 08563ed53dd5..273563b2a99a 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; - homepage = "https://github.com/Silicondust/libhdhomerun"; + homepage = https://github.com/Silicondust/libhdhomerun; repositories.git = "https://github.com/Silicondust/libhdhomerun.git"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 6a8af9ccac6d..970cb8a530f7 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; meta = with stdenv.lib; { - homepage = http://www.openfabrics.org/; + homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 2f6a574c9899..a7950de3aef0 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.openfabrics.org/; + homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 61926dad24d1..e3e4e0007730 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,21 +1,21 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }: with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc"; + sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; patches = optional stdenv.isDarwin ./fix-error-darwin.patch; - buildInputs = [ libunistring ] + buildInputs = [ libunistring ronn ] ++ optionals stdenv.isDarwin [ libiconv help2man ]; meta = { diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 7094fa2534b1..9f75f17caeed 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -38,8 +38,10 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \ --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ @@ -56,7 +58,7 @@ in stdenv.mkDerivation rec { meta = { description = "Library for raising indicators via DBus"; - homepage = "https://launchpad.net/libindicate"; + homepage = https://launchpad.net/libindicate; license = with licenses; [ lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index e696e778dae9..67936fecdf4e 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure \ --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' - substituteInPlace {build-aux/ltmain.sh,configure,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {build-aux/ltmain.sh,configure,m4/libtool.m4}; do + substituteInPlace $f\ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of symbols and convenience functions for Ayatana indicators"; - homepage = "https://launchpad.net/libindicator"; + homepage = https://launchpad.net/libindicator; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 8885092d0e7d..a0205fb234ca 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = "http://libburnia-project.org/"; + homepage = http://libburnia-project.org/; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 72b4469058c0..479deb7593d6 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libite-${version}"; - version = "1.8.3"; + version = "1.9.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j"; + sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index dbc5c1e2ae92..eac919612f0b 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with stdenv.lib; { - homepage = "http://libivykis.sourceforge.net/"; + homepage = http://libivykis.sourceforge.net/; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index cd8484170bdb..1023c8ae5056 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0v365hm6z6lddcqagjj15wflk66rqyw75m73cqzl65rh4lyrshj1"; + sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h"; }; # github releases still need autotools, surprisingly patches = stdenv.lib.optional (hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index dec800da1694..d539c61a4c95 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Jabber library using Qt framework"; - homepage = "https://qutim.org/jreen/"; + homepage = https://qutim.org/jreen/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index bc23e1f2958f..a53918fd5f77 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; meta = { - homepage = "http://libjson.sourceforge.net/"; + homepage = http://libjson.sourceforge.net/; description = "A JSON reader and writer"; longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 9e1d4b58a927..8bff5a21cd09 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "info" ]; propagatedBuildInputs = [ libgpgerror ]; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 39de886a0b71..a3c809c3bd6b 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/GuardTime/libksi"; + homepage = https://github.com/GuardTime/libksi; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index aa76505c3a07..331422dd8929 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { - homepage = http://github.com/lastfm/liblastfm; + homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 37823af12e9a..f6df090e8b5d 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/mad/; + homepage = https://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 467d707adee9..1b17ff0dd433 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mathematical functions. In addition to parsing and evaluation, libmatheval can also compute symbolic derivatives and output expressions to strings. ''; - homepage = "https://www.gnu.org/software/libmatheval/"; + homepage = https://www.gnu.org/software/libmatheval/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 81fa9011e30b..9ad959ae22e0 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse Matroska files"; - homepage = http://matroska.org/; + homepage = https://matroska.org/; license = licenses.lgpl21; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 827f18d2ffc9..9355c43642a4 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for working with MaxMind geolocation DB files"; - homepage = "https://github.com/maxmind/libmaxminddb"; + homepage = https://github.com/maxmind/libmaxminddb; license = licenses.apsl20; platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index c40e54e09cb6..f1625e6a33fb 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 09b829695c4c..cc6f5205d92a 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.95"; + version = "0.7.97"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23"; + sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index a0e3bb52dfe2..086ba8f32d21 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Fix linking against libpthread (patch from Fedora) # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 # https://bugs.launchpad.net/libmemcached/+bug/1281907 - # Fix building on OS X (patch from Homebrew) + # Fix building on macOS (patch from Homebrew) # https://bugs.launchpad.net/libmemcached/+bug/1245562 patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 8e684f7af1f2..d36d483b92c7 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = http://github.com/boothj5/libmesode/; + homepage = https://github.com/boothj5/libmesode/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 54cef0c4f5c3..7e5ac2a2297c 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-pcre"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/mp3splt/; + homepage = https://sourceforge.net/projects/mp3splt/; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 5ac5c9eee96a..9375a3810529 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Simple implementation of msgpack in C"; - homepage = "https://github.com/tarruda/libmpack/"; + homepage = https://github.com/tarruda/libmpack/; license = licenses.mit; maintainers = with maintainers; [ lovek323 garbas ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix deleted file mode 100644 index 703c5e36b8b7..000000000000 --- a/pkgs/development/libraries/libmsn/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, openssl}: - -stdenv.mkDerivation rec { - name = "libmsn-4.2.1"; - src = fetchurl { - url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; - sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde"; - }; - patches = [ ./fix-ftbfs-gcc4.7.diff ]; - buildInputs = [ cmake openssl ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff deleted file mode 100644 index 46aeab31c842..000000000000 --- a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff +++ /dev/null @@ -1,16 +0,0 @@ -Fix g++ 4.7 build failure - -Kudos to Matthias Klose for the patch - -Index: libmsn-4.2/msn/util.cpp -=================================================================== ---- libmsn-4.2.orig/msn/util.cpp 2009-07-22 19:57:10.000000000 +0000 -+++ libmsn-4.2/msn/util.cpp 2012-04-16 20:52:18.068767213 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 09d41c8bbe94..79d4c056341c 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,15 +1,16 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libmspack-0.5alpha"; +stdenv.mkDerivation rec { + name = "libmspack-0.6alpha"; + src = fetchurl { - url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz"; - sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9"; + url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz"; + sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"; }; meta = { description = "A de/compression library for various Microsoft formats"; - homepage = http://www.cabextract.org.uk/libmspack; + homepage = https://www.cabextract.org.uk/libmspack; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix deleted file mode 100644 index f12b854e7783..000000000000 --- a/pkgs/development/libraries/libmusicbrainz/2.x.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, expat }: - -stdenv.mkDerivation rec { - name = "libmusicbrainz-2.1.5"; - - configureFlags = "--enable-cpp-headers"; - - buildInputs = [ expat ]; - - patches = [ ./gcc-4.x.patch ]; - - src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; - sha256 = "183i4c109r5qx3mk4r986sx5xw4n5mdhdz4yz3rrv3s2xm5rqqn6"; - }; - - meta = { - homepage = http://musicbrainz.org/doc/libmusicbrainz; - description = "MusicBrainz Client Library (deprecated 2.x version)"; - longDescription = '' - The libmusicbrainz (also known as mb_client or MusicBrainz Client - Library) is a development library geared towards developers who wish to - add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch b/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch deleted file mode 100644 index f55c4f2cd41b..000000000000 --- a/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp -index deae11d..ebc7854 100644 ---- a/lib/c_wrapper.cpp -+++ b/lib/c_wrapper.cpp -@@ -24,6 +24,7 @@ - #include "musicbrainz.h" - #include "trm.h" - #include "mb_c.h" -+#include - - extern "C" - { -diff --git a/lib/comhttpsocket.cpp b/lib/comhttpsocket.cpp -index 067313b..4371772 100644 ---- a/lib/comhttpsocket.cpp -+++ b/lib/comhttpsocket.cpp -@@ -20,6 +20,7 @@ - #endif - #include - #include -+#include - - const char* g_strCOMVer = "libmusicbrainz/"VERSION; - -diff --git a/lib/comsocket.cpp b/lib/comsocket.cpp -index 01a94be..7bfc4dd 100644 ---- a/lib/comsocket.cpp -+++ b/lib/comsocket.cpp -@@ -44,6 +44,7 @@ ____________________________________________________________________________*/ - #include - #include - #endif -+#include - - #define mb_socklen_t ACCEPT_ARG3 - -diff --git a/lib/http.cpp b/lib/http.cpp -index 85390a3..e63713c 100644 ---- a/lib/http.cpp -+++ b/lib/http.cpp -@@ -67,6 +67,7 @@ - #ifdef __QNX__ - #include - #endif -+#include - - using namespace std; - -diff --git a/lib/sigclient.cpp b/lib/sigclient.cpp -index 9f76008..4bbbaae 100644 ---- a/lib/sigclient.cpp -+++ b/lib/sigclient.cpp -@@ -32,6 +32,7 @@ email : ijr@relatable.com - #ifdef WIN32 - #pragma warning(disable:4786) - #endif -+#include - - #include "sigclient.h" - #include "comhttpsocket.h" diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 1e445b20f682..a93c16d784de 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://github.com/sam-github/libnet; + homepage = https://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index b1d26b81a8d4..fa4a0f11ef4c 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl libnfnetlink ]; meta = { - homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; + homepage = http://www.netfilter.org/projects/libnetfilter_queue/; description = "Userspace API to packets queued by the kernel packet filter"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 09be1b41353a..7e9ae1608d2b 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gupnp_igd ]; meta = { - homepage = http://nice.freedesktop.org/wiki/; + homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 15f58135040d..c5cb85d91ba2 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; meta = with stdenv.lib; { - homepage = http://xiph.org/ogg/; + homepage = https://xiph.org/ogg/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 83bb80cc3203..ed46919f26ce 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; meta = { - homepage = http://xiph.org/oggz/; + homepage = https://xiph.org/oggz/; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' Oggz comprises liboggz and the tool oggz, which provides commands to diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 6328494c17ee..5140402eacb9 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fedora-fixes.patch ]; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/omxil/; + homepage = https://sourceforge.net/projects/omxil/; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 0a01cd9825e2..ba7a0af0bf54 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { - homepage = "http://www.cypherpunks.ca/otr/"; + homepage = http://www.cypherpunks.ca/otr/; repositories.git = git://git.code.sf.net/p/otr/libotr; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index a423727b913f..b4b72e5a36d3 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; - homepage = "http://packages.debian.org/unstable/source/libpaper"; + homepage = http://packages.debian.org/unstable/source/libpaper; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index 038556261a4c..4da6a0b3cbc7 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; meta = with stdenv.lib; { - homepage = "http://libpipeline.nongnu.org"; + homepage = http://libpipeline.nongnu.org; description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index f1c421b4bf76..98853d08cfe6 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { }; meta = { - homepage = http://github.com/JonathanBeck/libplist; + homepage = https://github.com/JonathanBeck/libplist; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c2f50af84ca8..94a9aa37ad9c 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -5,13 +5,12 @@ assert zlib != null; let - version = "1.6.29"; - patchVersion = "1.6.26"; - # patchVersion = version; - sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2"; + version = "1.6.31"; + patchVersion = "1.6.31"; + sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1"; + sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index cf3ad5f1ebba..c493dd678ad5 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.lgpl21; - homepage = "http://libproxy.github.io/libproxy/"; + homepage = http://libproxy.github.io/libproxy/; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index a5a428010b2b..7d697ee10f17 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Password quality checking and random password generation library"; - homepage = "https://github.com/libpwquality/libpwquality"; + homepage = https://github.com/libpwquality/libpwquality; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index abc0eb4a2287..2e748d266897 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "0.9.10"; + version = "1.0.0a"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi"; + sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index 1d0463c090a6..a5e4c4410c09 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = "http://fukuchi.org/works/qrencode/"; + homepage = https://fukuchi.org/works/qrencode/; description = "A C library for encoding data in a QR Code symbol"; longDescription = '' diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 10979abdeabc..351f839553be 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,20 +2,13 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.17.2"; + version = "0.18.2"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j"; + sha256 = "1imby9x88pjx4ad1frdi3bfb8dw90ccyj5pb6w3i6i0iijrnndnf"; }; - patches = - [ (fetchurl { - url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823; - sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w"; - }) - ]; - outputs = [ "out" "lib" "dev" "doc" ]; buildInputs = [ jasper ]; @@ -26,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; - homepage = http://www.libraw.org/; + homepage = https://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 886663101586..945e11d1bcef 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; - homepage = http://sourceforge.net/projects/lrdf/; + homepage = https://sourceforge.net/projects/lrdf/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index ef194bb0b1ec..14e3e1891bae 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = http://librdf.org/raptor; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 1271089060b7..46a94e52595c 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = http://librdf.org/raptor; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 8a0ca6f000d4..56272b319917 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; - homepage = "http://librdf.org/rasqal"; + homepage = http://librdf.org/rasqal; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 5bd18f72356f..8bef305a0ecc 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; meta = { - homepage = "http://www.creytiv.com/re.html"; + homepage = http://www.creytiv.com/re.html; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 5ad5f8d3848c..a3e98d260cea 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; meta = { - homepage = "http://www.creytiv.com/rem.html"; + homepage = http://www.creytiv.com/rem.html; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix deleted file mode 100644 index c5642635b0f0..000000000000 --- a/pkgs/development/libraries/libressl/2.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.4.5"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix deleted file mode 100644 index 6ab072486553..000000000000 --- a/pkgs/development/libraries/libressl/2.5.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.5.4"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix new file mode 100644 index 000000000000..4ce1b664725a --- /dev/null +++ b/pkgs/development/libraries/libressl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +let + + generic = { version, sha256 }: stdenv.mkDerivation rec { + name = "libressl-${version}"; + inherit version; + + src = fetchurl { + url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + inherit sha256; + }; + + enableParallelBuilding = true; + + outputs = [ "bin" "dev" "out" "man" ]; + + dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong + + meta = with stdenv.lib; { + description = "Free TLS/SSL implementation"; + homepage = "http://www.libressl.org"; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + }; + }; + +in { + + libressl_2_5 = generic { + version = "2.5.5"; + sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"; + }; + + libressl_2_6 = generic { + version = "2.6.0"; + sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4"; + }; +} diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 9efe07c65679..75bc9668fca1 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.3.2"; + version = "3.4.5"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "affb7efaa7e152e576cc1d510c662ebe067b0b9e9228ad2937dcafdd4431b573"; + sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 882b3258b7de..479da52f8d9b 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library that implements scrypt() functionality"; - homepage = "https://lolware.net/2014/04/29/libscrypt.html"; + homepage = https://lolware.net/2014/04/29/libscrypt.html; license = licenses.bsd2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 49751629430e..0457c0eb9c49 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.0.7"; - seafileVersion = "5.0.7"; + seafileVersion = "6.1.0"; name = "libsearpc-${version}"; src = fetchurl @@ -23,7 +23,7 @@ stdenv.mkDerivation rec meta = { - homepage = "https://github.com/haiwen/libsearpc"; + homepage = https://github.com/haiwen/libsearpc; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index e7ee188c29f0..ab10e34e2301 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Cross-platform shared library for serial port access"; homepage = http://sigrok.org/; license = licenses.gpl3Plus; - # Mac OS X, Windows and Android is also supported (according to upstream). + # macOS, Windows and Android is also supported (according to upstream). platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index 122ece574e63..2da5d68d1174 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interpreter for RFC 3028 Sieve and various extensions"; - homepage = "http://sodabrew.com/libsieve/"; + homepage = http://sodabrew.com/libsieve/; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 21b788efb898..25f2a1e0846b 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Library to Access SMI MIB Information"; - homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; + homepage = https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html; license = licenses.free; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index bd5d0fd733c7..21710375ed74 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -10,12 +10,35 @@ stdenv.mkDerivation rec { sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz"; }; + patches = [ + # CVE-2017-12562 + (fetchurl { + url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch"; + sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy"; + }) + # CVE-2017-6892 + (fetchurl { + url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch"; + sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq"; + }) + # CVE-2017-8361, CVE-2017-8363, CVE-2017-8363 + (fetchurl { + url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch"; + sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2"; + }) + # CVE-2017-8362 + (fetchurl { + url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch"; + sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x"; + }) + ]; + buildInputs = [ pkgconfig flac libogg libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle @@ -41,7 +64,7 @@ stdenv.mkDerivation rec { code format under the GNU Lesser General Public License. The library was written to compile and run on a Linux system but - should compile and run on just about any Unix (including MacOS X). + should compile and run on just about any Unix (including macOS). There are also pre-compiled binaries available for 32 and 64 bit windows. diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b508b2fea0eb..4fc1a5d27898 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.12"; + name = "libsodium-1.0.13"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"; + sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 030d800f4a5b..d1b476d94d20 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,15 +4,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.56"; - version = "${majorVersion}.0"; + majorVersion = "2.59"; + version = "${majorVersion}.90.1"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5"; + sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0"; }; prePatch = '' diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a04c5631ecbc..647e6f16fdf8 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index dcec6b058fc3..00579600cb76 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; - homepage = "https://github.com/fontforge/libspiro"; + homepage = https://github.com/fontforge/libspiro; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 9b6e87bd57e6..8b716d055a0a 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -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 = http://www.csie.ntu.edu.tw/~cjlin/libsvm/; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 35d3d759ea8f..b1dfa5ba7e4d 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec{ C originally created by Nik Clayton. This is a maintenance branch by Shlomi Fish. ''; - homepage = "http://www.shlomifish.org/open-source/projects/libtap/"; + homepage = http://www.shlomifish.org/open-source/projects/libtap/; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index dbd203b97cfc..516005b874fc 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.10"; + name = "libtasn1-4.12"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; + sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; }; patches = [ (fetchurl { - name = "CVE-2017-6891.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484"; - sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k"; + name = "CVE-2017-9310.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; + sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; }) ]; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 5f284d1a49a4..0bc619051c69 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple RFC-complient TELNET implementation as a C library"; - homepage = "https://github.com/seanmiddleditch/libtelnet"; + homepage = https://github.com/seanmiddleditch/libtelnet; license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.tomberek ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 595ec9d01ccf..b64a578f0cce 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { prePatch =let debian = fetchurl { - url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; + url = http://snapshot.debian.org/archive/debian-debug/20170602T031313Z/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng"; }; in '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 0c53a3e3dade..13fa71e60dce 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { makefile = "makefile.shared"; meta = { - homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt"; + homepage = http://libtom.org/?page=features&newsitems=5&whatfile=crypt; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix index 97aa0145956c..877d8ed434c6 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.0.10"; - sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl"; + version = "1.0.11"; + sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; }) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index b6aace0de2d6..ed52902938db 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1.1"; - sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; + version = "1.1.4"; + sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; }) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index da8fe5075405..bac29bc0ca8d 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }: +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "libtsm-3"; @@ -9,12 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ - autoconf automake - ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - aclocal - ''; + autoreconfHook + ]; configureFlags = [ "--disable-debug" ]; @@ -22,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; + homepage = http://www.freedesktop.org/wiki/Software/kmscon/libtsm/; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix deleted file mode 100644 index 061b2cfedfbf..000000000000 --- a/pkgs/development/libraries/libtunepimp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, zlib, expat, curl, libmusicbrainz2, taglib, libmpcdec, - libmad, libogg, libvorbis, flac, mp4v2, libofa, libtool }: - -stdenv.mkDerivation rec { - name = "libtunepimp-0.5.3"; - - outputs = [ "out" "lib" "dev" ]; - - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray=(--includedir=$dev/include --libdir=$lib/lib) - ''; - - propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec - libmad libogg libvorbis flac libofa libtool ]; - - patches = [ ./gcc-4.x.patch ]; - - src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; - sha256 = "0s141zmsxv8xlivcgcmy6xhk9cyjjxmr1fy45xiqfqrqpsh485rl"; - }; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch deleted file mode 100644 index aed742b04902..000000000000 --- a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch +++ /dev/null @@ -1,237 +0,0 @@ -diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h -*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2006-11-18 05:52:08.000000000 -0500 ---- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h 2011-11-06 09:00:14.816684749 -0500 -*************** -*** 29,34 **** ---- 29,35 ---- - - #include - #include -+ #include - - #include "defs.h" - #include "tp_c.h" -diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp -*** libtunepimp-0.5.3/lib/c_wrapper.cpp 2006-11-18 05:52:33.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/c_wrapper.cpp 2011-11-06 09:00:14.816684749 -0500 -*************** -*** 43,48 **** ---- 43,49 ---- - if (obj == NULL) return; - - #include -+ #include - - class NotifyData - { -diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp -*** libtunepimp-0.5.3/lib/fileio.cpp 2006-11-18 05:52:33.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/fileio.cpp 2011-11-06 09:00:14.816684749 -0500 -*************** -*** 27,32 **** ---- 27,34 ---- - - #include - #include -+ #include -+ #include - #include - #ifndef WIN32 - #include -*************** -*** 122,128 **** - - void tmktempname(const char *path, char *newPath, int newPathLen) - { -! char *ptr, *temp; - - temp = (char *)malloc(strlen(path) + 32); - ptr = strrchr(path, dirSepChar); ---- 124,131 ---- - - void tmktempname(const char *path, char *newPath, int newPathLen) - { -! char *temp; -! const char *ptr; - - temp = (char *)malloc(strlen(path) + 32); - ptr = strrchr(path, dirSepChar); -diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp -*** libtunepimp-0.5.3/lib/metadata.cpp 2006-11-18 05:52:33.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/metadata.cpp 2011-11-06 09:00:14.817684754 -0500 -*************** -*** 24,31 **** - $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ - - ----------------------------------------------------------------------------*/ -! #include -! #include - #include "metadata.h" - #include "../config.h" - using namespace std; ---- 24,32 ---- - $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ - - ----------------------------------------------------------------------------*/ -! #include -! #include -! #include - #include "metadata.h" - #include "../config.h" - using namespace std; -diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp -*** libtunepimp-0.5.3/lib/protocol.cpp 2006-11-28 15:25:04.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/protocol.cpp 2011-11-06 09:00:23.281742454 -0500 -*************** -*** 8,18 **** - -------------------------------------------------------------------*/ - #include - #include - #include - #include - #include - #include -- #include - #include - using namespace std; - ---- 8,18 ---- - -------------------------------------------------------------------*/ - #include - #include -+ #include - #include - #include - #include - #include - #include - using namespace std; - -diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp -*** libtunepimp-0.5.3/lib/readmeta.cpp 2006-11-18 05:52:33.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/readmeta.cpp 2011-11-06 09:00:14.817684754 -0500 -*************** -*** 30,36 **** - #endif - #endif - -! #include - #ifndef WIN32 - #include - #endif ---- 30,37 ---- - #endif - #endif - -! #include -! #include - #ifndef WIN32 - #include - #endif -diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp -*** libtunepimp-0.5.3/lib/tunepimp.cpp 2006-11-18 05:52:33.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/tunepimp.cpp 2011-11-06 09:00:14.818684760 -0500 -*************** -*** 30,36 **** - #endif - #endif - -! #include - #include - using namespace std; - ---- 30,37 ---- - #endif - #endif - -! #include -! #include - #include - using namespace std; - -diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp -*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2006-11-18 05:52:26.000000000 -0500 ---- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp 2011-11-06 09:00:14.818684760 -0500 -*************** -*** 26,31 **** ---- 26,32 ---- - ----------------------------------------------------------------------------*/ - - #include -+ #include - #include "utf8util.h" - #include "utf8.h" - #ifdef WIN32 -diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp -*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2006-11-18 05:51:07.000000000 -0500 ---- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp 2011-11-06 09:00:14.818684760 -0500 -*************** -*** 26,31 **** ---- 26,32 ---- - ----------------------------------------------------------------------------*/ - - #include -+ #include - #include - #include - #include -diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp -*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2006-11-18 05:51:07.000000000 -0500 ---- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp 2011-11-06 09:00:14.818684760 -0500 -*************** -*** 26,31 **** ---- 26,32 ---- - ----------------------------------------------------------------------------*/ - - #include -+ #include - #include - #include - #include -diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp -*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2006-11-18 05:51:08.000000000 -0500 ---- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp 2011-11-06 09:00:14.819684766 -0500 -*************** -*** 27,33 **** - - #include - #include -! #include - #include "metadata.h" - #include "plugin.h" - #ifndef WIN32 ---- 27,34 ---- - - #include - #include -! #include -! #include - #include "metadata.h" - #include "plugin.h" - #ifndef WIN32 -diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp -*** libtunepimp-0.5.3/plugins/wma/wma.cpp 2006-11-18 05:51:28.000000000 -0500 ---- libtunepimp-0.5.3-new/plugins/wma/wma.cpp 2011-11-06 09:00:14.819684766 -0500 -*************** -*** 27,32 **** ---- 27,33 ---- - - #include - #include -+ #include - #include - #include "metadata.h" - #include "plugin.h" -diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp -*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2006-11-18 05:51:28.000000000 -0500 ---- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp 2011-11-06 09:00:14.819684766 -0500 -*************** -*** 19,24 **** ---- 19,25 ---- - * USA * - ***************************************************************************/ - -+ #include - #include - #include - #include diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 662767b6678f..c4acc0627af8 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -8,12 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w"; }; - patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; + 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}" ]; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index bcbe15afdf84..66890f08ff3e 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for instrumenting- and integrating with all aspects of the Unity shell"; - homepage = "https://launchpad.net/libunity"; + homepage = https://launchpad.net/libunity; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 478052dd5365..3e8beef3c9d0 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libplist ]; meta = { - homepage = "http://www.libimobiledevice.org"; + homepage = http://www.libimobiledevice.org; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index fdf5191bf720..1bc58260afe4 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.12.0"; + version = "1.13.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p"; + sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8"; }; postPatch = let @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" + "threadpool_multiple_event_loops" # times out on slow machines ] # sometimes: timeout (no output), failed uv_listen ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index ae2492beba6b..4285b05a6250 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; meta = with stdenv.lib; { - homepage = "https://github.com/i-rinat/libvdpau-va-gl"; + homepage = https://github.com/i-rinat/libvdpau-va-gl; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 511f97eb3cd0..b3066c4eed82 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.1.0"; + version = "3.6.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq"; + sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s"; }; patches = [ ./build-on-bsd.patch ]; @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' + + # 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",' '' + '' PATH=${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references @@ -59,6 +66,7 @@ stdenv.mkDerivation rec { "--with-virtualport" "--with-init-script=systemd+redhat" "--with-storage-disk" + ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" @@ -74,6 +82,10 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" \ --replace "lock/subsys" "lock" + sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ + -i "$out/libexec/libvirt-guests.sh" + + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill '' + optionalString stdenv.isLinux '' rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 50a1f5ac3377..50a4c7c8f247 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "An abstraction library for audio visualisations"; - homepage = "http://sourceforge.net/projects/libvisual/"; + homepage = http://sourceforge.net/projects/libvisual/; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 4ed3014fbe99..f38c7a900329 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NX compression library"; - homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; + homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 96e2ca872850..0d7115144449 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = "http://sourceforge.net/projects/libxls/"; + homepage = http://sourceforge.net/projects/libxls/; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 10dd4ee5dbe4..370572956726 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }) ]; - outputs = [ "bin" "dev" "out" "doc" ] + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 118b8af5a6f9..1c27b6e3233b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,7 +17,14 @@ stdenv.mkDerivation rec { sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; + patches = [ + (fetchpatch { + name = "CVE-2017-5029"; + url = "https://git.gnome.org/browse/libxslt/" + + "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5"; + sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky"; + }) + ] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified postPatch = optionalString hostPlatform.isCygwin '' @@ -25,7 +32,7 @@ stdenv.mkDerivation rec { --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)' ''; - outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 8d3dd65adbf3..aa2c81313922 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "http://opensource.yubico.com/yubico-c/"; + homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; maintainers = with maintainers; [ calrama wkennington ]; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 5bb3f79f790e..ab473bbe85c1 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.34"; + version = "0.4.35"; name = "libzen-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3"; + sha256 = "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index f4b7aaf3fe23..e20aa514aa2a 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; + homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix new file mode 100644 index 000000000000..e13796229ce1 --- /dev/null +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake +, autoreconfHook, zlib +, enableGrpc ? false +}: + +let + # be sure to use the right revision based on the submodule! + common = + fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-common"; + rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded"; + sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln"; + }; + +in + +stdenv.mkDerivation rec { + name = "lightstep-tracer-cpp-${version}"; + version = "0.36"; + + src = fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-cpp"; + rev = "v0_36"; + sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16"; + }; + + postUnpack = '' + cp -r ${common}/* $sourceRoot/lightstep-tracer-common + ''; + + preConfigure = lib.optionalString (!enableGrpc) '' + configureFlagsArray+=("--disable-grpc") + ''; + + nativeBuildInputs = [ + pkgconfig automake autoreconfHook + ]; + + buildInputs = [ + protobuf3_2 zlib + ]; + + meta = with lib; { + description = "Distributed tracing system built on top of the OpenTracing standard"; + homepage = "http://lightstep.com/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix new file mode 100644 index 000000000000..3f008744c1b4 --- /dev/null +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "linenoise-ng-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "arangodb"; + repo = "linenoise-ng"; + rev = "v${version}"; + sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + homepage = https://github.com/arangodb/linenoise-ng; + description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 133bc13d1cce..3fdad73d9fa5 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://log4cplus.sourceforge.net/"; + homepage = http://log4cplus.sourceforge.net/; description = "A port the log4j library from Java to C++"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 7e5a62e63f4e..ac0b7bf68341 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost +{ stdenv, fetchurl, libtool, libxml2, cppunit, boost , apr, aprutil, db, expat }: @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; + patches = [ + # adapted from upstream commit; will be fixed in next version + ./narrowing-fixes.patch + ]; + postPatch = '' sed -i -e '1,/^#include/ { /^#include/i \ @@ -21,11 +26,12 @@ stdenv.mkDerivation rec { src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp '' + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/namespace std { class locale; }/#include /' src/main/include/log4cxx/helpers/simpledateformat.h - sed -i 's/\(#include \)/\1\n#include /' src/main/cpp/stringhelper.cpp + sed -i 's/namespace std { class locale; }/#include /' src/main/include/log4cxx/helpers/simpledateformat.h + sed -i 's/\(#include \)/\1\n#include /' src/main/cpp/stringhelper.cpp ''; - buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; + buildInputs = [ libxml2 cppunit boost apr aprutil db expat ]; + nativeBuildInputs = [ libtool ]; meta = { homepage = http://logging.apache.org/log4cxx/index.html; diff --git a/pkgs/development/libraries/log4cxx/narrowing-fixes.patch b/pkgs/development/libraries/log4cxx/narrowing-fixes.patch new file mode 100644 index 000000000000..e583e7661d1d --- /dev/null +++ b/pkgs/development/libraries/log4cxx/narrowing-fixes.patch @@ -0,0 +1,117 @@ +diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp +index e76ea29..bd22a1d 100644 +--- a/src/main/cpp/locationinfo.cpp ++++ b/src/main/cpp/locationinfo.cpp +@@ -149,18 +149,21 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const { + os.writeNull(p); + } else { + char prolog[] = { +- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E, +- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, +- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, +- 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, +- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, +- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, +- 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, +- 0x6E, 0x66, 0x6F, +- 0x74, 0x00, 0x12, 0x4C, 0x6A, +- 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67, +- 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, +- 0x78, 0x70 }; ++ 0x72, ++ 0x00, ++ 0x21, 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, ++ 0x6C, 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, ++ 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast(0xED), ++ static_cast(0x99), static_cast(0xBB), static_cast(0xE1), ++ 0x4A, static_cast(0x91), static_cast(0xA5), 0x7C, 0x02, ++ 0x00, ++ 0x01, 0x4C, ++ 0x00, ++ 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, 0x6E, 0x66, 0x6F, 0x74, ++ 0x00, ++ 0x12, 0x4C, 0x6A, 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67, 0x2F, ++ 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x78, 0x70 ++ }; + os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p); + char* line = p.itoa(lineNumber); + // +diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp +index 1c0d4be..edbf40b 100644 +--- a/src/main/cpp/loggingevent.cpp ++++ b/src/main/cpp/loggingevent.cpp +@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { + 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, + 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, + 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, +- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, ++ 0x74, static_cast(0xF3), static_cast(0xF2), static_cast(0xB9), 0x23, 0x74, 0x0B, static_cast(0xB5), + 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, + 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, + 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, +diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp +index 7cd696b..5442420 100644 +--- a/src/main/cpp/objectoutputstream.cpp ++++ b/src/main/cpp/objectoutputstream.cpp +@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p) + objectHandle(0x7E0000), + classDescriptions(new ClassDescriptionMap()) + { +- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; ++ char start[] = { static_cast(0xAC), static_cast(0xED), 0x00, 0x05 }; + ByteBuffer buf(start, sizeof(start)); + os->write(buf, p); + } +@@ -81,15 +81,15 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) { + // + // TC_OBJECT and the classDesc for java.util.Hashtable + // +- char prolog[] = { +- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, +- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, +- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, +- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, +- 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, +- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, +- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, +- 0x6F, 0x6C, 0x64, 0x78, 0x70 }; ++ char prolog[] = { ++ 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, ++ 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, ++ 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, ++ static_cast(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast(0xE4), static_cast(0xB8), 0x03, ++ 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, ++ 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, ++ 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, ++ 0x6F, 0x6C, 0x64, 0x78, 0x70 }; + writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p); + // + // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7 +diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp +index a500628..29d67dd 100644 +--- a/src/test/cpp/xml/domtestcase.cpp ++++ b/src/test/cpp/xml/domtestcase.cpp +@@ -190,9 +190,9 @@ public: + DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); + LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); + #if LOG4CXX_LOGCHAR_IS_UTF8 +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xC2), static_cast(0xB3), 0 }; + #else +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xB3), 0 }; + #endif + File file; + file.setPath(fname); +@@ -209,9 +209,9 @@ public: + DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); + LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); + #if LOG4CXX_LOGCHAR_IS_UTF8 +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xE3), static_cast(0x86), static_cast(0x95), 0 }; + #else +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0x3195), 0 }; + #endif + File file; + file.setPath(fname); \ No newline at end of file diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 9f9b6aa44829..93c8a0474d96 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -2,33 +2,18 @@ stdenv.mkDerivation rec { name = "lucene++-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "https://github.com/luceneplusplus/LucenePlusPlus/" + "archive/rel_${version}.tar.gz"; - sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y"; + sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc"; }; - patches = let - baseurl = "https://github.com/luceneplusplus/LucenePlusPlus"; - in [ - (fetchpatch { - url = "${baseurl}/pull/62.diff"; - sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw"; - }) - (fetchpatch { - url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff"; - sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz"; - }) - ]; - postPatch = '' sed -i -e '/Subversion *REQUIRED/d' \ -e '/include.*CMakeExternal/d' \ CMakeLists.txt - # not using -f because we want it to fail for the next release - rm CMakeExternal.txt ''; cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; @@ -40,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ port of the popular Java Lucene search engine"; - homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; + homepage = https://github.com/luceneplusplus/LucenePlusPlus; license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index b33950d35e04..83ddcbf52e14 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.9"; + name = "matio-1.5.10"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0p60c3wdj4w7v7hzdc0iivciq4hwxzhhx0zq8gpv9i8yhdjzkdxy"; + sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index e89fabb9fb33..764d50190b9e 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.19"; + name = "mbedtls-1.3.20"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar"; + sha256 = "0vv69c1c5rr7jcwwivx06fbfixgig90pjznh2c6cn841hgwm9z00"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index c5eab3f74b50..b4500c8f6d6d 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.4.2"; + name = "mbedtls-2.5.1"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh"; + sha256 = "1qny1amp54vn84wp0aaj8zvblad60zcp73pdwgnykn7h0q004bri"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index aae3d0f9c8ba..7b7c77659bdc 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = "https://gitlab.com/mdds/mdds"; + homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index b3c7daf990c8..a490aa1e4451 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ glib libfm-extra ]; meta = with stdenv.lib; { - homepage = "http://blog.lxde.org/?tag=menu-cache"; + homepage = http://blog.lxde.org/?tag=menu-cache; license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index b6f7411a1c24..06d9994a529d 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; - homepage = http://cgit.freedesktop.org/mesa/glu/; + homepage = https://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e1bd4255636a..f23838cb9565 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.4"; + version = "17.1.6"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad"; + sha256 = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 15a62f264148..168b94495a97 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -41,7 +41,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.tohl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 56f11396e719..67d2bdf1559b 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool +{ stdenv, fetchzip, perl, pkgconfig, libbson , openssl, which }: stdenv.mkDerivation rec { name = "mongoc-${version}"; - version = "1.5.4"; + version = "1.7.0"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q"; + sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn"; }; propagatedBuildInputs = [ libbson ]; - buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ]; + buildInputs = [ openssl perl pkgconfig which ]; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; - homepage = "https://github.com/mongodb/mongo-c-driver"; + homepage = https://github.com/mongodb/mongo-c-driver; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/motif/Do-not-compile-demos.patch b/pkgs/development/libraries/motif/Do-not-compile-demos.patch deleted file mode 100644 index 1b8df94d0077..000000000000 --- a/pkgs/development/libraries/motif/Do-not-compile-demos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -27,7 +27,6 @@ SUBDIRS = bindings bitmaps \ - include \ - tools \ - clients \ -- doc \ -- demos -+ doc - AUTOMAKE_OPTIONS = 1.4 - ACLOCAL_AMFLAGS = -I . diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 1f86af0a2e86..c57353ccbd47 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -3,7 +3,7 @@ , expat, libjpeg, libpng, libiconv , flex , libXp, libXau -, demoSupport ? false, autoconf, automake +, demoSupport ? false }: # refer to the gentoo package @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { expat libjpeg libpng libiconv ]; - nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ]; + nativeBuildInputs = [ pkgconfig flex ]; propagatedBuildInputs = [ libXp libXau ]; @@ -30,13 +30,16 @@ stdenv.mkDerivation rec { makeFlags = [ "CFLAGS=-fno-strict-aliasing" ]; - prePatch = ''rm lib/Xm/Xm.h''; + prePatch = '' + rm lib/Xm/Xm.h + '' + stdenv.lib.optionalString (!demoSupport) '' + sed '/^SUBDIRS =,^$/s/\//' -i Makefile.{am,in} + ''; patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch ./Use-correct-header-for-malloc.patch ./Add-X.Org-to-bindings-file.patch - ] - ++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch; + ]; meta = with stdenv.lib; { homepage = http://motif.ics.com; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 907e628b767c..a344b8fa92f4 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.2.0"; + version = "1.5.1"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf"; + sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44"; }; outputs = [ "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = http://movits.sesse.net; + homepage = http://movit.sesse.net; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 4f9a9fb9bd0e..360ad66b7ce8 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./upstream.patch ]; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "doc" "info" ]; # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 4bfd43508317..cbcf83f1d322 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; downloadPage = "http://mpir.org/downloads.html"; - homepage = "http://mpir.org/"; + homepage = http://mpir.org/; updateWalker = true; }; } diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 783126768834..8df9715a4f4a 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ./waf install ''; meta = with stdenv.lib; { - homepage = "http://named-data.net/"; + homepage = http://named-data.net/; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index bf7b5397345a..de9023a57106 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 = http://www.unidata.ucar.edu/software/netcdf/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 9002d06693e5..e00decca2ffd 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lncurses"; + preConfigure = '' + # If CPP is set explicitly, configure and make will not agree about which + # programs to use at different stages. + unset CPP + ''; + crossAttrs = { makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; }; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 7561f3b322b5..3696578b8e04 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); meta = { - homepage = "http://ab-initio.mit.edu/nlopt/"; + homepage = http://ab-initio.mit.edu/nlopt/; description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 278834190bbf..8f3a313b21df 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary"; + homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix new file mode 100644 index 000000000000..b095c0366adc --- /dev/null +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "ntbtls-${version}"; + version = "0.1.1"; + + src = fetchurl { + url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; + sha256 = "0d322kgih43vr0gvy7kdj4baql1d6fa71vgpv0z63ira9pk4q9rd"; + }; + + outputs = [ "dev" "out" ]; + + buildInputs = [ libgcrypt libgpgerror libksba zlib ]; + + postInstall = '' + moveToOutput "bin/ntbtls-config" $dev + ''; + + meta = { + description = "A tiny TLS 1.2 only implementation"; + homepage = https://www.gnupg.org/software/ntbtls/index.html; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ joachifm ]; + }; +} diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index a010ae9bd1ad..034fbf34385f 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; - homepage = "https://github.com/castano/nvidia-texture-tools"; + homepage = https://github.com/castano/nvidia-texture-tools; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index db4a82290645..e044a7bde423 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = "https://matrix.org/git/olm/about"; + homepage = https://matrix.org/git/olm/about; }; src = fetchurl { diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 20b7c9ba6df2..613aeddd77be 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenCL Host API C++ bindings"; - homepage = "http://github.khronos.org/OpenCL-CLHPP/"; + homepage = http://github.khronos.org/OpenCL-CLHPP/; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 58822b96b080..717bb5ad0eed 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Khronos OpenCL headers"; - homepage = "https://www.khronos.org/registry/cl/"; + homepage = https://www.khronos.org/registry/cl/; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix new file mode 100644 index 000000000000..9a8787ad7f49 --- /dev/null +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +let + version = "0.1.5"; +in +stdenv.mkDerivation { + name = "opencore-amr-${version}"; + src = fetchurl { + url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + }; + + meta = { + homepage = https://opencore-amr.sourceforge.io/; + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.kiloreux ]; + }; +} diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 7f9c3803896b..c5f79b8613ec 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Constructive Solid Geometry library"; - homepage = "http://www.opencsg.org/"; + homepage = http://www.opencsg.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 85b4d5627201..69f0ce929d18 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -17,6 +17,7 @@ , enableEigen ? false, eigen , enableOpenblas ? false, openblas , enableCuda ? false, cudatoolkit, gcc5 +, enableTesseract ? false, tesseract, leptonica , AVFoundation, Cocoa, QTKit }: @@ -37,13 +38,16 @@ let sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; }; - # This fixes the build on OS X. + # This fixes the build on macOS. # See: https://github.com/opencv/opencv_contrib/pull/926 contribOSXFix = fetchpatch { url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch"; sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm"; }; + # Contrib must be built in order to enable Tesseract support: + buildContrib = enableContrib || enableTesseract; + vggFiles = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; @@ -66,10 +70,10 @@ stdenv.mkDerivation rec { inherit version src; postUnpack = - (lib.optionalString enableContrib '' + (lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" - # This fixes the build on OS X. + # This fixes the build on macOS. patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}" for name in vgg_generated_48.i \ @@ -90,9 +94,14 @@ stdenv.mkDerivation rec { done ''); - # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS) + # This prevents cmake from using libraries in impure paths (which + # causes build failure on non NixOS) + # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with + # what appears to be some stray headers in dnn/misc/tensorflow + # in contrib when generating the Python bindings: postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt + sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py ''; preConfigure = @@ -113,7 +122,7 @@ stdenv.mkDerivation rec { ln -s "${ippicv}" "${dir}/${name}" '' ) + - (lib.optionalString enableContrib '' + (lib.optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") ''); @@ -132,8 +141,12 @@ stdenv.mkDerivation rec { ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optional enableOpenblas openblas + # There is seemingly no compile-time flag for Tesseract. It's + # simply enabled automatically if contrib is built, and it detects + # tesseract & leptonica. + ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] - ++ lib.optional enableContrib protobuf3_1 + ++ lib.optional buildContrib protobuf3_1 ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -153,7 +166,7 @@ stdenv.mkDerivation rec { (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] - ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off" + ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix new file mode 100644 index 000000000000..75d2b090e711 --- /dev/null +++ b/pkgs/development/libraries/opendht/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkgconfig +, nettle +, gnutls +, libmsgpack +, readline +, libargon2 +}: + +stdenv.mkDerivation rec { + name = "opendht-${version}"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "${version}"; + sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + }; + + buildInputs = [ + autoconf + automake + libtool + pkgconfig + nettle + gnutls + libmsgpack + readline + libargon2 + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "A C++11 Kademlia distributed hash table implementation"; + homepage = https://github.com/savoirfairelinux/opendht; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ taeer olynch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index f412346456c6..71c2e56f5410 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = "http://www.opendkim.org/"; + homepage = http://www.opendkim.org/; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix new file mode 100644 index 000000000000..690261438ab9 --- /dev/null +++ b/pkgs/development/libraries/openfst/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "openfst"; + version = "1.6.3"; + + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; + sha256 = "5c28b6ccd017fc6ff94ebd0c73ed8ab37d48f563dab1c603856fb05bc9333d99"; + }; + meta = { + description = "Library for working with finite-state transducers"; + longDescription = '' + Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). + FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, + pattern matching, string processing, machine learning, information extraction and retrieval among others + ''; + homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.dfordivam ]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 8232af3e789e..0a0b4c8d5498 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-1.5.0"; + name = "openh264-${version}"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz"; - sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + rev = "v${version}"; + sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a"; }; buildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 7155d0f48a80..94a4db43fda6 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "--disable-dependency-tracking" # speeds up one-time build "--enable-modules" "--sysconfdir=/etc" + "--enable-crypt" ] ++ stdenv.lib.optional (openssl == null) "--without-tls" ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index fa147a9d9cca..ed646b9e221b 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Atomic primitives for high performance, concurrent software"; - homepage = "https://trac.mpich.org/projects/openpa"; + homepage = https://trac.mpich.org/projects/openpa; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ leenaars ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 864e2dc70857..3ab3f68cde5e 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = "http://openslp.org/"; + homepage = http://openslp.org/; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 347217006528..86015abb9817 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.openssl.org/; + homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c0296f42406d..5a4d23b6a39b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,7 +48,8 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.isAarch64) "no-afalgeng"; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -95,7 +96,7 @@ let }; meta = { - homepage = http://www.openssl.org/; + homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 0888fba4ecac..7a7a6d9d23f1 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv +, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "p11-kit-0.23.2"; + name = "p11-kit-${version}"; + version = "0.23.7"; - src = fetchurl { - url = "${meta.homepage}releases/${name}.tar.gz"; - sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms"; + src = fetchFromGitHub { + owner = "p11-glue"; + repo = "p11-kit"; + rev = version; + sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; + nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ]; + buildInputs = [ libffi libtasn1 libiconv ]; + + autoreconfPhase = '' + NOCONFIGURE=1 ./autogen.sh + ''; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" + "--enable-doc" ]; installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 9b396261fcca..29a69bee0c70 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "6"; + ver_min = "9"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573"; + sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix new file mode 100644 index 000000000000..09cbd86eb92b --- /dev/null +++ b/pkgs/development/libraries/pangolin/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, Carbon ? null, Cocoa ? null +}: + +stdenv.mkDerivation rec { + name = "pangolin-${version}"; + + version = "2017-08-02"; + + src = fetchFromGitHub { + owner = "stevenlovegrove"; + repo = "Pangolin"; + rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; + sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + }; + + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + buildInputs = [ + mesa_noglu + glew + xorg.libX11 + ffmpeg + python3 + libjpeg + libpng + libtiff + eigen + ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + + enableParallelBuilding = true; + + # The tests use cmake's findPackage to find the installed version of + # pangolin, which isn't what we want (or available). + doCheck = false; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + meta = { + description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + longDescription = '' + Pangolin is a lightweight portable rapid development library for managing + OpenGL display / interaction and abstracting video input. At its heart is + a simple OpenGl viewport manager which can help to modularise 3D + visualisation without adding to its complexity, and offers an advanced + but intuitive 3D navigation handler. Pangolin also provides a mechanism + for manipulating program variables through config files and ui + integration, and has a flexible real-time plotter for visualising + graphical data. + ''; + homepage = https://github.com/stevenlovegrove/Pangolin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index ccb7d4179df4..efaf2cfd429a 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = "https://github.com/rhdunn/pcaudiolib"; + homepage = https://github.com/rhdunn/pcaudiolib; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index a165c539ae8f..654698c1b32d 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; - homepage = "http://www.pcg-random.org/"; + homepage = http://www.pcg-random.org/; license = stdenv.lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 93e32529592e..d19410f735f9 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.pcre.org/"; + homepage = http://www.pcre.org/; description = "A library for Perl Compatible Regular Expressions"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 8df18530472a..3b698ff74cfa 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl Compatible Regular Expressions"; - homepage = "http://www.pcre.org/"; + homepage = http://www.pcre.org/; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index e0f24fbc822a..b29388790d02 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index f296e34e783a..53281ddc6578 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 696cd6a36e5e..171acea90b34 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index a7551afd2126..43bcef0f2d3c 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://icculus.org/physfs/"; + homepage = http://icculus.org/physfs/; description = "Library to provide abstract access to various archives"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e07583fccb5b..e568e1597972 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, lhapdf, root, yoda }: +{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { name = "fastnlo_toolkit-${version}"; - version = "2.3.1pre-2212"; + version = "2.3.1pre-2402"; src = fetchurl { url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; - sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp"; + sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; - buildInputs = [ boost lhapdf root yoda ]; + buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ]; + propagatedBuildInputs = [ zlib ]; - CXXFLAGS="-std=c++11"; # for yoda + preConfigure = '' + substituteInPlace ./fastnlotoolkit/Makefile.in \ + --replace "-fext-numeric-literals" "" + ''; configureFlags = [ "--with-yoda=${yoda}" diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 737565d298e0..407be5c5e4a4 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.0.4"; + version = "7.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; + sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; }; - patches = [ - # Otherwise it causes an error - # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_ - (fetchpatch { - url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw"; - sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83"; - }) - ]; - nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] # There is a bug that requires for MMHT PDF's to be presend during the build ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); - preConfigure = '' - # needed for the patch above - autoreconf -i + postPatch = '' + patchShebangs ./cat_with_cpplines ''; configureFlags = [ diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 90a6d17f09aa..1a203172d2c8 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, boost, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.1.6"; + version = "6.2.0"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2"; + sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; }; - buildInputs = [ boost python2 ]; - - patches = [ ./distutils-c++.patch ]; - - configureFlags = "--with-boost=${boost.dev}"; + buildInputs = [ python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch deleted file mode 100644 index 822c3e382724..000000000000 --- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/wrappers/python/Makefile.am -+++ b/wrappers/python/Makefile.am -@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES) - - if WITH_PYTHON - --PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - - ## Always force setup.py, it's not good at guessing what needs to rebuild - all-local: fix-out-of-source -diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in -index 925460c..fdc8888 100644 ---- a/wrappers/python/Makefile.in -+++ b/wrappers/python/Makefile.in -@@ -266,7 +266,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd - FIXSOURCES = $(EXTRA_DIST) --@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index b0ced3b24e0c..a8518d340b76 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,7 +2,7 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/" +BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.* - #include - #include -+#include - - #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS - //! A finite sequence of coefficients. -@@ -433,7 +434,7 @@ public: - - typedef std::bidirectional_iterator_tag iterator_category; - typedef Coefficient value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef value_type& reference; - -@@ -474,7 +475,7 @@ class Parma_Polyhedra_Library::Dense_Row - public: - - typedef const Coefficient value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef Coefficient_traits::const_reference reference; - -diff -up ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig ppl-1.1/src/Linear_Expression_Interface_defs.hh ---- ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig 2014-04-29 13:08:17.337683198 -0300 -+++ ppl-1.1/src/Linear_Expression_Interface_defs.hh 2014-04-29 13:08:40.999684104 -0300 -@@ -32,6 +32,7 @@ site: http://bugseng.com/products/ppl/ . - #include "Sparse_Row_types.hh" - #include - #include -+#include - - #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS - //! A linear expression. -@@ -65,7 +66,7 @@ public: - public: - typedef std::bidirectional_iterator_tag iterator_category; - typedef const Coefficient value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef Coefficient_traits::const_reference reference; - -diff -up ppl-1.1/src/CO_Tree_defs.hh.orig ppl-1.1/src/CO_Tree_defs.hh ---- ppl-1.1/src/CO_Tree_defs.hh.orig 2014-04-29 13:11:33.725690719 -0300 -+++ ppl-1.1/src/CO_Tree_defs.hh 2014-04-29 13:11:55.943691569 -0300 -@@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ . - - #include "Coefficient_defs.hh" - #include -+#include - - #ifndef PPL_CO_TREE_EXTRA_DEBUG - #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG -@@ -159,7 +160,7 @@ public: - - typedef std::bidirectional_iterator_tag iterator_category; - typedef const data_type value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef data_type_const_reference reference; - -@@ -314,7 +315,7 @@ public: - - typedef std::bidirectional_iterator_tag iterator_category; - typedef data_type value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef value_type& reference; - -diff -up ppl-1.1/src/CO_Tree_inlines.hh.orig ppl-1.1/src/CO_Tree_inlines.hh ---- ppl-1.1/src/CO_Tree_inlines.hh.orig 2014-04-29 13:14:12.738696808 -0300 -+++ ppl-1.1/src/CO_Tree_inlines.hh 2014-04-29 13:14:48.887698192 -0300 -@@ -24,6 +24,8 @@ site: http://bugseng.com/products/ppl/ . - #ifndef PPL_CO_Tree_inlines_hh - #define PPL_CO_Tree_inlines_hh 1 - -+#include -+ - namespace Parma_Polyhedra_Library { - - inline dimension_type -@@ -31,7 +33,7 @@ CO_Tree::dfs_index(const_iterator itr) c - PPL_ASSERT(itr.current_index != 0); - PPL_ASSERT(itr.current_index >= indexes + 1); - PPL_ASSERT(itr.current_index <= indexes + reserved_size); -- const ptrdiff_t index = itr.current_index - indexes; -+ const std::ptrdiff_t index = itr.current_index - indexes; - return static_cast(index); - } - -@@ -40,7 +42,7 @@ CO_Tree::dfs_index(iterator itr) const { - PPL_ASSERT(itr.current_index != 0); - PPL_ASSERT(itr.current_index >= indexes + 1); - PPL_ASSERT(itr.current_index <= indexes + reserved_size); -- const ptrdiff_t index = itr.current_index - indexes; -+ const std::ptrdiff_t index = itr.current_index - indexes; - return static_cast(index); - } - -@@ -772,7 +774,7 @@ CO_Tree::tree_iterator::follow_left_chil - p -= (offset - 1); - while (*p == unused_index) - ++p; -- const ptrdiff_t distance = p - tree.indexes; -+ const std::ptrdiff_t distance = p - tree.indexes; - PPL_ASSERT(distance >= 0); - i = static_cast(distance); - offset = least_significant_one_mask(i); -@@ -787,7 +789,7 @@ CO_Tree::tree_iterator::follow_right_chi - p += (offset - 1); - while (*p == unused_index) - --p; -- const ptrdiff_t distance = p - tree.indexes; -+ const std::ptrdiff_t distance = p - tree.indexes; - PPL_ASSERT(distance >= 0); - i = static_cast(distance); - offset = least_significant_one_mask(i); -diff -up ppl-1.1/src/Linear_Expression_defs.hh.orig ppl-1.1/src/Linear_Expression_defs.hh ---- ppl-1.1/src/Linear_Expression_defs.hh.orig 2014-04-29 13:15:39.793700141 -0300 -+++ ppl-1.1/src/Linear_Expression_defs.hh 2014-04-29 13:16:07.464701201 -0300 -@@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ . - - #include "Linear_Expression_Interface_defs.hh" - #include "Variable_defs.hh" -+#include - - namespace Parma_Polyhedra_Library { - -@@ -381,7 +382,7 @@ public: - public: - typedef std::bidirectional_iterator_tag iterator_category; - typedef const Coefficient value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef value_type* pointer; - typedef Coefficient_traits::const_reference reference; - -diff -up ppl-1.1/src/CO_Tree.cc.orig ppl-1.1/src/CO_Tree.cc ---- ppl-1.1/src/CO_Tree.cc.orig 2014-04-29 13:19:37.192709232 -0300 -+++ ppl-1.1/src/CO_Tree.cc 2014-04-29 13:19:58.000710029 -0300 -@@ -954,7 +954,7 @@ PPL::CO_Tree - --subtree_size; - } - -- const ptrdiff_t distance = first_unused_index - indexes; -+ const std::ptrdiff_t distance = first_unused_index - indexes; - PPL_ASSERT(distance >= 0); - return static_cast(distance); - } -diff -up ppl-1.1/src/Constraint_System_defs.hh.orig ppl-1.1/src/Constraint_System_defs.hh ---- ppl-1.1/src/Constraint_System_defs.hh.orig 2014-04-29 13:30:05.530733294 -0300 -+++ ppl-1.1/src/Constraint_System_defs.hh 2014-04-29 13:30:27.167734122 -0300 -@@ -37,6 +37,7 @@ site: http://bugseng.com/products/ppl/ . - #include "termination_types.hh" - #include - #include -+#include - - namespace Parma_Polyhedra_Library { - -@@ -609,7 +610,7 @@ for (Constraint_System::const_iterator i - class Parma_Polyhedra_Library::Constraint_System_const_iterator - : public std::iterator { - public: -diff -up ppl-1.1/src/Congruence_System_defs.hh.orig ppl-1.1/src/Congruence_System_defs.hh ---- ppl-1.1/src/Congruence_System_defs.hh.orig 2014-04-29 13:33:56.927742155 -0300 -+++ ppl-1.1/src/Congruence_System_defs.hh 2014-04-29 13:34:15.535742867 -0300 -@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ . - #include "Congruence_defs.hh" - #include "Constraint_System_types.hh" - #include -+#include - - namespace Parma_Polyhedra_Library { - -@@ -249,7 +250,7 @@ public: - class const_iterator - : public std::iterator { - public: -diff -up ppl-1.1/src/Generator_System_defs.hh.orig ppl-1.1/src/Generator_System_defs.hh ---- ppl-1.1/src/Generator_System_defs.hh.orig 2014-04-29 13:44:30.122766402 -0300 -+++ ppl-1.1/src/Generator_System_defs.hh 2014-04-29 13:44:48.167767093 -0300 -@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ . - #include "Poly_Con_Relation_defs.hh" - #include "Polyhedron_types.hh" - #include -+#include - - namespace Parma_Polyhedra_Library { - -@@ -679,7 +680,7 @@ copy(gs.begin(), gs.end(), ostream_itera - class Parma_Polyhedra_Library::Generator_System_const_iterator - : public std::iterator { - public: -diff -up ppl-1.1/src/Grid_Generator_System_defs.hh.orig ppl-1.1/src/Grid_Generator_System_defs.hh ---- ppl-1.1/src/Grid_Generator_System_defs.hh.orig 2014-04-29 13:45:26.073768544 -0300 -+++ ppl-1.1/src/Grid_Generator_System_defs.hh 2014-04-29 13:45:42.535769175 -0300 -@@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ . - #include "Variables_Set_types.hh" - #include "Polyhedron_types.hh" - #include -+#include - - namespace Parma_Polyhedra_Library { - -@@ -277,7 +278,7 @@ public: - class const_iterator - : public std::iterator { - public: diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d9d0afa2bde8..dd33f63c913c 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; - homepage = http://pugixml.org/; + homepage = https://pugixml.org; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index e8e0aba7a246..2057aee3e995 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A QML port of qtermwidget"; - homepage = "https://github.com/Swordfish90/qmltermwidget"; + homepage = https://github.com/Swordfish90/qmltermwidget; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 48a63e412343..fa998b9e1984 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, qt4, qca2, qmake4Hook }: +{ stdenv, fetchurl, qt5, qca2-qt5 }: stdenv.mkDerivation { - name = "qoauth-1.0.1"; + name = "qoauth-2.0.0"; src = fetchurl { - url = https://github.com/ayoy/qoauth/tarball/v1.0.1; - name = "qoauth-1.0.1.tar.gz"; - sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp"; + url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz; + name = "qoauth-2.0.0.tar.gz"; + sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333"; }; patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro"; - buildInputs = [ qt4 qca2 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt5.qtbase qca2-qt5 ]; + nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = [ "-I${qca2}/include/QtCrypto" ]; - NIX_LDFLAGS = [ "-lqca" ]; + NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; + NIX_LDFLAGS = [ "-lqca-qt5" ]; meta = { description = "Qt library for OAuth authentication"; - inherit (qt4.meta) platforms; + inherit (qt5.qtbase.meta) platforms; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 5aa1d0350fc7..4cd5fb0f6414 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://qpdf.sourceforge.net/"; + homepage = http://qpdf.sourceforge.net/; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index d3eaeed2f1e0..1b87b1b0a27b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { -datadir $out/share/${name} -translationdir $out/share/${name}/translations " + unset LD # Makefile uses gcc for linking; setting LD interferes '' + optionalString stdenv.cc.isClang '' sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 4e7c7ea54568..f2e18233d913 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation { preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES + # We need to set LD to CXX or otherwise we get nasty compile errors + export LD=$CXX configureFlags+="\ -plugindir $out/$qtPluginPrefix \ @@ -111,6 +113,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\"" + + unset LD ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix index d72d7b6c64cb..57b1b46a9c5d 100644 --- a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix @@ -6,6 +6,7 @@ qtSubmodule { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postFixup = '' moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qdbusviewer" "$out" moveToOutput "bin/qtpaths" "$out" ''; } diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 7aba54fb883b..8f9be38fc882 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -99,6 +99,7 @@ let inherit developerBuild decryptSslTraffic; }; + qtcharts = callPackage ./qtcharts.nix {}; qtconnectivity = callPackage ./qtconnectivity.nix {}; qtdeclarative = callPackage ./qtdeclarative {}; qtdoc = callPackage ./qtdoc.nix {}; @@ -128,10 +129,10 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" ([ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations - qtwebsockets qtx11extras qtxmlpatterns + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 60acf2cea9d2..2ae85bba391d 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,3 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/ \ - http://download.qt.io/community_releases/5.9/5.9.0-final/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix new file mode 100644 index 000000000000..58e197d504f9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtcharts"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix index 8c231271607c..012e8bca75d3 100644 --- a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix @@ -10,6 +10,7 @@ qtSubmodule { # qmake moves all binaries to $dev in preFixup postFixup = '' moveToOutput "bin/qdbus" "$bin" + moveToOutput "bin/qdbusviewer" "$bin" moveToOutput "bin/qtpaths" "$bin" ''; } diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 021cd935a14c..247800b75780 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,331 +3,331 @@ { qt3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qt3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1a8v70svsqxissj0rmna71f9g2w56w0zgk5s41m5acgvi9byzywy"; - name = "qt3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; + sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; + name = "qt3d-opensource-src-5.9.1.tar.xz"; }; }; qtactiveqt = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtactiveqt-opensource-src-5.9.0.tar.xz"; - sha256 = "0d8n4q3r54kkb340ap802cc97jznhffzx1m7h2775q0h2nzvmiyp"; - name = "qtactiveqt-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; + sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; + name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; }; }; qtandroidextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtandroidextras-opensource-src-5.9.0.tar.xz"; - sha256 = "0xq3nd8nlbmd617lq60nb2lxblc84lk8wh14n18b3q81nsvc2yln"; - name = "qtandroidextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; + name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; }; }; qtbase = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz"; - sha256 = "0v19spxa4sfq0a35nab9n8n2s3jd0443px0k45zhhg103apv4zi6"; - name = "qtbase-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; + sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; + name = "qtbase-opensource-src-5.9.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcanvas3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1jrv79rhpqyp4ip5fnf40plqcq9byl1fy8287ghq4jfhpm9bq5yq"; - name = "qtcanvas3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; + sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; + name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; }; }; qtcharts = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcharts-opensource-src-5.9.0.tar.xz"; - sha256 = "17m86csjymvcnprk8m4y6hx1qhlk9811rhqwwkqdymyyswx6xs3l"; - name = "qtcharts-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; + sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; + name = "qtcharts-opensource-src-5.9.1.tar.xz"; }; }; qtconnectivity = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtconnectivity-opensource-src-5.9.0.tar.xz"; - sha256 = "0k52acsywr849nw86dfjqcv1lqgnq01akqrm0qjs7ysm1ayg8mcp"; - name = "qtconnectivity-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; + sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; + name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdatavis3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1wvilla48jlw6zv2hc32ra0bs8p13s68sqbgr91bzbn7h7qaysv9"; - name = "qtdatavis3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; + sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; + name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; }; }; qtdeclarative = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdeclarative-opensource-src-5.9.0.tar.xz"; - sha256 = "1g9yz7q2laqs80m4i6zngxrq3pd7z5khr2f48glma8cmiw4p56rw"; - name = "qtdeclarative-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; + sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; + name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; }; }; qtdoc = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdoc-opensource-src-5.9.0.tar.xz"; - sha256 = "1k67i67npcjyr89hlnljjxw5jkh49ql8yzw9m9b4gld7nk9dr4kr"; - name = "qtdoc-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; + sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; + name = "qtdoc-opensource-src-5.9.1.tar.xz"; }; }; qtgamepad = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgamepad-opensource-src-5.9.0.tar.xz"; - sha256 = "0lpj2qspidx6s2568m5v40j2zdnrl8zwjdp40zg4y2q6hy2gg597"; - name = "qtgamepad-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; + sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; + name = "qtgamepad-opensource-src-5.9.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgraphicaleffects-opensource-src-5.9.0.tar.xz"; - sha256 = "1cz4ykwlm1c0hbv4d8y07bwyz87nkz5l9ss3f65vadm8zcabqw55"; - name = "qtgraphicaleffects-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; + name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; }; }; qtimageformats = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtimageformats-opensource-src-5.9.0.tar.xz"; - sha256 = "10alm3kz3md835hf5hx7322bak9pp9igi2knvymxsjqr8x87jq94"; - name = "qtimageformats-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; + sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; + name = "qtimageformats-opensource-src-5.9.1.tar.xz"; }; }; qtlocation = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtlocation-opensource-src-5.9.0.tar.xz"; - sha256 = "1xia1y1pjill9m880rgmsl2zshcg1nvwkyfdb2lz8g8x9fj0pvp3"; - name = "qtlocation-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; + sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; + name = "qtlocation-opensource-src-5.9.1.tar.xz"; }; }; qtmacextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmacextras-opensource-src-5.9.0.tar.xz"; - sha256 = "1przk4dbyjdy18a5x1c4m04v40d70nkgwc569zjccpbqz0a0agbx"; - name = "qtmacextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; + name = "qtmacextras-opensource-src-5.9.1.tar.xz"; }; }; qtmultimedia = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmultimedia-opensource-src-5.9.0.tar.xz"; - sha256 = "1vk0vlp9wapj1pip5v0v0sxynlig38m3a1qbjhid3rm27f971cqb"; - name = "qtmultimedia-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; + sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; + name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtnetworkauth-opensource-src-5.9.0.tar.xz"; - sha256 = "157byylzir8cr5y407qpjmz9ag0b0qaz99n99nl2xjxkyll8ph0g"; - name = "qtnetworkauth-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; + sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; + name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; }; }; qtpurchasing = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtpurchasing-opensource-src-5.9.0.tar.xz"; - sha256 = "0xcka24qjdydqhf7fhn2i2ycn3zsi4vzqv9s77wzmaksrazwb13q"; - name = "qtpurchasing-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; + sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; + name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols-opensource-src-5.9.0.tar.xz"; - sha256 = "1zjl2wp5407y8iabwi30j4jpxh2j4y0ijb5jvvpdq583nbzgyg8p"; - name = "qtquickcontrols-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; + sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; + name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols2-opensource-src-5.9.0.tar.xz"; - sha256 = "170xgk4jw1b1rpq8838dc5sb0dyv1jap3yfgg5hymrjzrk0nzaq9"; - name = "qtquickcontrols2-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; + name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtremoteobjects-opensource-src-5.9.0.tar.xz"; - sha256 = "0f8dv7sswzck0l2md1zl44cbvi54mm6iiz4qh2hh3vqwyj9k5xyr"; - name = "qtremoteobjects-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; + sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; + name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; }; }; qtscript = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscript-opensource-src-5.9.0.tar.xz"; - sha256 = "0r697ap324l8lnbqbhrrqzsl9k4nmk6lcijxlaqn3ksxgfzbcciw"; - name = "qtscript-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; + sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; + name = "qtscript-opensource-src-5.9.1.tar.xz"; }; }; qtscxml = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscxml-opensource-src-5.9.0.tar.xz"; - sha256 = "0f2jnhl30ij6y4wzlvgjsqgpaywq4g0wc4yjw8s888vcfl062nb4"; - name = "qtscxml-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; + sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; + name = "qtscxml-opensource-src-5.9.1.tar.xz"; }; }; qtsensors = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsensors-opensource-src-5.9.0.tar.xz"; - sha256 = "0jdaw0i6rirs66x4cjh8l24fsyp020x1mv1psyf3ffbkdq1pngjx"; - name = "qtsensors-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; + sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; + name = "qtsensors-opensource-src-5.9.1.tar.xz"; }; }; qtserialbus = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialbus-opensource-src-5.9.0.tar.xz"; - sha256 = "1zw32ha5hz7zsdp8m2dk58kivxd66vkzijbnhi8jvzjp4nf0pm1f"; - name = "qtserialbus-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; + sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; + name = "qtserialbus-opensource-src-5.9.1.tar.xz"; }; }; qtserialport = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialport-opensource-src-5.9.0.tar.xz"; - sha256 = "0zwxfbyn5rg6vyrgpi5c3n852vd32m37ghzyj4l50ljndlz2w0l0"; - name = "qtserialport-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; + sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; + name = "qtserialport-opensource-src-5.9.1.tar.xz"; }; }; qtspeech = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtspeech-opensource-src-5.9.0.tar.xz"; - sha256 = "0da7q3j49hn9j2wy0ny4ym4nxy33yi8p62v9vrq9r9lb4xqjipcl"; - name = "qtspeech-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; + sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; + name = "qtspeech-opensource-src-5.9.1.tar.xz"; }; }; qtsvg = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsvg-opensource-src-5.9.0.tar.xz"; - sha256 = "0zpy53vb0ckaj71ffl450qv9kipl8gwwcbbras8kbg6bpl8srl8g"; - name = "qtsvg-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; + sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; + name = "qtsvg-opensource-src-5.9.1.tar.xz"; }; }; qttools = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttools-opensource-src-5.9.0.tar.xz"; - sha256 = "1vl5lapnbaam51pfw89pshh6rxqwfrbpj0j8gdhzdngr6n79dzk4"; - name = "qttools-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; + sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; + name = "qttools-opensource-src-5.9.1.tar.xz"; }; }; qttranslations = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttranslations-opensource-src-5.9.0.tar.xz"; - sha256 = "0xsgvk8j7zl4infgmrkhdmjkizcihddqn9sc5g1dv2d94gc83jaw"; - name = "qttranslations-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; + sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; + name = "qttranslations-opensource-src-5.9.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtvirtualkeyboard-opensource-src-5.9.0.tar.xz"; - sha256 = "0xks7n70631p5ij7vbww5ihni6iscx9hkdw8c97nnzb1bvvaqx19"; - name = "qtvirtualkeyboard-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; + name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; }; }; qtwayland = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwayland-opensource-src-5.9.0.tar.xz"; - sha256 = "0zlxlxrc15x69jwhcc6h0xi4mfchbb3pf27y3zy22yi3ynv2p04v"; - name = "qtwayland-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; + sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; + name = "qtwayland-opensource-src-5.9.1.tar.xz"; }; }; qtwebchannel = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebchannel-opensource-src-5.9.0.tar.xz"; - sha256 = "1fg1g2h9s9v6lg10ix59pzws35fyh3hh5x2005pyp84xdg47mvqj"; - name = "qtwebchannel-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; + sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; + name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; }; }; qtwebengine = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebengine-opensource-src-5.9.0.tar.xz"; - sha256 = "085qq852kwb8rqw12w96647vfvsgqvw33wc4xn3cb2gwn1wsbm1f"; - name = "qtwebengine-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; + sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; + name = "qtwebengine-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz"; - sha256 = "012fd8khiasfn8wx5ci310y94ap3y90a011f66cajm80fhxikbcd"; - name = "qtwebkit-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz"; + sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998"; + name = "qtwebkit-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit-examples = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-examples-opensource-src-5.9.0.tar.xz"; - sha256 = "0zj700z90k4sss1b5zg4rlg5pkq79q72pql1d6zglrgp505s9a7x"; - name = "qtwebkit-examples-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz"; + sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4"; + name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; }; }; qtwebsockets = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebsockets-opensource-src-5.9.0.tar.xz"; - sha256 = "1ml60p50hr3f68l0fiyqg2pf6n37flzxafzasis42jm4m757m5v2"; - name = "qtwebsockets-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; + sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; + name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; }; }; qtwebview = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebview-opensource-src-5.9.0.tar.xz"; - sha256 = "0ayjsdyymg9hrryn2y0c796cbwdf4hdpjdwjqkib57rblh5g39qw"; - name = "qtwebview-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; + sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; + name = "qtwebview-opensource-src-5.9.1.tar.xz"; }; }; qtwinextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwinextras-opensource-src-5.9.0.tar.xz"; - sha256 = "12xh6wqjn1wmvy7rzay6a0wyc31lgv1zida87kr67dbwblmax03j"; - name = "qtwinextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; + sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; + name = "qtwinextras-opensource-src-5.9.1.tar.xz"; }; }; qtx11extras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtx11extras-opensource-src-5.9.0.tar.xz"; - sha256 = "0smzs29zqi77s1038ddkj3wzcchajqrjymwa5jgva7n2dn2x40wy"; - name = "qtx11extras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; + sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; + name = "qtx11extras-opensource-src-5.9.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtxmlpatterns-opensource-src-5.9.0.tar.xz"; - sha256 = "1f2mly7ddw4hpr3x0lpdahcikivwhiwa3238yrg4gz2c3lxj5y21"; - name = "qtxmlpatterns-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; + name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index f0e7f958e402..ef0f5d4014ea 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; - homepage = "https://github.com/frankosterfeld/qtkeychain"; + homepage = https://github.com/frankosterfeld/qtkeychain; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 201eb4e7ec9b..e1155c4a3bcb 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; - homepage = "https://github.com/QupZilla/qtwebkit-plugins"; + homepage = https://github.com/QupZilla/qtwebkit-plugins; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix new file mode 100644 index 000000000000..5e9a11d42512 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: + +stdenv.mkDerivation rec { + name = "rapidjson-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "miloyip"; + repo = "rapidjson"; + rev = "v${version}"; + sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cc7c7a31e1df..1bd7305867dd 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; - homepage = "https://github.com/edenhill/librdkafka"; + homepage = https://github.com/edenhill/librdkafka; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ boothead wkennington ]; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 822ce7b0055d..1183f46b8db7 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" "info" ]; propagatedBuildInputs = [ncurses]; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 7cc76e087685..a7306010a8b5 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -4,26 +4,20 @@ stdenv.mkDerivation rec { name = "readline-${version}"; - version = "7.0p0"; + version = "7.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" "info" ]; propagatedBuildInputs = [ncurses]; patchFlags = "-p0"; - patches = - [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch - ] - ; - /* - ++ + upstreamPatches = (let patch = nr: sha256: fetchurl { @@ -32,7 +26,12 @@ stdenv.mkDerivation rec { }; in import ./readline-7.0-patches.nix patch); - */ + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ] + ++ upstreamPatches; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = [ maintainers.vanschelven ]; platforms = platforms.unix; branch = "7.0"; diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/pkgs/development/libraries/readline/readline-7.0-patches.nix new file mode 100644 index 000000000000..45bec6b64812 --- /dev/null +++ b/pkgs/development/libraries/readline/readline-7.0-patches.nix @@ -0,0 +1,7 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs") +(patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7") +(patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy") +] diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 90e1dfded6ae..bc39b320c8e5 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; + homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 25aeb3a6da1b..a791c8994856 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -6,6 +6,8 @@ # Malloc implementation , jemalloc ? null, gperftools ? null + +, enableLite ? false }: let @@ -35,6 +37,9 @@ stdenv.mkDerivation rec { CMAKE_CXX_FLAGS = "-std=gnu++11"; JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; + ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; + ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; + buildFlags = [ "DEBUG_LEVEL=0" "shared_lib" diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 50f4d74d15cb..5cef2576b711 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://research.cs.wisc.edu/mist/safefile/"; + homepage = http://research.cs.wisc.edu/mist/safefile/; updateWalker = true; }; } diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index c826123174b5..d8e67baa13df 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - homepage = "http://diracvideo.org/"; + homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix new file mode 100644 index 000000000000..06550372ba8a --- /dev/null +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, itk, python }: + +stdenv.mkDerivation rec { + _name = "elastix"; + _version = "4.8"; + name = "${_name}-${_version}"; + + src = fetchFromGitHub { + owner = "SuperElastix"; + repo = "elastix"; + rev = "ef057ff89233822b26b04b31c3c043af57d5deff"; + sha256 = "0gm3a8dgqww50h6zld9ighjk92wlpybpimjwfz4s5h82vdjsvxrm"; + }; + + nativeBuildInputs = [ cmake python ]; + buildInputs = [ itk ]; + + cmakeFlags = [ "-DUSE_KNNGraphAlphaMutualInformationMetric=OFF" ]; + + checkPhase = "ctest"; + + meta = with stdenv.lib; { + homepage = http://elastix.isi.uu.nl/; + description = "Image registration toolkit based on ITK"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index a74905b5ba1d..5a08e32e7e98 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "${major}.0"; pname = "htslib"; - major = "1.4"; + major = "1.5"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; - sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w"; + sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0"; }; buildInputs = [ zlib bzip2 lzma curl ]; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 217bf4422e0c..fe90d41ccb29 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://github.com/opencollab/arpack-ng"; + homepage = https://github.com/opencollab/arpack-ng; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index e5870ce9c9b1..c6797ef05ac3 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://math-atlas.sourceforge.net/"; + homepage = http://math-atlas.sourceforge.net/; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 6f729e8a0b2a..e7c254359942 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.publicDomain; - homepage = "http://www.netlib.org/blas/"; + homepage = http://www.netlib.org/blas/; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix index 920b77b223f9..2e0b98496f3c 100644 --- a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; + homepage = https://developer.nvidia.com/cudnn; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix index 417e17e4bda2..a0d8baae78fd 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; + homepage = https://developer.nvidia.com/cudnn; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ mdaiter ]; }; diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix index cf00f7809012..fd98001da82b 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; + homepage = https://developer.nvidia.com/cudnn; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ mdaiter ]; }; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 87e9d929ed58..1e1a37af2f0e 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; + homepage = https://developer.nvidia.com/cudnn; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix new file mode 100644 index 000000000000..9d40baafe65a --- /dev/null +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -0,0 +1,164 @@ +{ stdenv +, fetchurl +, boost +, cmake +, doxygen +, eigen +, numpy +, pkgconfig +, pytest +, pythonPackages +, six +, sympy +, gtest ? null +, hdf5 ? null +, mpi ? null +, ply ? null +, python ? null +, sphinx ? null +, suitesparse ? null +, swig ? null +, vtk ? null +, zlib ? null +, docs ? false +, pythonBindings ? false +, doCheck ? true }: + +assert pythonBindings -> python != null && ply != null && swig != null; + +let + version = "2017.1.0"; + + dijitso = pythonPackages.buildPythonPackage { + name = "dijitso-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; + sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; + }; + buildInputs = [ numpy pytest six ]; + checkPhase = '' + export HOME=$PWD + py.test test/ + ''; + meta = { + description = "Distributed just-in-time shared library building"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; + }; + + fiat = pythonPackages.buildPythonPackage { + name = "fiat-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; + sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; + }; + buildInputs = [ numpy pytest six sympy ]; + checkPhase = '' + py.test test/unit/ + ''; + meta = { + description = "Automatic generation of finite element basis functions"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; + }; + + ufl = pythonPackages.buildPythonPackage { + name = "ufl-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; + sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; + }; + buildInputs = [ numpy pytest six ]; + checkPhase = '' + py.test test/ + ''; + meta = { + description = "A domain-specific language for finite element variational forms"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; + }; + + ffc = pythonPackages.buildPythonPackage { + name = "ffc-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; + sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; + }; + buildInputs = [ dijitso fiat numpy pytest six sympy ufl ]; + checkPhase = '' + export HOME=$PWD + py.test test/unit/ + ''; + meta = { + description = "A compiler for finite element variational forms"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; + }; + + instant = pythonPackages.buildPythonPackage { + name = "instant-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; + sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; + }; + buildInputs = [ numpy six ]; + meta = { + description = "Instant inlining of C and C++ code in Python"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; + }; + +in +stdenv.mkDerivation { + name = "dolfin-${version}"; + src = fetchurl { + url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; + sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; + }; + propagatedBuildInputs = [ dijitso fiat numpy six ufl ]; + buildInputs = [ + boost cmake dijitso doxygen eigen ffc fiat gtest hdf5 instant mpi + numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib + ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ]; + patches = [ ./unicode.patch ]; + cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11" + + " -DDOLFIN_AUTO_DETECT_MPI=OFF" + + " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF") + + " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_PARMETIS=OFF" + + " -DDOLFIN_ENABLE_PETSC4PY=OFF" + + " -DDOLFIN_ENABLE_PETSC=OFF" + + " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF") + + " -DDOLFIN_ENABLE_SCOTCH=OFF" + + " -DDOLFIN_ENABLE_SLEPC4PY=OFF" + + " -DDOLFIN_ENABLE_SLEPC=OFF" + + " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF") + + " -DDOLFIN_ENABLE_TRILINOS=OFF" + + " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF") + + " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"); + checkPhase = '' + make runtests + ''; + postInstall = "source $out/share/dolfin/dolfin.conf"; + meta = { + description = "The FEniCS Problem Solving Environment in Python and C++"; + homepage = http://fenicsproject.org/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/science/math/fenics/unicode.patch b/pkgs/development/libraries/science/math/fenics/unicode.patch new file mode 100644 index 000000000000..2ef2709263ab --- /dev/null +++ b/pkgs/development/libraries/science/math/fenics/unicode.patch @@ -0,0 +1,67 @@ +From 0cc9e68de1181d950d4185bf3a87b69a87e4358f Mon Sep 17 00:00:00 2001 +From: "James D. Trotter" +Date: Mon, 14 Aug 2017 16:43:53 +0200 +Subject: [PATCH] Use a UTF-8 encoding to avoid errors with decoding non-ascii + characters + +--- + cmake/scripts/generate-swig-interface.py | 6 +++--- + utils/pylit/pylit.py | 10 +++++++--- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/cmake/scripts/generate-swig-interface.py b/cmake/scripts/generate-swig-interface.py +index 843a49229..7b85453d0 100644 +--- a/cmake/scripts/generate-swig-interface.py ++++ b/cmake/scripts/generate-swig-interface.py +@@ -212,10 +212,10 @@ def extract_swig_modules_dependencies(module_to_submodules, submodule_info): + continue + + # Read code +- with open(header_file) as f: +- code = f.read() +- + try: ++ with open(header_file, encoding='utf-8') as f: ++ code = f.read() ++ + # Extract type info + used_types, declared_types = parse_and_extract_type_info(code) + except Exception as e: +diff --git a/utils/pylit/pylit.py b/utils/pylit/pylit.py +index bcd8ec5e0..8c2964fbd 100755 +--- a/utils/pylit/pylit.py ++++ b/utils/pylit/pylit.py +@@ -1496,7 +1496,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw): + if infile == '-': + in_stream = sys.stdin + else: +- in_stream = open(infile, 'r') ++ in_stream = open(infile, 'r', encoding='utf-8') + + if outfile == '-': + out_stream = sys.stdout +@@ -1505,7 +1505,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw): + elif overwrite == 'update' and is_newer(outfile, infile): + raise IOError((1, "Output file is newer than input file!", outfile)) + else: +- out_stream = open(outfile, 'w') ++ out_stream = open(outfile, 'w', encoding='utf-8') + return (in_stream, out_stream) + + # is_newer +@@ -1731,7 +1731,11 @@ def main(args=sys.argv[1:], **defaults): + + # Convert and write to out_stream:: + +- out_stream.write(str(converter)) ++ try: ++ out_stream.write(str(converter)) ++ except Exception as e: ++ print("Failed to write extract to", out_stream.name) ++ raise + + if out_stream is not sys.stdout: + print("extract written to", out_stream.name) +-- +2.14.0 + diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 5e16fcb1b547..567ee7853f88 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.6"; + version = "3.12.8"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0"; + sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = "https://projects.coin-or.org/Ipopt"; + homepage = https://projects.coin-or.org/Ipopt; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index 3c91bf373293..61a45cbab94b 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; - homepage = "http://www.netlib.org/lapack/"; + homepage = http://www.netlib.org/lapack/; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index eea59164ffba..baf77696b16f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; - homepage = "http://www.netlib.org/lapack/"; + homepage = http://www.netlib.org/lapack/; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 21805092c76c..26ec501f1a7e 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; - homepage = "http://icl.cs.utk.edu/magma/index.html"; + homepage = http://icl.cs.utk.edu/magma/index.html; platforms = platforms.unix; maintainers = with maintainers; [ ianwookim ]; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 6f3f78e55018..7edc39c11f5c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -61,13 +61,13 @@ let then blas64_ else hasPrefix "x86_64" stdenv.system; - version = "0.2.19"; + version = "0.2.20"; in stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "0mw5ra1vjsqiba79zdhqfkqq6v3bla5a5c0wj7vca9qgjzjbah4w"; + sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy"; name = "openblas-${version}.tar.gz"; }; @@ -108,7 +108,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; + homepage = https://github.com/xianyi/OpenBLAS; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index f77ac7d89a32..6b229f31f161 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = "http://www.openlibm.org/"; + homepage = http://www.openlibm.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 1988c0c07af5..989ad27055fa 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A collection of special mathematical functions"; - homepage = "https://github.com/JuliaLang/openspecfun"; + homepage = https://github.com/JuliaLang/openspecfun; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index c10a355dee02..001199cd8212 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }: +{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos +, pkgconfig, gnused, expat, openldap, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -8,18 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - buildInputs = [ apr scons openssl aprutil zlib ] - ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos - ++ [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apr scons openssl aprutil zlib libiconv ] + ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; - configurePhase = '' - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct + postPatch = '' + sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \ + -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \ + -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \ + -e 's,$OPENSSL/lib,${openssl.out}/lib,' \ + -e 's,$OPENSSL/include,${openssl.dev}/include,' \ + -i SConstruct ''; buildPhase = '' - scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \ + scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \ + LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \ APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index a9bd719fdc29..1e9a8ba6a58b 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small, fast s-expression library"; - homepage = "http://sexpr.sourceforge.net/"; + homepage = http://sexpr.sourceforge.net/; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 529dee9376a9..b481bd0cf651 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.0"; src = fetchurl { - url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; }; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 553ddb7d3b79..70e9d6181d92 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; # Fix some wrong hardcoded paths preConfigure = '' diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index b93312b0e8c9..4db4a07b4e56 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library passing all socket communications through unix sockets"; - homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary"; + homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index f5927cb73e6c..48ee1af0e30d 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; - homepage = "https://github.com/waywardgeek/sonic"; + homepage = https://github.com/waywardgeek/sonic; license = licenses.asl20; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 16e7b09a0f20..ea3013c78bcb 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = []; propagatedBuildInputs = [audiofile libtiff]; meta = { - homepage = "http://www.creytiv.com/baresip.html"; + homepage = http://www.creytiv.com/baresip.html; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 1c3952e7adfb..a47eabe5d8d5 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { name = "spdlog-${version}"; - version = stdenv.lib.strings.substring 0 7 rev; - rev = "292bdc5eb4929f183c78d2c67082b715306f81c9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; - inherit rev; - sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn"; + rev = "v${version}"; + sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 21d89c49e7c7..6dc09ddd39f8 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.19.3"; + name = "sqlite-3.20.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3190300.tar.gz"; - sha256 = "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6"; + url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz"; + sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index e5fffc076f7b..f6a96df3eb61 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.19.2"; + name = "sqlite3_analyzer-3.20.0"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip"; - sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749"; + url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip"; + sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 1961160cbc95..362881a2f42b 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 stdenv.cc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; nativeBuildInputs = [ cmake pkgconfig perl ]; - patches = [ ./export_bufferedstream.patch ]; + patches = [ ./export_bufferedstream.patch ./gcc6.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/strigi/gcc6.patch b/pkgs/development/libraries/strigi/gcc6.patch new file mode 100644 index 000000000000..b46f6c52b823 --- /dev/null +++ b/pkgs/development/libraries/strigi/gcc6.patch @@ -0,0 +1,45 @@ +https://sourceforge.net/p/strigi/patches/4/ + +and a fix for + +/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)' + wchartoutf8(name), value)); + +diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake +--- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:52.000000000 -0500 ++++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:39:54.586260564 -0400 +@@ -15,7 +15,7 @@ + # get the gcc version + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: + if (NOT _gcc_version) + string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") +diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake +--- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:57.000000000 -0500 ++++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:40:11.340134414 -0400 +@@ -15,7 +15,7 @@ + # get the gcc version + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: + if (NOT _gcc_version) + string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") + +diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp +--- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2013-02-05 22:34:52.000000000 +0100 ++++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2017-07-31 10:56:27.067902643 +0200 +@@ -321,8 +321,7 @@ + string size = value; + doc.size = atoi(size.c_str()); + } else { +- doc.properties.insert(make_pair( +- wchartoutf8(name), value)); ++ doc.properties.emplace(wchartoutf8(name), value); + } + } + Variant diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 838c30777fb1..b1649da6459f 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; + homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 8a91086c5dbe..8dd96cdd0038 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; + homepage = http://threadingbuildingblocks.org/; license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 2c1e3a2dfc9e..e0354bf01ebd 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = "http://tcl.activestate.com/software/tcllib/"; + homepage = http://tcl.activestate.com/software/tcllib/; description = "Tcl-only library of standard routines for Tcl"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 29c96bea421b..4e1f0bcab035 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://tls.sourceforge.net/"; + homepage = http://tls.sourceforge.net/; description = "An OpenSSL / RSA-bsafe Tcl extension"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 93cf0670dc73..e835d1d86fdc 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; + homepage = http://www.astro.caltech.edu/~mcs/tecla/; description = "Command-line editing library"; license = "as-is"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index e48ce2315908..4b299eedbd98 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.9.3"; + version = "0.10.0"; src = fetchurl { url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "17lnchan9q3qdg222rgjjai6819j9k755s239phdv6n0183hlx5h"; + sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; }; #enableParallelBuilding = true; problems on hydra diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 7a58f4c8cff0..d66b5d82ff52 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.0.1"; + name = "libtirpc-1.0.2"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji"; + sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = "http://sourceforge.net/projects/libtirpc/"; + homepage = http://sourceforge.net/projects/libtirpc/; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index f885fc3f954c..b208631eeaf8 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; - homepage = "http://www.grinninglizard.com/tinyxml/index.html"; + homepage = http://www.grinninglizard.com/tinyxml/index.html; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 31404e84d254..d11a5c344c9d 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.tntnet.org/tntdb.html"; + homepage = http://www.tntnet.org/tntdb.html; description = "C++ library which makes accessing SQL databases easy and robust"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index 93f4d43e6f6e..cd4ba34b33c6 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.tntnet.org/tntnet.html"; + homepage = http://www.tntnet.org/tntnet.html; description = "Web server which allows users to develop web applications using C++"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index c9133b648466..ceb97b6088bc 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -7,6 +7,9 @@ stdenv.mkDerivation { sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; + # needed to successfully compile with gcc 6 + NIX_CFLAGS_COMPILE = "-std=c90 -fPIC"; + meta = { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index d53941b5e2f5..9a2f6eb203a1 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; + homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index cee71df4849a..97cffbf0f75b 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = "https://github.com/unittest-cpp/unittest-cpp"; + homepage = https://github.com/unittest-cpp/unittest-cpp; description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = []; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 4a40806c4eb1..48c2428bbcdb 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; - homepage = http://julialang.org/utf8proc; + homepage = https://julialang.org/utf8proc; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.ftrvxmtrx ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 2beaa616f2d8..1af70056d2eb 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = "https://github.com/VcDevel/Vc"; + homepage = https://github.com/VcDevel/Vc; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index c37ff7331118..6a72feed73f6 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "Vc-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi"; + sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9"; }; nativeBuildInputs = [ cmake ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = "https://github.com/VcDevel/Vc"; + homepage = https://github.com/VcDevel/Vc; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 6225fb18e280..b7249c8ee82c 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; + homepage = http://vcg.isti.cnr.it/vcglib/install.html; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index c122928eddde..2910e8b7dbbc 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -6,11 +6,11 @@ let # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... in stdenv.mkDerivation rec { name = "vigra-${version}"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz"; - sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0"; + sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 846fc64a91e4..9bef1b27e9cd 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,14 +1,25 @@ -{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }: +{stdenv, fetchFromGitHub +, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3 +# this will not work on non-nixos systems +, sendmailPath ? "/run/wrappers/bin/sendmail" +}: -stdenv.mkDerivation { - name = "vmime-0.9.2-pre-svn603"; - src = fetchurl { - url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2; - #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; - sha256 = "1jhxiy8c2cgzfjps0z4q40wygdpgm8jr7jn727cbzrscj2c48kxx"; +stdenv.mkDerivation rec { + name = "vmime-${version}"; + version = "0.9.2"; + src = fetchFromGitHub { + owner = "kisli"; + repo = "vmime"; + rev = "v${version}"; + sha256 = "1304n50ny2av8bagjpgz55ag0nd7m313akm9bb73abjn6h5nzacv"; }; - buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 libgcrypt ]; + buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; + nativeBuildInputs = [ pkgconfig cmake ]; + + cmakeFlags = [ + "-DVMIME_SENDMAIL_PATH=${sendmailPath}" + ]; meta = { homepage = http://www.vmime.org/; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index dda1bd369760..436de5609e5a 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.7"; + version = "1.10"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "07qw166s6bm81zfnhf4lmww6wj0il960fm3vp7n1z3rign9jlpv3"; + sha256 = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index b50d94b90a5e..7d7424d914de 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -12,11 +12,11 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.4"; + version = "2.16.6"; meta = { description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; + homepage = http://webkitgtk.org/; license = licenses.bsd2; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr"; + sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; }; # see if we can clean this up.... diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 603df0407eaa..40b27f67fff3 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; + homepage = http://webkitgtk.org/; license = licenses.bsd2; platforms = with platforms; linux ++ darwin; maintainers = []; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index ebd9d51208a3..2672d6efbec1 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 = { - homepage = "http://www.zaphoyd.com/websocketpp/"; + homepage = http://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 1d19b4417404..0f1f87b9bd64 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "v${version}"; - sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw"; + rev = "v${version}-stable"; + sha256 = "0s4s9adni2q1sgqpavbmxhkl8i98bmlw6gla6dnifgsm1dirv75w"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index e25b23e84edc..be661d0d270a 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ ./cmake.patch ]; # fix a cmake warning; PR sent to upstream meta = with stdenv.lib; { - homepage = "https://www.webtoolkit.eu/wt"; + homepage = https://www.webtoolkit.eu/wt; description = "C++ library for developing web applications"; platforms = platforms.linux ; license = licenses.gpl2; diff --git a/pkgs/development/libraries/wvstreams/compile.patch b/pkgs/development/libraries/wvstreams/compile.patch deleted file mode 100644 index c71e7396e918..000000000000 --- a/pkgs/development/libraries/wvstreams/compile.patch +++ /dev/null @@ -1,43 +0,0 @@ -Debian's patch to build with fresher GCC - -Index: wvstreams-4.6.1/crypto/wvx509.cc -=================================================================== ---- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 -+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 -@@ -1157,7 +1157,7 @@ - - if (ext) - { -- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); - if (!method) - { - WvDynBuf buf; -Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc -=================================================================== ---- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 -+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 -@@ -1,8 +1,6 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS - #include - #include --#endif - - WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) - : socketfile(filename) -Index: wvstreams-4.6.1/streams/wvatomicfile.cc -=================================================================== ---- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 -+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 -@@ -10,10 +10,7 @@ - #include "wvatomicfile.h" - #include "wvfileutils.h" - #include "wvstrutils.h" -- --#ifdef MACOS - #include --#endif - - WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) - : tmp_file(WvString::null) diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix deleted file mode 100644 index ecfc9b88a0e4..000000000000 --- a/pkgs/development/libraries/wvstreams/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }: - -stdenv.mkDerivation { - name = "wvstreams-4.6.1"; - - src = fetchurl { - url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz; - sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4"; - }; - - patches = [ ./compile.patch ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - - sed -e '1i#include ' -i $(find . -name '*.c' -o -name '*.cc') - ''; - - buildInputs = [ qt4 dbus zlib openssl readline perl ]; - - meta = { - description = "Network programming library in C++"; - homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 15db4386e012..9ce8e95d9e94 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { meta = { platforms = platforms.linux; license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + homepage = https://www.wxwidgets.org/; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index af9dde75cf42..56080841ca3d 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -69,8 +69,8 @@ stdenv.mkDerivation { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + homepage = https://www.wxwidgets.org/; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index f7fcf8a2206c..35300ed9419a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -85,8 +85,8 @@ stdenv.mkDerivation { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + homepage = https://www.wxwidgets.org/; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index fc747268cab8..9c307b2d15ae 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -102,8 +102,8 @@ stdenv.mkDerivation rec { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + homepage = https://www.wxwidgets.org/; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 6e4dc00b0387..06ed123c7356 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "20160615-2245"; + version = "20170731-2245"; name = "x264-${version}"; src = fetchurl { url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "0w5l77gm8bsmafzimzyc5s27kcw79r6nai3bpccqy0spyxhjsdc2"; + sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; patchPhase = '' @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; # leaving 52 kB of headers + preConfigure = '' + # `AS' is set to the binutils assembler, but we need yasm + unset AS + ''; + configureFlags = [ "--enable-shared" ] ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index c485cb6a05aa..29d7ddf1fdc9 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 = "1.9"; + version = "2.5"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy"; + sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 764200c89f55..23fee81e0a52 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; buildInputs = [ libuuid zlib ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index bdc21d72ac33..e37991367e6f 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; - homepage = "https://github.com/dmlc/xgboost"; + homepage = https://github.com/dmlc/xgboost; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 44f57cae7e11..b274bba9c126 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = "http://sourceforge.net/projects/xlslib/"; + homepage = http://sourceforge.net/projects/xlslib/; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xml-security-c/cxx11.patch b/pkgs/development/libraries/xml-security-c/cxx11.patch new file mode 100644 index 000000000000..bc87d4c1411e --- /dev/null +++ b/pkgs/development/libraries/xml-security-c/cxx11.patch @@ -0,0 +1,11 @@ +--- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig 2016-02-02 23:57:26.204655144 +0000 ++++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp 2016-02-02 23:57:35.796692305 +0000 +@@ -645,7 +645,7 @@ + + } + +- return false; ++ return NULL; + + } + diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 37936caf2b9f..7ab6041e86dd 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -9,18 +9,19 @@ stdenv.mkDerivation rec { sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; }; - patchPhase = '' + patches = [ ./cxx11.patch ]; + + postPatch = '' mkdir -p xsec/yes/lib sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure ''; - configurePhase = '' - ./configure --prefix=$out \ - --with-openssl \ - --with-xerces \ - --with-xalan \ - --disable-static - ''; + configureFlags = [ + "--with-openssl" + "--with-xerces" + "--with-xalan" + "--disable-static" + ]; buildInputs = [ xalanc xercesc openssl pkgconfig ]; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 33c30a96251d..e41dfbc6a726 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.zeroc.com/ice.html"; + homepage = http://www.zeroc.com/ice.html; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 54265d2f095a..2252f8fe43cc 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "3"; - homepage = "http://www.zeromq.org"; + homepage = http://www.zeromq.org; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 4352e7f05c29..030246db3185 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }: +{ stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { name = "zeromq-${version}"; version = "4.2.2"; - src = fetchurl { - url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv"; + src = fetchFromGitHub { + owner = "zeromq"; + repo = "libzmq"; + rev = "v${version}"; + sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libuuid libsodium ]; + nativeBuildInputs = [ cmake asciidoc ]; + + enableParallelBuilding = true; + + postPatch = '' + sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in + ''; meta = with stdenv.lib; { branch = "4"; - homepage = "http://www.zeromq.org"; + homepage = http://www.zeromq.org; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index c22bb645be27..0ec24c828a6f 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ zookeeper bash ]; meta = with stdenv.lib; { - homepage = "http://zookeeper.apache.org"; + homepage = http://zookeeper.apache.org; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = [ maintainers.boothead ]; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 20070d8f717e..07a6f7ef0889 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: stdenv.mkDerivation rec { - name = "zziplib-0.13.58"; + name = "zziplib-${version}"; + version = "0.13.67"; src = fetchurl { - url = "mirror://sourceforge/zziplib/${name}.tar.bz2"; - sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m"; + url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; + sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j"; }; patchPhase = '' diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 83bbdf3b8f98..2af5530aa5c1 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -20,6 +20,7 @@ let echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script" echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script" echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script" + set | grep NIX_CC_WRAPPER_ | sed -e 's@^NIX_CC_WRAPPER@export &@' >> "$config_script" echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script" echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script" echo "source '$path_config_script'" >> "$config_script" diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 275a6d405c89..eaae4726751c 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -34,7 +34,7 @@ let lispPackages = rec { quicklisp = buildLispPackage rec { baseName = "quicklisp"; - version = "2016-01-21"; + version = "2017-03-06"; testSystems = []; @@ -43,7 +43,7 @@ let lispPackages = rec { src = pkgs.fetchgit { url = "https://github.com/quicklisp/quicklisp-client/"; rev = "refs/tags/version-${version}"; - sha256 = "007r1ydbhrkh6ywqgpvzp0xg0yypgrfai3n4mn16gj5w2zz013lx"; + sha256 = "11ywk7ggc1axivpbqvrd7m1lxsj4yp38d1h9w1d8i9qnn7zjpqj4"; }; overrides = x: rec { inherit clwrapper; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 7f60d2dde204..52f0161aecb9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz''; - sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82''; + url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz''; + sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis''; }; packageName = "alexandria"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82 - URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL - FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */ +/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis + URL http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz MD5 ce5427881c909981192f870cb52ff59f NAME alexandria TESTNAME NIL + FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 800307395350..20763679a82f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz''; - sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q''; + url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz''; + sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb''; }; packageName = "array-utils"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL - http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL - FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */ +/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL + http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils TESTNAME NIL + FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index adc5571a3373..e85bb4f8f92b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel-streams''; - version = ''babel-20170516-git''; + version = ''babel-20170630-git''; description = ''Some useful streams based on Babel's encoding code''; - deps = [ ]; + deps = [ args."trivial-gray-streams" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; - sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; + url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; + sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; }; packageName = "babel-streams"; @@ -30,6 +30,7 @@ rec { ''; }; } -/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL - http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME - babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */ +/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL + http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams TESTNAME NIL FILENAME + babel-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME alexandria FILENAME alexandria)) DEPENDENCIES + (trivial-gray-streams alexandria) VERSION babel-20170630-git SIBLINGS (babel-tests babel)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index c9b988388621..e567b056b240 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''Babel, a charset conversion library.''; - deps = [ ]; + deps = [ args."trivial-features" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; - sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; + url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; + sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; }; packageName = "babel"; @@ -30,6 +30,7 @@ rec { ''; }; } -/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL - http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS - NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */ +/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL + http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel TESTNAME NIL FILENAME babel DEPS + ((NAME trivial-features FILENAME trivial-features) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20170630-git + SIBLINGS (babel-streams babel-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 5b5d13bcec1d..c01189a491e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20161031-git''; + version = ''20170630-git''; description = ''Web Application Framework for Common Lisp''; deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz''; - sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi''; + url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz''; + sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2''; }; packageName = "caveman"; @@ -30,11 +30,11 @@ rec { ''; }; } -/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL - http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME +/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL + http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz MD5 774f85fa78792bde012bad78efff4b53 NAME caveman TESTNAME NIL FILENAME caveman DEPS ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode) (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora)) - DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS + DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20170630-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index dba9bfcbc762..e5dd39df1cd2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.18.0''; + version = ''cffi_0.19.0''; description = ''The CFFI Groveller''; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; - sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz''; + sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; }; packageName = "cffi-grovel"; @@ -30,7 +30,7 @@ rec { ''; }; } -/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL - http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel - DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS +/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL + http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel + DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.19.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 9f92871b7121..7c09b2ec6436 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.18.0''; + version = ''cffi_0.19.0''; description = ''The Common Foreign Function Interface''; deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; - sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz''; + sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; }; packageName = "cffi"; @@ -30,8 +30,8 @@ rec { ''; }; } -/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL - http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS +/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL + http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi TESTNAME NIL FILENAME cffi DEPS ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) - DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS + DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.19.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix index bfe44d109d5a..4f0c1a0421d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl+ssl''; - version = ''cl+ssl-20170403-git''; + version = ''cl+ssl-20170725-git''; description = ''Common Lisp interface to OpenSSL.''; - deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ]; + deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."trivial-features" args."flexi-streams" args."cffi" args."bordeaux-threads" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz''; - sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz''; + sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69''; }; packageName = "cl+ssl"; @@ -30,9 +30,11 @@ rec { ''; }; } -/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL - http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl +/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL + http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl TESTNAME NIL FILENAME cl+ssl DEPS ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage) - (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) - DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */ + (NAME trivial-features FILENAME trivial-features) (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) + (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (uiop trivial-gray-streams trivial-garbage trivial-features flexi-streams cffi bordeaux-threads alexandria) VERSION cl+ssl-20170725-git + SIBLINGS (cl+ssl.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 5057ddbd9d1c..ab800bc17805 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-aa''; - version = ''cl-vectors-20170516-git''; + version = ''cl-vectors-20170630-git''; description = ''cl-aa: polygon rasterizer''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; - sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; + sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; }; packageName = "cl-aa"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL - http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME - cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */ +/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL + http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa TESTNAME NIL FILENAME + cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix new file mode 100644 index 000000000000..f5bee7c03d23 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cli''; + version = ''20151218-git''; + + description = ''Command line parser''; + + deps = [ args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz''; + sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay''; + }; + + packageName = "cl-cli"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cli[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-cli DESCRIPTION Command line parser SHA256 0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay URL + http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz MD5 820e5c7dde6800fcfa44b1fbc7a9d62b NAME cl-cli TESTNAME NIL FILENAME cl-cli + DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20151218-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 489147c881be..54f3380f490b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20170124-git''; + version = ''20170725-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; - sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; + sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; }; packageName = "cl-dbi"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL - http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME cl-dbi TESTNAME NIL FILENAME cl-dbi - DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */ +/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL + http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi TESTNAME NIL FILENAME cl-dbi + DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 067e09ab0e16..06a834ff1455 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -5,7 +5,7 @@ rec { description = ''A templating system for Common Lisp''; - deps = [ ]; + deps = [ args."cl-ppcre" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz''; @@ -32,4 +32,4 @@ rec { } /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb - DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ + DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index 964c94c95d5b..27f4ef1b71af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20170516-git''; + version = ''cl-vectors-20170630-git''; description = ''cl-paths-ttf: vectorial paths manipulation''; - deps = [ ]; + deps = [ args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; - sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; + sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; }; packageName = "cl-paths-ttf"; @@ -30,6 +30,7 @@ rec { ''; }; } -/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL - http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL - FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */ +/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL + http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf TESTNAME NIL + FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf FILENAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS + (cl-aa-misc cl-aa cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index cf46246063f3..6d1b67e28c0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20170516-git''; + version = ''cl-unification-20170630-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -9,11 +9,11 @@ This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE.''; - deps = [ ]; + deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz''; - sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; + sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; }; packageName = "cl-ppcre-template"; @@ -39,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz - MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION - cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */ + SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz + MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES + (cl-ppcre) VERSION cl-unification-20170630-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 8b0d35253f49..95d8db3b0cf4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -5,7 +5,7 @@ rec { description = ''Portable Unicode Library''; - deps = [ ]; + deps = [ args."cl-unicode_slash_base" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; @@ -32,4 +32,4 @@ rec { } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME - cl-unicode DEPS NIL DEPENDENCIES NIL VERSION 0.1.5 SIBLINGS NIL) */ + cl-unicode DEPS ((NAME cl-unicode/base FILENAME cl-unicode_slash_base)) DEPENDENCIES (cl-unicode/base) VERSION 0.1.5 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix new file mode 100644 index 000000000000..50a4227fc40c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-unicode_slash_base''; + version = ''cl-unicode-0.1.5''; + + description = ''''; + + deps = [ args."cl-ppcre" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; + sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; + }; + + packageName = "cl-unicode/base"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode/base[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-unicode/base DESCRIPTION NIL SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL + http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode/base TESTNAME NIL + FILENAME cl-unicode_slash_base DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION cl-unicode-0.1.5 SIBLINGS (cl-unicode)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 7c5e16973efc..93d93b180103 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz''; - sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; + sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; }; packageName = "cl-unification"; @@ -35,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz - MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS + SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz + MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index fef996a845ba..081bad6047e6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-vectors''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''cl-paths: vectorial paths manipulation''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; - sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; + sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; }; packageName = "cl-vectors"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL - http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL - FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */ +/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL + http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors TESTNAME NIL + FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix new file mode 100644 index 000000000000..94b763417d6f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack-socket''; + version = ''clack-20170630-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; + sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; + }; + + packageName = "clack-socket"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-socket[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clack-socket DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL + http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket TESTNAME NIL FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20170630-git SIBLINGS + (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi + t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql + clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi + t-clack-middleware-auth-basic t-clack-middleware-csrf)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index e00c430581f2..98b706498dd9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20170516-git''; + version = ''clack-20170630-git''; description = ''''; - deps = [ ]; + deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; - sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; + url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; + sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; }; packageName = "clack-v1-compat"; @@ -30,9 +30,19 @@ rec { ''; }; } -/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL - http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME - clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS +/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL + http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat TESTNAME NIL FILENAME + clack-v1-compat DEPS + ((NAME uiop FILENAME uiop) (NAME trivial-types FILENAME trivial-types) (NAME trivial-mimes FILENAME trivial-mimes) + (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME split-sequence FILENAME split-sequence) (NAME quri FILENAME quri) + (NAME marshal FILENAME marshal) (NAME local-time FILENAME local-time) (NAME lack-util FILENAME lack-util) (NAME lack FILENAME lack) + (NAME ironclad FILENAME ironclad) (NAME http-body FILENAME http-body) (NAME flexi-streams FILENAME flexi-streams) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-base64 FILENAME cl-base64) + (NAME circular-streams FILENAME circular-streams) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES + (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot + cl-ppcre cl-base64 circular-streams alexandria) + VERSION clack-20170630-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 43c75bdd6e80..bfd86a7b0dea 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''Web application environment for Common Lisp''; - deps = [ ]; + deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; - sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; + url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; + sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; }; packageName = "clack"; @@ -30,9 +30,11 @@ rec { ''; }; } -/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL - http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS - NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS +/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL + http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack TESTNAME NIL FILENAME clack DEPS + ((NAME uiop FILENAME uiop) (NAME lack-util FILENAME lack-util) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) + (NAME lack FILENAME lack) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170630-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index d73de2e941ca..4c1d85ec3be6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20170516-git''; + version = ''20170725-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz''; - sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz''; + sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc''; }; packageName = "closer-mop"; @@ -32,5 +32,5 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5 - 169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ + SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz MD5 + 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 81e50db852b1..31ff76c0f091 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A DOM tree searching engine based on CSS selectors.''; - deps = [ ]; + deps = [ args."array-utils" args."plump" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz''; - sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f''; + url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz''; + sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0''; }; packageName = "clss"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL - http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL - DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL + http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 61bbadf22391940813bfc66dfd59d304 NAME clss TESTNAME NIL FILENAME clss DEPS + ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index b47a7cbd7d4a..b85ccdd48f55 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''An implementation of the X Window System protocol in Lisp.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz''; - sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs''; + url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz''; + sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7''; }; packageName = "clx"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL - http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL - DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL + http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 ccfec3f35979df3bead0b73adc1d798a NAME clx TESTNAME NIL FILENAME clx DEPS NIL + DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 93d0e3d599b8..7251da67498d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20170124-git''; + version = ''cl-dbi-20170725-git''; description = ''Database driver for MySQL.''; deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; - sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; + sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; }; packageName = "dbd-mysql"; @@ -30,7 +30,7 @@ rec { ''; }; } -/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL - http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME +/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL + http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql TESTNAME NIL FILENAME dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES - (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */ + (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 3c963b5141ed..2d71945081c4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20170124-git''; + version = ''cl-dbi-20170725-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; - sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; + sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; }; packageName = "dbd-postgres"; @@ -30,9 +30,9 @@ rec { ''; }; } -/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL - http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME +/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL + http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres TESTNAME NIL FILENAME dbd-postgres DEPS ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-postgres FILENAME cl-postgres)) - DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */ + DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index e19565fc2771..42f5d82966ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20170124-git''; + version = ''cl-dbi-20170725-git''; description = ''Database driver for SQLite3.''; deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; - sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; + sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; }; packageName = "dbd-sqlite3"; @@ -30,8 +30,8 @@ rec { ''; }; } -/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL - http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME +/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL + http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 TESTNAME NIL FILENAME dbd-sqlite3 DEPS ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES - (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */ + (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 54f1cf78e40a..1eaeddd3118a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20170516-git''; + version = ''20170725-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ ]; + deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz''; - sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6''; + url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz''; + sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl''; }; packageName = "dexador"; @@ -30,6 +30,15 @@ rec { ''; }; } -/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL - http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME - dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */ +/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL + http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador TESTNAME NIL FILENAME + dexador DEPS + ((NAME usocket FILENAME usocket) (NAME trivial-mimes FILENAME trivial-mimes) (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME quri FILENAME quri) (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME cl-reexport FILENAME cl-reexport) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel) + (NAME alexandria FILENAME alexandria)) + DEPENDENCIES + (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel + alexandria) + VERSION 20170725-git SIBLINGS (dexador-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index d9bacd96af89..06710c9a4d18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A few simple tools to help you with documenting your library.''; - deps = [ ]; + deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz''; - sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz''; + sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks''; }; packageName = "documentation-utils"; @@ -31,6 +31,7 @@ rec { }; } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL - http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME - documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ + 0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL + http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME + documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION + 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 16bbac4d03a1..33d83765ed60 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''2.0.2''; + version = ''v2.0.3''; description = ''Full-featured http/https client based on usocket''; deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz''; - sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z''; + url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz''; + sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd''; }; packageName = "drakma"; @@ -30,8 +30,8 @@ rec { ''; }; } -/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL - http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS +/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL + http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 3578c67b445cf982414ff78b2fb8d295 NAME drakma TESTNAME NIL FILENAME drakma DEPS ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz)) - DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */ + DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION v2.0.3 SIBLINGS (drakma-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 49c0ff6c8ce4..1aeded93799c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; - deps = [ ]; + deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz''; - sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8''; + url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz''; + sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh''; }; packageName = "esrap"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL - http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS - NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL + http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap TESTNAME NIL FILENAME esrap DEPS + ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 7b100d891b92..1d518e7b3271 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-http''; - version = ''20170227-git''; + version = ''20170630-git''; description = ''A fast HTTP protocol parser in Common Lisp''; - deps = [ ]; + deps = [ args."xsubseq" args."smart-buffer" args."proc-parse" args."cl-utilities" args."babel" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz''; - sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx''; + url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz''; + sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29''; }; packageName = "fast-http"; @@ -30,6 +30,9 @@ rec { ''; }; } -/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx URL - http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz MD5 5c5e2073702e7504a30c739e25c47c69 NAME fast-http TESTNAME NIL FILENAME - fast-http DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (fast-http-test)) */ +/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL + http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http TESTNAME NIL FILENAME + fast-http DEPS + ((NAME xsubseq FILENAME xsubseq) (NAME smart-buffer FILENAME smart-buffer) (NAME proc-parse FILENAME proc-parse) (NAME cl-utilities FILENAME cl-utilities) + (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (xsubseq smart-buffer proc-parse cl-utilities babel alexandria) VERSION 20170630-git SIBLINGS (fast-http-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 0e8194931091..566b3d7bdc3e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ ]; + deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz''; - sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1''; + url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz''; + sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg''; }; packageName = "fast-io"; @@ -30,6 +30,8 @@ rec { ''; }; } -/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL - http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME - fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */ +/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL + http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io TESTNAME NIL FILENAME + fast-io DEPS + ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME static-vectors FILENAME static-vectors) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION 20170630-git SIBLINGS (fast-io-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix new file mode 100644 index 000000000000..7f04b5eb8936 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fiveam''; + version = ''v1.3''; + + description = ''A simple regression testing framework''; + + deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz''; + sha256 = ''0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2''; + }; + + packageName = "fiveam"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fiveam[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL + http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5 bd03a588915f834031eeae9139c51aa4 NAME fiveam TESTNAME NIL FILENAME fiveam DEPS + ((NAME alexandria FILENAME alexandria) (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv) + (NAME trivial-backtrace FILENAME trivial-backtrace)) + DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) VERSION v1.3 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 754d2f8c8691..f2d5c3a64baa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A collection of utilities to destructure lambda forms.''; - deps = [ ]; + deps = [ args."documentation-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz''; - sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz''; + sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf''; }; packageName = "form-fiddle"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL - http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL - FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL + http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle TESTNAME NIL + FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix new file mode 100644 index 000000000000..c3900b7cd26a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fset''; + version = ''20150113-git''; + + description = ''A functional set-theoretic collections library. +See: http://www.ergy.com/FSet.html +''; + + deps = [ args."misc-extensions" args."mt19937" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz''; + sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0''; + }; + + packageName = "fset"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fset[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. +See: http://www.ergy.com/FSet.html + + SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5 + 89f958cc900e712aed0750b336efbe15 NAME fset TESTNAME NIL FILENAME fset DEPS + ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix deleted file mode 100644 index f36b4e931ec7..000000000000 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix +++ /dev/null @@ -1,36 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''hu.dwim.asdf''; - version = ''20170516-darcs''; - - description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz''; - sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw''; - }; - - packageName = "hu.dwim.asdf"; - - overrides = x: { - postInstall = '' - find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' | - while read f; do - env -i \ - NIX_LISP="$NIX_LISP" \ - NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn - (asdf:load-system :$(basename "$f" .asd)) - (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) - (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) - )'" \ - "$out"/bin/*-lisp-launcher.sh || - mv "$f"{,.sibling}; done || true - ''; - }; -} -/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256 - 0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5 - 041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS - (hu.dwim.asdf.documentation)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix deleted file mode 100644 index 2aedd0f6704c..000000000000 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix +++ /dev/null @@ -1,37 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''hu.dwim.def''; - version = ''20170516-darcs''; - - description = ''General purpose, homogenous, extensible definer macro.''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz''; - sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by''; - }; - - packageName = "hu.dwim.def"; - - overrides = x: { - postInstall = '' - find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' | - while read f; do - env -i \ - NIX_LISP="$NIX_LISP" \ - NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn - (asdf:load-system :$(basename "$f" .asd)) - (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) - (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) - )'" \ - "$out"/bin/*-lisp-launcher.sh || - mv "$f"{,.sibling}; done || true - ''; - }; -} -/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL - http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL - FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS - (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation - hu.dwim.def.namespace hu.dwim.def.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index b358ff0562d9..b0c127e97e62 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20170516-darcs''; + version = ''20170630-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; - deps = [ ]; + deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz''; - sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz''; + sha256 = ''151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb''; }; packageName = "hu.dwim.asdf"; @@ -31,6 +31,6 @@ rec { }; } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256 - 0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5 - 041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS - (hu.dwim.asdf.documentation)) */ + 151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz MD5 + b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION + 20170630-darcs SIBLINGS (hu.dwim.asdf.documentation)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix index 5e5e56be2e58..2dc7c45b39c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_def''; - version = ''20170516-darcs''; + version = ''20170630-darcs''; description = ''General purpose, homogenous, extensible definer macro.''; - deps = [ ]; + deps = [ args."metabang-bind" args."iterate" args."anaphora" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz''; - sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz''; + sha256 = ''0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf''; }; packageName = "hu.dwim.def"; @@ -30,8 +30,10 @@ rec { ''; }; } -/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL - http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL - FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS +/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf URL + http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz MD5 def7e4172cbf5ec86a5d51f644d71f81 NAME hu.dwim.def TESTNAME NIL + FILENAME hu_dot_dwim_dot_def DEPS + ((NAME metabang-bind FILENAME metabang-bind) (NAME iterate FILENAME iterate) (NAME anaphora FILENAME anaphora) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (metabang-bind iterate anaphora alexandria) VERSION 20170630-darcs SIBLINGS (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation hu.dwim.def.namespace hu.dwim.def.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index e0a2d194f9ec..320dcfb7a037 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''hunchentoot''; - version = ''1.2.35''; + version = ''v1.2.37''; description = ''Hunchentoot is a HTTP server based on USOCKET and BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a @@ -11,8 +11,8 @@ rec { deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz''; - sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74''; + url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz''; + sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc''; }; packageName = "hunchentoot"; @@ -37,9 +37,9 @@ rec { BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended through subclassing. - SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5 - d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS + SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz MD5 + 3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket)) - DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */ + DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION v1.2.37 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index 404c7a5dee9f..ba7ed0ab7d72 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''iolib''; - version = ''v0.8.2''; + version = ''v0.8.3''; description = ''I/O library.''; - deps = [ ]; + deps = [ args."iolib_slash_streams" args."iolib_slash_sockets" args."iolib_slash_multiplex" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz''; - sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr''; + url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; packageName = "iolib"; @@ -30,6 +30,8 @@ rec { ''; }; } -/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL - http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL - DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ +/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL + http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib TESTNAME NIL FILENAME iolib DEPS + ((NAME iolib/streams FILENAME iolib_slash_streams) (NAME iolib/sockets FILENAME iolib_slash_sockets) (NAME iolib/multiplex FILENAME iolib_slash_multiplex)) + DEPENDENCIES (iolib/streams iolib/sockets iolib/multiplex) VERSION v0.8.3 SIBLINGS + (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix new file mode 100644 index 000000000000..a0d26182a8e8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib_slash_multiplex''; + version = ''iolib-v0.8.3''; + + description = ''I/O multiplexing library.''; + + deps = [ args."iolib_slash_syscalls" args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + }; + + packageName = "iolib/multiplex"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/multiplex[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iolib/multiplex DESCRIPTION I/O multiplexing library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL + http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/multiplex TESTNAME NIL FILENAME + iolib_slash_multiplex DEPS ((NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/syscalls cffi) VERSION + iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix new file mode 100644 index 000000000000..a6088dabf972 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib_slash_sockets''; + version = ''iolib-v0.8.3''; + + description = ''Socket library.''; + + deps = [ args."swap-bytes" args."iolib_slash_syscalls" args."iolib_slash_streams" args."idna" args."cffi" args."bordeaux-threads" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + }; + + packageName = "iolib/sockets"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/sockets[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iolib/sockets DESCRIPTION Socket library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL + http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/sockets TESTNAME NIL FILENAME + iolib_slash_sockets DEPS + ((NAME swap-bytes FILENAME swap-bytes) (NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME iolib/streams FILENAME iolib_slash_streams) + (NAME idna FILENAME idna) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel)) + DEPENDENCIES (swap-bytes iolib/syscalls iolib/streams idna cffi bordeaux-threads babel) VERSION iolib-v0.8.3 SIBLINGS + (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix new file mode 100644 index 000000000000..9caebf0db263 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib_slash_streams''; + version = ''iolib-v0.8.3''; + + description = ''Gray streams.''; + + deps = [ args."iolib_slash_multiplex" args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + }; + + packageName = "iolib/streams"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/streams[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iolib/streams DESCRIPTION Gray streams. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL + http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/streams TESTNAME NIL FILENAME + iolib_slash_streams DEPS ((NAME iolib/multiplex FILENAME iolib_slash_multiplex) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/multiplex cffi) VERSION + iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix new file mode 100644 index 000000000000..0ef71a6a95cf --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib_slash_syscalls''; + version = ''iolib-v0.8.3''; + + description = ''Syscalls and foreign types.''; + + deps = [ args."trivial-features" args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + }; + + packageName = "iolib/syscalls"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/syscalls[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iolib/syscalls DESCRIPTION Syscalls and foreign types. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL + http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/syscalls TESTNAME NIL FILENAME + iolib_slash_syscalls DEPS ((NAME trivial-features FILENAME trivial-features) (NAME cffi FILENAME cffi)) DEPENDENCIES (trivial-features cffi) VERSION + iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 944781947fa9..6d8e3c4fb0a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -5,10 +5,10 @@ rec { description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ ]; + deps = [ args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz''; + url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz''; sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; }; @@ -31,5 +31,5 @@ rec { }; } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL - http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad - DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */ + http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad + DEPS ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 SIBLINGS (ironclad-text)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix index 3d2da3fa6bc1..93e6782f1639 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''ixf''; - version = ''cl-20170516-git''; + version = ''cl-20170630-git''; description = ''Tools to handle IBM PC version of IXF file format''; - deps = [ ]; + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz''; - sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf''; + url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz''; + sha256 = ''1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2''; }; packageName = "ixf"; @@ -30,6 +30,8 @@ rec { ''; }; } -/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL - http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS - NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */ +/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL + http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz MD5 51db2caba094cac90982396cf552c847 NAME ixf TESTNAME NIL FILENAME ixf DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats) + (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence)) + DEPENDENCIES (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence) VERSION cl-20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 841c210a5aed..b86efb3d8ec7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; - deps = [ ]; + deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz''; - sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q''; + url = ''http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz''; + sha256 = ''0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm''; }; packageName = "jonathan"; @@ -31,5 +31,9 @@ rec { }; } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256 - 00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5 - b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */ + 0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz MD5 + 5d82723835164f4e3d9c4d031322eb98 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS + ((NAME trivial-types FILENAME trivial-types) (NAME proc-parse FILENAME proc-parse) (NAME fast-io FILENAME fast-io) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-annot FILENAME cl-annot) + (NAME babel FILENAME babel)) + DEPENDENCIES (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170630-git SIBLINGS (jonathan-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix new file mode 100644 index 000000000000..5023dc63d427 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack-middleware-backtrace''; + version = ''lack-20170725-git''; + + description = ''''; + + deps = [ args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; + sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + }; + + packageName = "lack-middleware-backtrace"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL + http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace TESTNAME NIL + FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION lack-20170725-git SIBLINGS + (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session + lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack + t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount + t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix new file mode 100644 index 000000000000..ea5ddc3f96b3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack-util''; + version = ''lack-20170725-git''; + + description = ''''; + + deps = [ args."ironclad" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; + sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + }; + + packageName = "lack-util"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lack-util DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL + http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util TESTNAME NIL FILENAME lack-util + DEPS ((NAME ironclad FILENAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20170725-git SIBLINGS + (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount + lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test + lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf + t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util + t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 2e8c2fe291fb..0b1c36d73561 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20161204-git''; + version = ''20170725-git''; description = ''A minimal Clack''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; - sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; + url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; + sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; }; packageName = "lack"; @@ -30,9 +30,9 @@ rec { ''; }; } -/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL - http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack TESTNAME NIL FILENAME lack DEPS NIL - DEPENDENCIES NIL VERSION 20161204-git SIBLINGS +/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL + http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack TESTNAME NIL FILENAME lack DEPS NIL + DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix new file mode 100644 index 000000000000..49ec6901fd98 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lisp-namespace''; + version = ''20170630-git''; + + description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz''; + sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n''; + }; + + packageName = "lisp-namespace"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lisp-namespace[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL + http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace + TESTNAME NIL FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS + (lisp-namespace.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 0740ec0779fd..1291499be3d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20170516-git''; + version = ''20170725-git''; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ ]; + deps = [ args."cl-fad" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz''; - sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p''; + url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz''; + sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9''; }; packageName = "local-time"; @@ -31,6 +31,6 @@ rec { }; } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256 - 0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5 - b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS - (cl-postgres+local-time local-time.test)) */ + 05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz MD5 + 77a79ed1036bc3547f5174f2256c8e93 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad FILENAME cl-fad)) DEPENDENCIES (cl-fad) VERSION + 20170725-git SIBLINGS (cl-postgres+local-time local-time.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 51c8af197fc3..e5224fff18c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; - deps = [ ]; + deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz''; - sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7''; + url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz''; + sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm''; }; packageName = "lquery"; @@ -30,6 +30,7 @@ rec { ''; }; } -/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL - http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery - DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */ +/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL + http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz MD5 aeb03cb5174d682092683da488531a9c NAME lquery TESTNAME NIL FILENAME lquery + DEPS ((NAME plump FILENAME plump) (NAME form-fiddle FILENAME form-fiddle) (NAME clss FILENAME clss) (NAME array-utils FILENAME array-utils)) DEPENDENCIES + (plump form-fiddle clss array-utils) VERSION 20170630-git SIBLINGS (lquery-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 1384799d242b..c5d86ebb7034 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''md5''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''The MD5 Message-Digest Algorithm RFC 1321''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz''; - sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv''; + url = ''http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz''; + sha256 = ''0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx''; }; packageName = "md5"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL - http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL - DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL + http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5 c6a5b3ca5a23fad3dfde23963db84910 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL + DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix new file mode 100644 index 000000000000..044ce4d93585 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''misc-extensions''; + version = ''20150608-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz''; + sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj''; + }; + + packageName = "misc-extensions"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/misc-extensions[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256 0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL + http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions + TESTNAME NIL FILENAME misc-extensions DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix index 3586d5cc21b7..8d5450803ceb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''mssql''; - version = ''cl-20131003-git''; + version = ''cl-20170630-git''; description = ''''; deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz''; - sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk''; + url = ''http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz''; + sha256 = ''0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy''; }; packageName = "mssql"; @@ -30,7 +30,7 @@ rec { ''; }; } -/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL - http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql +/* (SYSTEM mssql DESCRIPTION NIL SHA256 0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL + http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz MD5 88e65c72923896df603ecf20039ae305 NAME mssql TESTNAME NIL FILENAME mssql DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)) - DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */ + DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix new file mode 100644 index 000000000000..9b581d4f1ccf --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''mt19937''; + version = ''1.1.1''; + + description = ''Portable MT19937 Mersenne Twister random number generator''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz''; + sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv''; + }; + + packageName = "mt19937"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mt19937[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM mt19937 DESCRIPTION Portable MT19937 Mersenne Twister random number generator SHA256 1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv URL + http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz MD5 54c63977b6d77abd66ebe0227b77c143 NAME mt19937 TESTNAME NIL FILENAME mt19937 DEPS + NIL DEPENDENCIES NIL VERSION 1.1.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix new file mode 100644 index 000000000000..b289feae8832 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''net_dot_didierverna_dot_asdf-flv''; + version = ''asdf-flv-version-2.1''; + + description = ''ASDF extension to provide support for file-local variables.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz''; + sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc''; + }; + + packageName = "net.didierverna.asdf-flv"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/net.didierverna.asdf-flv[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM net.didierverna.asdf-flv DESCRIPTION ASDF extension to provide support for file-local variables. SHA256 + 12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc URL http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz MD5 + 2b74b721b7e5335d2230d6b95fc6be56 NAME net.didierverna.asdf-flv TESTNAME NIL FILENAME net_dot_didierverna_dot_asdf-flv DEPS NIL DEPENDENCIES NIL VERSION + asdf-flv-version-2.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index d5ef8606f495..ca1ad414d750 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''pgloader''; - version = ''3.3.2''; + version = ''v3.4.1''; description = ''Load data into PostgreSQL''; deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz''; - sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv''; + url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz''; + sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v''; }; packageName = "pgloader"; @@ -30,8 +30,8 @@ rec { ''; }; } -/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL - http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader +/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL + http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader TESTNAME NIL FILENAME pgloader DEPS ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv) (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres) @@ -44,4 +44,4 @@ rec { DEPENDENCIES (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid) - VERSION 3.3.2 SIBLINGS NIL) */ + VERSION v3.4.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index d89e25f88190..e25b89b2cf4f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20170516-git''; + version = ''20170725-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz''; - sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8''; + url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; + sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; }; packageName = "plump"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8 - URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump - DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */ +/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 + URL http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz MD5 e5e92dd177711a14753ee86961710458 NAME plump TESTNAME NIL FILENAME plump + DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 868aae61f6bd..96d09bc7dc3f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''py-configparser''; - version = ''20131003-svn''; + version = ''20170725-svn''; description = ''Common Lisp implementation of the Python ConfigParser module''; deps = [ args."parse-number" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz''; - sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx''; + url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz''; + sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr''; }; packageName = "py-configparser"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx - URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser - TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */ +/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr + URL http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser + TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index b9871752e58d..b57bb0d16234 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''qmynd''; - version = ''20160208-git''; + version = ''20170630-git''; description = ''MySQL Native Driver''; - deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ]; + deps = [ args."usocket" args."trivial-gray-streams" args."list-of" args."ironclad" args."flexi-streams" args."babel" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz''; - sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq''; + url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz''; + sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi''; }; packageName = "qmynd"; @@ -30,9 +30,8 @@ rec { ''; }; } -/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL - http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS - ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of) - (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz) - (NAME babel FILENAME babel)) - DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */ +/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL + http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd TESTNAME NIL FILENAME qmynd DEPS + ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME list-of FILENAME list-of) + (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME babel FILENAME babel)) + DEPENDENCIES (usocket trivial-gray-streams list-of ironclad flexi-streams babel) VERSION 20170630-git SIBLINGS (qmynd-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 6aa42000e73e..952b8686dab5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20170516-git''; + version = ''20170725-git''; description = ''A tiling, keyboard driven window manager''; - deps = [ ]; + deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz''; - sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz''; + sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5''; }; packageName = "stumpwm"; @@ -30,6 +30,7 @@ rec { ''; }; } -/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL - http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME - stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL + http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm TESTNAME NIL FILENAME + stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) + VERSION 20170725-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 05631ab2b930..ea9b21d6eac0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz''; - sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz''; + sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7''; }; packageName = "trivial-indent"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma - URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent - TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7 + URL http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent + TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f4a84b5ceef0..f31e1bb0a3da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20170516-git''; + version = ''20170630-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz''; - sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz''; + sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx''; }; packageName = "trivial-mimes"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL - http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME - NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ +/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL + http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes TESTNAME + NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 78085ff17629..67897d46958b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uffi''; - version = ''20150923-git''; + version = ''20170630-git''; description = ''Universal Foreign Function Library for Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz''; - sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy''; + url = ''http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz''; + sha256 = ''1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf''; }; packageName = "uffi"; @@ -30,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy URL - http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz MD5 84babed7d1633cf01610e81f027024da NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL - DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (uffi-tests)) */ +/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL + http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5 8ac448122b79a41ec2b0647f06af7c12 NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL + DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 579ad469cda9..5f3bd02f90ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -8,7 +8,7 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz''; + url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz''; sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; }; @@ -31,5 +31,5 @@ rec { }; } /* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL - http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL + http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 086a374d6e7b..c04540aaaba9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20170227-git''; + version = ''20170725-git''; description = ''An asynchronous HTTP server written in Common Lisp''; - deps = [ ]; + deps = [ args."vom" args."uiop" args."trivial-utf-8" args."swap-bytes" args."static-vectors" args."smart-buffer" args."quri" args."lev" args."fast-io" args."fast-http" args."clack-socket" args."cffi-grovel" args."cffi" args."bordeaux-threads" args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz''; - sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1''; + url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz''; + sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg''; }; packageName = "woo"; @@ -30,6 +30,12 @@ rec { ''; }; } -/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1 URL - http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz MD5 cc37270ad408e093bd28c025466d8f64 NAME woo TESTNAME NIL FILENAME woo DEPS NIL - DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (clack-handler-woo woo-test)) */ +/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL + http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 bd901d8dfa7df3d19c6da73ea101f65b NAME woo TESTNAME NIL FILENAME woo DEPS + ((NAME vom FILENAME vom) (NAME uiop FILENAME uiop) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME swap-bytes FILENAME swap-bytes) + (NAME static-vectors FILENAME static-vectors) (NAME smart-buffer FILENAME smart-buffer) (NAME quri FILENAME quri) (NAME lev FILENAME lev) + (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME clack-socket FILENAME clack-socket) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES + (vom uiop trivial-utf-8 swap-bytes static-vectors smart-buffer quri lev fast-io fast-http clack-socket cffi-grovel cffi bordeaux-threads alexandria) + VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 46262fb78f43..3b78ba6f79e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -5,7 +5,7 @@ rec { description = ''An evented webserver for Common Lisp.''; - deps = [ ]; + deps = [ args."alexandria" args."babel" args."blackbird" args."chunga" args."cl-async" args."cl-async-ssl" args."cl-fad" args."cl-ppcre" args."do-urlencode" args."fast-http" args."fast-io" args."quri" args."vom" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz''; @@ -32,4 +32,10 @@ rec { } /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie - DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga) + (NAME cl-async FILENAME cl-async) (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME do-urlencode FILENAME do-urlencode) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME quri FILENAME quri) + (NAME vom FILENAME vom)) + DEPENDENCIES (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre do-urlencode fast-http fast-io quri vom) VERSION 20170227-git + SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index a760e0cb6842..877389811d09 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -15,6 +15,13 @@ in preConfigure = '' export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; + postInstall = '' + "$out/bin/stumpwm-lisp-launcher.sh" --eval '(asdf:make :stumpwm)' \ + --eval '(setf (asdf/system:component-entry-point (asdf:find-system :stumpwm)) (function stumpwm:stumpwm))' \ + --eval '(asdf:perform (quote asdf:program-op) :stumpwm)' + + cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" + ''; }; propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [ alexandria cl-ppcre clx @@ -54,6 +61,25 @@ in sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m"; }; }; + iolib_slash_syscalls = x: rec { + propagatedBuildInputs = (x.propagatedBuildInputs or []) + ++ (with pkgs; [libfixposix gcc]) + ++ (with qlnp; [ + alexandria split-sequence cffi bordeaux-threads idna swap-bytes + ]) + ; + testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams" + "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets" + "iolib/pathnames" "iolib/os"]; + + version = "0.8.3"; + src = pkgs.fetchFromGitHub { + owner = "sionescu"; + repo = "iolib"; + rev = "v${version}"; + sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m"; + }; + }; cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]); clack = addDeps (with qlnp;[lack bordeaux-threads prove]); clack-v1-compat = addDeps (with qlnp;[ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 74946f07f076..07b069f8b7bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -1,20 +1,24 @@ 3bmd alexandria array-utils +asdf-system-connections babel blackbird bordeaux-threads caveman cffi +cffi-grovel chipz circular-streams clack clack-v1-compat +cl-ansi-text cl-async cl-async-base cl-async-repl cl-async-ssl cl-base64 +cl-cli cl-colors cl-cookie cl-dbi @@ -58,8 +62,10 @@ esrap external-program fast-http fast-io +fiveam flexi-streams form-fiddle +fset http-body hu.dwim.asdf hu.dwim.def @@ -70,10 +76,14 @@ iolib ironclad iterate lack +let-plus lev +lisp-namespace local-time lquery marshal +misc-extensions +mt19937 nibbles optima parenscript @@ -82,6 +92,7 @@ pgloader plump proc-parse prove +prove query-fs quri salza2 @@ -95,6 +106,7 @@ trivial-indent trivial-mimes trivial-types trivial-utf-8 +uffi usocket woo wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index c87b827112c2..a257b7095cb8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,14 +6,6 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "asdf-system-connections" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."asdf-system-connections" or (x: {})) - (import ./quicklisp-to-nix-output/asdf-system-connections.nix { - inherit fetchurl; - })); - - "closure-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closure-common" or (x: {})) @@ -84,6 +76,16 @@ let quicklisp-to-nix-packages = rec { })); + "iolib_slash_syscalls" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_slash_syscalls" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + "cxml-xml" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cxml-xml" or (x: {})) @@ -100,6 +102,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."babel-streams" or (x: {})) (import ./quicklisp-to-nix-output/babel-streams.nix { inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -111,13 +115,11 @@ let quicklisp-to-nix-packages = rec { })); - "cl-ansi-text" = buildLispPackage + "clack-socket" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-ansi-text" or (x: {})) - (import ./quicklisp-to-nix-output/cl-ansi-text.nix { + (qlOverrides."clack-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clack-socket.nix { inherit fetchurl; - "cl-colors" = quicklisp-to-nix-packages."cl-colors"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -146,12 +148,9 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "usocket" = quicklisp-to-nix-packages."usocket"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "salza2" = quicklisp-to-nix-packages."salza2"; "list-of" = quicklisp-to-nix-packages."list-of"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; - "chipz" = quicklisp-to-nix-packages."chipz"; "babel" = quicklisp-to-nix-packages."babel"; })); @@ -202,6 +201,13 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ixf" or (x: {})) (import ./quicklisp-to-nix-output/ixf.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "ieee-floats" = quicklisp-to-nix-packages."ieee-floats"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "md5" = quicklisp-to-nix-packages."md5"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; })); @@ -264,6 +270,41 @@ let quicklisp-to-nix-packages = rec { })); + "iolib_slash_multiplex" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_slash_multiplex" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix { + inherit fetchurl; + "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "iolib_slash_sockets" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_slash_sockets" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix { + inherit fetchurl; + "swap-bytes" = quicklisp-to-nix-packages."swap-bytes"; + "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls"; + "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams"; + "idna" = quicklisp-to-nix-packages."idna"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "iolib_slash_streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_slash_streams" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_slash_streams.nix { + inherit fetchurl; + "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -284,6 +325,30 @@ let quicklisp-to-nix-packages = rec { ((f: x: (x // (f x))) (qlOverrides."jonathan" or (x: {})) (import ./quicklisp-to-nix-output/jonathan.nix { + inherit fetchurl; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "net_dot_didierverna_dot_asdf-flv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {})) + (import ./quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix { + inherit fetchurl; + })); + + + "puri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."puri" or (x: {})) + (import ./quicklisp-to-nix-output/puri.nix { inherit fetchurl; })); @@ -297,14 +362,6 @@ let quicklisp-to-nix-packages = rec { })); - "puri" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."puri" or (x: {})) - (import ./quicklisp-to-nix-output/puri.nix { - inherit fetchurl; - })); - - "sqlite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."sqlite" or (x: {})) @@ -374,6 +431,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-paths-ttf" or (x: {})) (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { inherit fetchurl; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; })); @@ -385,6 +443,15 @@ let quicklisp-to-nix-packages = rec { })); + "cl-unicode_slash_base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unicode_slash_base" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unicode_slash_base.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + })); + + "cl-markup" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-markup" or (x: {})) @@ -418,14 +485,6 @@ let quicklisp-to-nix-packages = rec { })); - "uffi" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."uffi" or (x: {})) - (import ./quicklisp-to-nix-output/uffi.nix { - inherit fetchurl; - })); - - "metabang-bind" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."metabang-bind" or (x: {})) @@ -452,25 +511,6 @@ let quicklisp-to-nix-packages = rec { })); - "cffi-grovel" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cffi-grovel" or (x: {})) - (import ./quicklisp-to-nix-output/cffi-grovel.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - })); - - - "let-plus" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."let-plus" or (x: {})) - (import ./quicklisp-to-nix-output/let-plus.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - })); - - "cl-async-util" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-async-util" or (x: {})) @@ -485,6 +525,24 @@ let quicklisp-to-nix-packages = rec { })); + "lack-middleware-backtrace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-middleware-backtrace" or (x: {})) + (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lack-util" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-util" or (x: {})) + (import ./quicklisp-to-nix-output/lack-util.nix { + inherit fetchurl; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + })); + + "trivial-gray-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-gray-streams" or (x: {})) @@ -493,14 +551,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-features" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-features" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-features.nix { - inherit fetchurl; - })); - - "uiop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uiop" or (x: {})) @@ -571,6 +621,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-features" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-features.nix { + inherit fetchurl; + })); + + "yason" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."yason" or (x: {})) @@ -602,6 +660,19 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."wookie" or (x: {})) (import ./quicklisp-to-nix-output/wookie.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "blackbird" = quicklisp-to-nix-packages."blackbird"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "cl-async" = quicklisp-to-nix-packages."cl-async"; + "cl-async-ssl" = quicklisp-to-nix-packages."cl-async-ssl"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "quri" = quicklisp-to-nix-packages."quri"; + "vom" = quicklisp-to-nix-packages."vom"; })); @@ -610,6 +681,21 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."woo" or (x: {})) (import ./quicklisp-to-nix-output/woo.nix { inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; + "swap-bytes" = quicklisp-to-nix-packages."swap-bytes"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "quri" = quicklisp-to-nix-packages."quri"; + "lev" = quicklisp-to-nix-packages."lev"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -622,6 +708,14 @@ let quicklisp-to-nix-packages = rec { })); + "uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uffi" or (x: {})) + (import ./quicklisp-to-nix-output/uffi.nix { + inherit fetchurl; + })); + + "trivial-utf-8" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-utf-8" or (x: {})) @@ -676,6 +770,9 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."stumpwm" or (x: {})) (import ./quicklisp-to-nix-output/stumpwm.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "clx" = quicklisp-to-nix-packages."clx"; })); @@ -851,6 +948,22 @@ let quicklisp-to-nix-packages = rec { })); + "mt19937" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mt19937" or (x: {})) + (import ./quicklisp-to-nix-output/mt19937.nix { + inherit fetchurl; + })); + + + "misc-extensions" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."misc-extensions" or (x: {})) + (import ./quicklisp-to-nix-output/misc-extensions.nix { + inherit fetchurl; + })); + + "marshal" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."marshal" or (x: {})) @@ -864,6 +977,10 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lquery" or (x: {})) (import ./quicklisp-to-nix-output/lquery.nix { inherit fetchurl; + "plump" = quicklisp-to-nix-packages."plump"; + "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; + "clss" = quicklisp-to-nix-packages."clss"; + "array-utils" = quicklisp-to-nix-packages."array-utils"; })); @@ -872,6 +989,16 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."local-time" or (x: {})) (import ./quicklisp-to-nix-output/local-time.nix { inherit fetchurl; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + })); + + + "lisp-namespace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-namespace" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-namespace.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -884,6 +1011,16 @@ let quicklisp-to-nix-packages = rec { })); + "let-plus" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."let-plus" or (x: {})) + (import ./quicklisp-to-nix-output/let-plus.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + "lack" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack" or (x: {})) @@ -905,6 +1042,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ironclad" or (x: {})) (import ./quicklisp-to-nix-output/ironclad.nix { inherit fetchurl; + "nibbles" = quicklisp-to-nix-packages."nibbles"; })); @@ -913,6 +1051,9 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."iolib" or (x: {})) (import ./quicklisp-to-nix-output/iolib.nix { inherit fetchurl; + "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams"; + "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib_slash_sockets"; + "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex"; })); @@ -957,6 +1098,10 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."hu_dot_dwim_dot_def" or (x: {})) (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix { inherit fetchurl; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -965,6 +1110,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {})) (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix { inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -984,11 +1130,22 @@ let quicklisp-to-nix-packages = rec { })); + "fset" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fset" or (x: {})) + (import ./quicklisp-to-nix-output/fset.nix { + inherit fetchurl; + "misc-extensions" = quicklisp-to-nix-packages."misc-extensions"; + "mt19937" = quicklisp-to-nix-packages."mt19937"; + })); + + "form-fiddle" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."form-fiddle" or (x: {})) (import ./quicklisp-to-nix-output/form-fiddle.nix { inherit fetchurl; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; })); @@ -1001,11 +1158,25 @@ let quicklisp-to-nix-packages = rec { })); + "fiveam" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fiveam" or (x: {})) + (import ./quicklisp-to-nix-output/fiveam.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "net_dot_didierverna_dot_asdf-flv" = quicklisp-to-nix-packages."net_dot_didierverna_dot_asdf-flv"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + })); + + "fast-io" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fast-io" or (x: {})) (import ./quicklisp-to-nix-output/fast-io.nix { inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1014,6 +1185,12 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."fast-http" or (x: {})) (import ./quicklisp-to-nix-output/fast-http.nix { inherit fetchurl; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1031,6 +1208,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."esrap" or (x: {})) (import ./quicklisp-to-nix-output/esrap.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1055,6 +1233,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."documentation-utils" or (x: {})) (import ./quicklisp-to-nix-output/documentation-utils.nix { inherit fetchurl; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1063,6 +1242,22 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."dexador" or (x: {})) (import ./quicklisp-to-nix-output/dexador.nix { inherit fetchurl; + "usocket" = quicklisp-to-nix-packages."usocket"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "quri" = quicklisp-to-nix-packages."quri"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1189,6 +1384,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-unicode" or (x: {})) (import ./quicklisp-to-nix-output/cl-unicode.nix { inherit fetchurl; + "cl-unicode_slash_base" = quicklisp-to-nix-packages."cl-unicode_slash_base"; })); @@ -1235,9 +1431,11 @@ let quicklisp-to-nix-packages = rec { "uiop" = quicklisp-to-nix-packages."uiop"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "cffi" = quicklisp-to-nix-packages."cffi"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1246,6 +1444,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clss" or (x: {})) (import ./quicklisp-to-nix-output/clss.nix { inherit fetchurl; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "plump" = quicklisp-to-nix-packages."plump"; })); @@ -1294,6 +1494,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-ppcre-template" or (x: {})) (import ./quicklisp-to-nix-output/cl-ppcre-template.nix { inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; })); @@ -1391,6 +1592,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-emb" or (x: {})) (import ./quicklisp-to-nix-output/cl-emb.nix { inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; })); @@ -1425,6 +1627,15 @@ let quicklisp-to-nix-packages = rec { })); + "cl-cli" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cli" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cli.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + "cl-base64" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-base64" or (x: {})) @@ -1481,11 +1692,39 @@ let quicklisp-to-nix-packages = rec { })); + "cl-ansi-text" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ansi-text" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ansi-text.nix { + inherit fetchurl; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "clack-v1-compat" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clack-v1-compat" or (x: {})) (import ./quicklisp-to-nix-output/clack-v1-compat.nix { inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "quri" = quicklisp-to-nix-packages."quri"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "lack" = quicklisp-to-nix-packages."lack"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1494,6 +1733,12 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clack" or (x: {})) (import ./quicklisp-to-nix-output/clack.nix { inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack" = quicklisp-to-nix-packages."lack"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1515,6 +1760,15 @@ let quicklisp-to-nix-packages = rec { })); + "cffi-grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi-grovel" or (x: {})) + (import ./quicklisp-to-nix-output/cffi-grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "cffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cffi" or (x: {})) @@ -1567,6 +1821,16 @@ let quicklisp-to-nix-packages = rec { ((f: x: (x // (f x))) (qlOverrides."babel" or (x: {})) (import ./quicklisp-to-nix-output/babel.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "asdf-system-connections" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-system-connections" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-system-connections.nix { inherit fetchurl; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 141fb0f34ebb..f408ceeb3f52 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -49,6 +49,24 @@ (#\. "_dot_") (t x))))) +(defun system-depends-on (system-name) + (labels + ((decode (name) + (typecase name + (string + name) + (cons + (ecase (car name) + (:version (second name))))))) + (let* ((asdf-dependencies (asdf:system-depends-on (asdf:find-system system-name))) + (decoded-asdf-dependencies (mapcar #'decode asdf-dependencies)) + (clean-asdf-dependencies (remove-if-not 'ql-dist:find-system decoded-asdf-dependencies)) + (ql-dependencies (ql-dist:required-systems (ql-dist:find-system system-name))) + (all-dependencies (concatenate 'list clean-asdf-dependencies ql-dependencies)) + (sorted-dependencies (sort all-dependencies #'string<)) + (unique-dependencies (remove-duplicates sorted-dependencies :test #'equal))) + unique-dependencies))) + (defun system-data (system) (let* ((asdf-system @@ -69,7 +87,7 @@ (nix-prefetch-url local-url))) (ideal-md5 (ql-dist:archive-md5 ql-release)) (file-md5 (getf archive-data :md5)) - (raw-dependencies (ql-dist:required-systems ql-system)) + (raw-dependencies (system-depends-on system)) (name (string-downcase (format nil "~a" system))) (ql-sibling-names (remove name (mapcar 'ql-dist:name ql-sibling-systems) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index bc3034292742..681e6fcc528a 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -16,7 +16,7 @@ buildRustPackage rec { depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6"; meta = { - homepage = "http://github.com/cgag/loc"; + homepage = http://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 834460748ca2..68f7e6c49cec 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; - homepage = "https://github.com/google/adb-sync"; + homepage = https://github.com/google/adb-sync; license = licenses.asl20; platforms = platforms.unix; hydraPlatforms = []; diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index d9b478266487..05b545420336 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& m2repository - + - 53 + 57 - - 194148491 - 9008082eb1e6ff5a78d32a1fed6915f266fc5013 - google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip + + 214565802 + 4bc48d6d4d39944cf2b061e3f618cd9d447c75bb + google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip @@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 41 + 43 - - 13165315 - 55be81c50041f6a8f62947418f74f683369c971f - google_play_services_v11_rc16.zip + + 21391284 + 6b072d5b96fb8726405d363ccdbb4d26bec0b54f + google_play_services_v11_3_rc05.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 06be6515ee53..71ce2c3d0792 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -296,8 +296,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip; - sha1 = "55be81c50041f6a8f62947418f74f683369c971f"; + url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip; + sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index c6ee22e4d3cd..8ef58471d6a0 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -64,6 +64,11 @@ stdenv.mkDerivation rec { sed -i -e ${sed_script_2} ndk-which # a bash script patchShebangs ndk-which + # wrap + for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done # make some executables available in PATH mkdir -pv ${bin_path} for i in \ @@ -71,11 +76,6 @@ stdenv.mkDerivation rec { do ln -sf ${pkg_path}/$i ${bin_path}/$i done - # wrap - for i in ndk-build ndk-gdb ndk-gdb-py ndk-which - do - wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" - done ''; meta = { diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 4239dc55e7c4..ccf22d6b9536 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -64,6 +64,11 @@ stdenv.mkDerivation rec { sed -i -e ${sed_script_2} ndk-which # a bash script patchShebangs ndk-which + # wrap + for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done # make some executables available in PATH mkdir -pv ${bin_path} for i in \ @@ -71,10 +76,5 @@ stdenv.mkDerivation rec { do ln -sf ${pkg_path}/$i ${bin_path}/$i done - # wrap - for i in ndk-build ndk-gdb ndk-gdb-py ndk-which - do - wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" - done ''; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 7587fb3e0c48..7c4792f560d5 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -11,16 +11,16 @@ let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.3"; + version = "25.2.5"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v"; + sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar"; + sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09d643146ba..c09fd6142703 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "25.0.1"; + version = "26.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7"; + sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki"; + sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a233333986ae..56c810dfc545 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -195,6 +195,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_8_0 = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_8_0_extras = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 6205b98eee15..bc99837d27af 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 = "25.0.1"; + version = "26.0.0"; 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 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx"; + sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln"; + url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; + sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 1caa6cebb14f..e24a9c431602 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a4903cd0d402..3775872514ca 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index 9f46af93a880..6d2c87178a6d 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014. - + NDK 15 - - 959176682 - 9dd0ff18d177ec75797b021a3ebd294362e8a41e - android-ndk-r15-darwin-x86_64.zip + + 959321525 + 05e3eec7e9ce1d09bb5401b41cf778a2ec19c819 + android-ndk-r15b-darwin-x86_64.zip macosx 64 - - 973898016 - 32b3115357ed798a8a48d7d589ffcb901693c745 - android-ndk-r15-linux-x86_64.zip + + 974035125 + 2690d416e54f88f7fa52d0dcb5f539056a357b3b + android-ndk-r15b-linux-x86_64.zip linux 64 - - 783705009 - bf869b624f6d4778065d5d4703815b0c689069e1 - android-ndk-r15-windows-x86.zip + + 783838327 + 74e45891d0cc99b077b3951aeba87d9c91df20a8 + android-ndk-r15b-windows-x86.zip windows 32 - - 848657615 - 45d310443ceb5ff19a0dde139ee9b3404908c178 - android-ndk-r15-windows-x86_64.zip + + 848796389 + 126a1cd8985132c0383ab96579feed09ba402e22 + android-ndk-r15b-windows-x86_64.zip windows 64 @@ -336,17 +336,17 @@ June 2014. - + 8.0.0 26 Android SDK Platform 26 - 1 + 2 - - 63467872 - 33a4f9788bfd7123e712906b2d7e5d54a729e14a - platform-26_r01.zip + + 63623734 + e4ae5d7aa557a3c827135838ee400da8443ac4ef + platform-26_r02.zip @@ -1169,6 +1169,38 @@ June 2014. + + + + 26 + 0 + 1 + + + + + 54113329 + 5378c2c78091b414d0eac40a6bd37f2faa31a365 + build-tools_r26.0.1-linux.zip + linux + + + + 53266653 + cbde59de198916b390777dd0227921bfa2120832 + build-tools_r26.0.1-macosx.zip + macosx + + + + 54936185 + 02494c80ffbe65bfff0aaa7463c9692693327b7d + build-tools_r26.0.1-windows.zip + windows + + + + diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 84ebee5a75f9..55c1b60e965d 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "40"; + version = "47"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "782e7233f18c890463e8602571d304e680ce354c"; + sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 8ea0cfb5b802..06754b250763 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -746,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 19 Intel x86 Atom System Image - 5 + 6 - - 183968605 - 1d98426467580abfd03c724c5344450f5d0df379 - x86-19_r05.zip + + 185886274 + 2ac82153aae97f7eae4c5a0761224fe04321d03d + x86-19_r06.zip @@ -763,33 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 Intel x86 Atom System Image - 4 - - - - 206305926 - c7732f45c931c0eaa064e57e8c054bce86c30e54 - x86-21_r04.zip - - - - x86 - default - - - - 22 - Intel x86 Atom System Image 5 - - 212327460 - 7e2c93891ea9efec07dccccf6b9ab051a014dbdf - x86-22_r05.zip + + 208212529 + 00f0eb0a1003efe3316347f762e20a85d8749cff + x86-21_r05.zip @@ -797,16 +780,33 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + + 22 + Intel x86 Atom System Image + 6 + + + + 214268954 + e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e + x86-22_r06.zip + + + + x86 + default + + + 23 Intel x86 Atom System Image - 9 + 10 - - 260241399 - d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1 - x86-23_r09.zip + + 260804863 + f6c3e3dd7bd951454795aa75c3a145fd05ac25bb + x86-23_r10.zip @@ -814,16 +814,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom System Image - 7 + 8 - - 302213276 - 566fdee283a907854bfa3c174265bc31f396eabd - x86-24_r07.zip + + 313489224 + c1cae7634b0216c0b5990f2c144eb8ca948e3511 + x86-24_r08.zip @@ -831,33 +831,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 Intel x86 Atom_64 System Image - 4 - - - - 290608820 - 9b2d64a69a72fa596c386899a742a404308f2c92 - x86_64-21_r04.zip - - - - x86_64 - default - - - - 22 - Intel x86 Atom_64 System Image 5 - - 297850561 - 99d1d6c77e92284b4210640edf6c81eceb28520d - x86_64-22_r05.zip + + 292623982 + 9078a095825a69e5e215713f0866c83cef65a342 + x86_64-21_r05.zip @@ -865,16 +848,33 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + + 22 + Intel x86 Atom_64 System Image + 6 + + + + 299976630 + 5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4 + x86_64-22_r06.zip + + + + x86_64 + default + + + 23 Intel x86 Atom_64 System Image - 9 + 10 - - 363794271 - 84cc076eacec043c8e88382c6ab391b0cd5c0695 - x86_64-23_r09.zip + + 365009313 + 7cbc291483ca07dc67b71268c5f08a5755f50f51 + x86_64-23_r10.zip @@ -882,16 +882,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom_64 System Image - 7 + 8 - - 407148033 - a379932395ced0a8f572b39c396d86e08827a9ba - x86_64-24_r07.zip + + 419261998 + f6559e1949a5879f31a9662f4f0e50ad60181684 + x86_64-24_r08.zip diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 89c48e5fb59e..c5d075d63076 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -138,8 +138,8 @@ in sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip; - sha1 = "1d98426467580abfd03c724c5344450f5d0df379"; + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; }; }; @@ -154,16 +154,16 @@ in sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip; - sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54"; + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; }; }; sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip; - sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; }; }; @@ -178,16 +178,16 @@ in sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip; - sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf"; + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; }; }; sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip; - sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; }; }; @@ -202,16 +202,16 @@ in sysimg_x86_23 = buildSystemImage { name = "sysimg-x86-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip; - sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1"; + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; }; }; sysimg_x86_64_23 = buildSystemImage { name = "sysimg-x86_64-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip; - sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; }; }; @@ -234,16 +234,16 @@ in sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; - sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; - sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; }; }; @@ -263,4 +263,4 @@ in }; }; } - + diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 06d38c700dd7..0c1bb5d4d42d 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.flashtool.net/"; + homepage = http://www.flashtool.net/; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index cf699c34e2be..0c9c3e3f42ca 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -21,7 +21,7 @@ let security delete-keychain $keychainName ''; - # On Mac OS X, the java executable shows an -unoffical postfix in the version + # On macOS, the java executable shows an -unoffical postfix in the version # number. This confuses the build script's version detector. # We fix this by creating a wrapper that strips it out of the output. @@ -72,7 +72,7 @@ stdenv.mkDerivation { ${if target == "android" then '' ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' - # Hack to make version detection work with OpenJDK on Mac OS X + # Hack to make version detection work with OpenJDK on macOS export PATH=${javaVersionFixWrapper}/bin:$PATH export JAVA_HOME=${javaVersionFixWrapper} javac -version diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index c1ed650f2324..b44394c696bb 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,13 @@ Node.js packages -=============== +================ To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: - 1. Install node2nix: `nix-env -f '' -iA nodePackages.node2nix`. - 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, - or remove package entries. - 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`. - 4. Build your new package to test your changes: `cd /path/to/nixpkgs && - nix-build -A nodePackages.`. To build against a - specific node.js version (e.g. 5.x): `nix-build -A - nodePackages_5_x.` - 5. Add, commit, and share your changes! + 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update + or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` + for packagages depending on Node.js 4.x) + 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. + 3. Build your new package to test your changes: + `cd /path/to/nixpkgs && nix-build -A nodePackages.`. + To build against a specific Node.js version (e.g. 4.x): + `nix-build -A nodePackages_4_x.` + 4. Add and commit all modified and generated files. diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index c8e51f53a9ac..15ec05365254 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -634,13 +634,13 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "readable-stream-2.2.11" = { + "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.11"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; - sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; }; }; "xtend-4.0.1" = { @@ -670,22 +670,22 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "safe-buffer-5.0.1" = { + "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; }; }; - "string_decoder-1.0.2" = { + "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; - sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; }; }; "util-deprecate-1.0.2" = { @@ -733,13 +733,13 @@ let sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; }; }; - "fined-1.0.2" = { + "fined-1.1.0" = { name = "fined"; packageName = "fined"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"; - sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; "flagged-respawn-0.3.2" = { @@ -787,13 +787,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "resolve-1.3.3" = { + "resolve-1.4.0" = { name = "resolve"; packageName = "resolve"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; - sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; + sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86"; }; }; "detect-file-0.1.0" = { @@ -949,13 +949,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.3" = { + "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"; - sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; }; }; "expand-range-1.8.2" = { @@ -1066,13 +1066,13 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "remove-trailing-separator-1.0.2" = { + "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; - sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; "for-own-0.1.5" = { @@ -1210,13 +1210,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "which-1.2.14" = { + "which-1.3.0" = { name = "which"; packageName = "which"; - version = "1.2.14"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a"; }; }; "parse-passwd-1.0.0" = { @@ -1237,31 +1237,40 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "lodash.assignwith-4.2.0" = { - name = "lodash.assignwith"; - packageName = "lodash.assignwith"; - version = "4.2.0"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; - sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "lodash.isempty-4.4.0" = { - name = "lodash.isempty"; - packageName = "lodash.isempty"; - version = "4.4.0"; + "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.isempty/-/lodash.isempty-4.4.0.tgz"; - sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + 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" = { @@ -1273,6 +1282,42 @@ let 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"; + }; + }; + "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.0.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; + sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + }; + }; + "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-0.2.6" = { name = "is-absolute"; packageName = "is-absolute"; @@ -1678,13 +1723,13 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "npmlog-4.1.0" = { + "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz"; - sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; }; "osenv-0.1.4" = { @@ -1984,13 +2029,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.15" = { + "mime-types-2.1.16" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"; + sha1 = "2b858a52e5ecd516db897ac2be87487830698e23"; }; }; "oauth-sign-0.8.2" = { @@ -2020,15 +2065,6 @@ let sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "safe-buffer-5.1.0" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; - sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; - }; - }; "stringstream-0.0.5" = { name = "stringstream"; packageName = "stringstream"; @@ -2173,13 +2209,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.4.0" = { + "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; "sshpk-1.13.1" = { @@ -2200,13 +2236,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "extsprintf-1.0.2" = { + "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; - version = "1.0.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; "json-schema-0.2.3" = { @@ -2218,13 +2254,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "verror-1.3.6" = { + "verror-1.10.0" = { name = "verror"; packageName = "verror"; - version = "1.3.6"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; "asn1-0.2.3" = { @@ -2290,13 +2326,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.27.0" = { + "mime-db-1.29.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.27.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "punycode-1.4.1" = { @@ -2344,13 +2380,13 @@ let sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; }; }; - "express-4.15.3" = { + "express-4.15.4" = { name = "express"; packageName = "express"; - version = "4.15.3"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; + sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; }; }; "rc-1.2.1" = { @@ -2578,13 +2614,13 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; - "big-integer-1.6.23" = { + "big-integer-1.6.24" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.23"; + version = "1.6.24"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz"; - sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz"; + sha1 = "1ed84d018ac3c1c72b307e7f7d94008e8ee20311"; }; }; "camelcase-keys-2.1.0" = { @@ -2623,13 +2659,13 @@ let sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; - "normalize-package-data-2.3.8" = { + "normalize-package-data-2.4.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; - sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; }; }; "read-pkg-up-1.0.1" = { @@ -2686,13 +2722,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.2" = { + "hosted-git-info-2.5.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; - sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c"; }; }; "is-builtin-module-1.0.0" = { @@ -2911,13 +2947,13 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "accepts-1.3.3" = { + "accepts-1.3.4" = { name = "accepts"; packageName = "accepts"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; + sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; }; }; "array-flatten-1.1.1" = { @@ -2965,22 +3001,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; - "depd-1.1.0" = { + "depd-1.1.1" = { name = "depd"; packageName = "depd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; "encodeurl-1.0.1" = { @@ -3010,13 +3037,13 @@ let sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-1.0.3" = { + "finalhandler-1.0.4" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz"; - sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; + sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"; }; }; "fresh-0.5.0" = { @@ -3073,13 +3100,22 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.4" = { + "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; - sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + }; + }; + "qs-6.5.0" = { + name = "qs"; + packageName = "qs"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49"; }; }; "range-parser-1.2.0" = { @@ -3091,22 +3127,22 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "send-0.15.3" = { + "send-0.15.4" = { name = "send"; packageName = "send"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; + sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; }; }; - "serve-static-1.12.3" = { + "serve-static-1.12.4" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; + sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; }; }; "setprototypeof-1.0.3" = { @@ -3190,13 +3226,13 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; - "ipaddr.js-1.3.0" = { + "ipaddr.js-1.4.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; - sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; "destroy-1.0.4" = { @@ -3208,13 +3244,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.1" = { + "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; "mime-1.3.4" = { @@ -3253,6 +3289,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + }; + }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -3289,6 +3334,15 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; + "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"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; + }; + }; "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; @@ -3406,6 +3460,15 @@ let sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; + "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"; + }; + }; "ansicolors-0.3.2" = { name = "ansicolors"; packageName = "ansicolors"; @@ -3433,13 +3496,13 @@ let sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; }; }; - "cacache-9.2.8" = { + "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; - version = "9.2.8"; + version = "9.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; - sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd"; }; }; "call-limit-1.1.0" = { @@ -3568,6 +3631,15 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; + "libnpx-9.2.3" = { + name = "libnpx"; + packageName = "libnpx"; + version = "9.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz"; + sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -3622,13 +3694,13 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "lru-cache-4.0.2" = { + "lru-cache-4.1.1" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; }; }; "mississippi-1.3.0" = { @@ -3685,13 +3757,13 @@ let sha1 = "fb18d17bb61e60900d6312619919bd753755ab37"; }; }; - "npm-registry-client-8.3.0" = { + "npm-registry-client-8.4.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; - sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c"; }; }; "npm-user-validate-1.0.0" = { @@ -3712,13 +3784,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.36" = { + "pacote-2.7.38" = { name = "pacote"; packageName = "pacote"; - version = "2.7.36"; + version = "2.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; - sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz"; + sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1"; }; }; "path-is-inside-1.0.2" = { @@ -3766,13 +3838,13 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; - "read-package-json-2.0.5" = { + "read-package-json-2.0.12" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.5"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz"; - sha1 = "f93a64e641529df68a08c64de46389e8a3f88845"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; + sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951"; }; }; "read-package-tree-5.1.6" = { @@ -3838,6 +3910,15 @@ let sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; }; }; + "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"; + }; + }; "text-table-0.2.0" = { name = "text-table"; packageName = "text-table"; @@ -3865,22 +3946,13 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "update-notifier-2.1.0" = { + "update-notifier-2.2.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; - sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; }; }; "validate-npm-package-name-3.0.0" = { @@ -3892,6 +3964,24 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; + "which-1.2.14" = { + name = "which"; + packageName = "which"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + }; + }; + "worker-farm-1.4.1" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz"; + sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; + }; + }; "write-file-atomic-2.1.0" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -4000,13 +4090,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "asap-2.0.5" = { + "asap-2.0.6" = { name = "asap"; packageName = "asap"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; "promzard-0.3.0" = { @@ -4018,6 +4108,303 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "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"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "p-limit-1.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; + sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "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"; + }; + }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -4054,13 +4441,13 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "duplexify-3.5.0" = { + "duplexify-3.5.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; - sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; + sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd"; }; }; "end-of-stream-1.4.0" = { @@ -4135,15 +4522,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "end-of-stream-1.0.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; - }; - }; "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; @@ -4162,13 +4540,13 @@ let sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; }; }; - "copy-concurrently-1.0.3" = { + "copy-concurrently-1.0.5" = { name = "copy-concurrently"; packageName = "copy-concurrently"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz"; - sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250"; + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; }; }; "run-queue-1.0.3" = { @@ -4180,22 +4558,22 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.12" = { + "make-fetch-happen-2.5.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.12"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; - sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz"; + sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8"; }; }; - "npm-pick-manifest-1.0.3" = { + "npm-pick-manifest-1.0.4" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz"; - sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8"; }; }; "promise-retry-1.1.1" = { @@ -4234,13 +4612,13 @@ let sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016"; }; }; - "agentkeepalive-3.2.0" = { + "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; - sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha1 = "6d5de5829afd3be2712201a39275fd11c651857c"; }; }; "http-cache-semantics-3.7.3" = { @@ -4252,40 +4630,40 @@ let sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; }; }; - "http-proxy-agent-1.0.0" = { + "http-proxy-agent-2.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-1.0.0" = { + "https-proxy-agent-2.1.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; + sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443"; }; }; - "node-fetch-npm-2.0.1" = { + "node-fetch-npm-2.0.2" = { name = "node-fetch-npm"; packageName = "node-fetch-npm"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz"; - sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; + url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; + sha1 = "7258c9046182dca345b4208eda918daf33697ff7"; }; }; - "socks-proxy-agent-2.1.1" = { + "socks-proxy-agent-3.0.0" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; - sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; + sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245"; }; }; "humanize-ms-1.2.1" = { @@ -4297,22 +4675,31 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-2.1.1" = { + "agent-base-4.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "2.1.1"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; + sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a"; }; }; "encoding-0.1.12" = { @@ -4324,13 +4711,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "json-parse-helpfulerror-1.0.3" = { - name = "json-parse-helpfulerror"; - packageName = "json-parse-helpfulerror"; - version = "1.0.3"; + "json-parse-better-errors-1.0.1" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; - sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; + sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a"; }; }; "iconv-lite-0.4.18" = { @@ -4342,15 +4729,6 @@ let sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; }; }; - "jju-1.3.0" = { - name = "jju"; - packageName = "jju"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; - sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; - }; - }; "socks-1.1.10" = { name = "socks"; packageName = "socks"; @@ -4423,6 +4801,15 @@ let sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; }; }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; "from2-1.3.0" = { name = "from2"; packageName = "from2"; @@ -4450,22 +4837,31 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.1.0" = { + "boxen-1.2.1" = { name = "boxen"; packageName = "boxen"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz"; - sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; + sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; }; }; - "configstore-3.1.0" = { + "configstore-3.1.1" = { name = "configstore"; packageName = "configstore"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz"; - sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; + }; + }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; "is-npm-1.0.0" = { @@ -4486,15 +4882,6 @@ let sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; - "lazy-req-2.0.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; - sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; - }; - }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -4522,13 +4909,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"; }; }; "cli-boxes-1.0.0" = { @@ -4540,22 +4927,13 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "string-width-2.0.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; - }; - }; - "term-size-0.1.1" = { + "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz"; - sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca"; + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; "widest-line-1.0.0" = { @@ -4567,76 +4945,58 @@ let sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; + "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"; + sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88"; + }; + }; + "supports-color-4.2.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"; + sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "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/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "execa-0.4.0" = { - name = "execa"; - packageName = "execa"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; - }; - }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - }; - "dot-prop-4.1.1" = { + "dot-prop-4.2.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; - sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; }; "make-dir-1.0.0" = { @@ -4729,15 +5089,6 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -4819,6 +5170,24 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; + "errno-0.1.4" = { + name = "errno"; + packageName = "errno"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; + sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + }; + }; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + }; + }; "adm-zip-0.4.7" = { name = "adm-zip"; packageName = "adm-zip"; @@ -5071,13 +5440,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "source-map-0.5.6" = { + "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; }; }; "uglify-to-browserify-1.0.2" = { @@ -5215,31 +5584,22 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "commander-2.9.0" = { + "commander-2.11.0" = { name = "commander"; packageName = "commander"; - version = "2.9.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563"; }; }; - "is-my-json-valid-2.16.0" = { + "is-my-json-valid-2.16.1" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz"; - sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693"; - }; - }; - "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"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; + sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11"; }; }; "generate-function-2.0.0" = { @@ -5347,10 +5707,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; buildInputs = globalBuildInputs; meta = { @@ -5513,14 +5873,14 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -5555,7 +5915,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" ]; }) sources."array-unique-0.2.1" @@ -5613,7 +5973,7 @@ in }) (sources."normalize-path-2.1.1" // { dependencies = [ - sources."remove-trailing-separator-1.0.2" + sources."remove-trailing-separator-1.1.0" ]; }) (sources."object.omit-2.0.1" // { @@ -5661,7 +6021,7 @@ in ]; }) sources."ini-1.3.4" - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -5675,16 +6035,39 @@ in }) ]; }) - (sources."fined-1.0.2" // { + (sources."fined-1.1.0" // { 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."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."for-own-1.0.0" // { + dependencies = [ + sources."for-in-1.0.2" + ]; + }) + sources."isobject-3.0.1" + ]; + }) + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" ]; }) - sources."lodash.assignwith-4.2.0" - sources."lodash.isempty-4.4.0" - sources."lodash.pick-4.4.0" (sources."parse-filepath-1.0.1" // { dependencies = [ (sources."is-absolute-0.2.6" // { @@ -5716,7 +6099,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - (sources."resolve-1.3.3" // { + (sources."resolve-1.4.0" // { dependencies = [ sources."path-parse-1.0.5" ]; @@ -5917,19 +6300,19 @@ in sources."abbrev-1.1.0" ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6012,12 +6395,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -6037,15 +6424,15 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6064,7 +6451,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -6135,7 +6522,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.23" + sources."big-integer-1.6.24" ]; }) (sources."meow-3.7.0" // { @@ -6157,9 +6544,9 @@ in ]; }) sources."map-obj-1.0.1" - (sources."normalize-package-data-2.3.8" // { + (sources."normalize-package-data-2.4.0" // { dependencies = [ - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -6273,13 +6660,13 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.15.3" // { + (sources."express-4.15.4" // { dependencies = [ - (sources."accepts-1.3.3" // { + (sources."accepts-1.3.4" // { dependencies = [ - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."negotiator-0.6.1" @@ -6290,16 +6677,11 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."debug-2.6.7" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { + (sources."finalhandler-1.0.4" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -6314,18 +6696,18 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.4" // { + (sources."proxy-addr-1.1.5" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" ]; }) - sources."qs-6.4.0" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { + (sources."send-0.15.4" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.6.1" // { + (sources."http-errors-1.6.2" // { dependencies = [ sources."inherits-2.0.3" ]; @@ -6334,15 +6716,15 @@ in sources."ms-2.0.0" ]; }) - sources."serve-static-1.12.3" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) ]; @@ -6421,19 +6803,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6510,12 +6892,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -6535,15 +6921,15 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6584,7 +6970,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6624,14 +7010,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6663,19 +7049,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6752,12 +7138,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -6777,15 +7167,15 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6826,7 +7216,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6866,14 +7256,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6884,7 +7274,7 @@ in }) ]; }) - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -6970,19 +7360,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7067,12 +7457,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -7092,15 +7486,15 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -7142,7 +7536,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7187,14 +7581,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7213,10 +7607,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.3"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; - sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; + url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz"; + sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7226,13 +7620,13 @@ in ]; }) sources."abbrev-1.1.0" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - (sources."cacache-9.2.8" // { + (sources."cacache-9.2.9" // { dependencies = [ sources."y18n-3.2.1" ]; @@ -7242,6 +7636,11 @@ in sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) (sources."wcwidth-1.0.1" // { dependencies = [ (sources."defaults-1.0.3" // { @@ -7261,7 +7660,7 @@ in sources."detect-indent-5.0.0" (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.5" + sources."asap-2.0.6" ]; }) sources."editor-1.0.0" @@ -7304,7 +7703,7 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -7315,6 +7714,128 @@ in ]; }) sources."lazy-property-1.0.0" + (sources."libnpx-9.2.3" // { + dependencies = [ + sources."dotenv-4.0.0" + sources."y18n-3.2.1" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."wrap-ansi-2.1.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-2.1.0" // { + dependencies = [ + (sources."execa-0.7.0" // { + dependencies = [ + (sources."cross-spawn-5.1.0" // { + dependencies = [ + (sources."shebang-command-1.2.0" // { + dependencies = [ + sources."shebang-regex-1.0.0" + ]; + }) + ]; + }) + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + ]; + }) + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + (sources."mem-1.1.0" // { + dependencies = [ + sources."mimic-fn-1.1.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + (sources."find-up-2.1.0" // { + dependencies = [ + (sources."locate-path-2.0.0" // { + dependencies = [ + (sources."p-locate-2.0.0" // { + dependencies = [ + sources."p-limit-1.1.0" + ]; + }) + sources."path-exists-3.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-2.0.0" // { + dependencies = [ + (sources."load-json-file-2.0.0" // { + dependencies = [ + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.1" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + ]; + }) + (sources."path-type-2.0.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."yargs-parser-7.0.0" + ]; + }) + ]; + }) sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ @@ -7326,7 +7847,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."lru-cache-4.0.2" // { + (sources."lru-cache-4.1.1" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.1.2" @@ -7339,13 +7860,8 @@ in sources."typedarray-0.0.6" ]; }) - (sources."duplexify-3.5.0" // { + (sources."duplexify-3.5.1" // { dependencies = [ - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) sources."stream-shift-1.0.0" ]; }) @@ -7378,7 +7894,7 @@ in }) (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."copy-concurrently-1.0.3" + sources."copy-concurrently-1.0.5" sources."run-queue-1.0.3" ]; }) @@ -7398,7 +7914,7 @@ in ]; }) sources."nopt-4.0.1" - (sources."normalize-package-data-2.3.8" // { + (sources."normalize-package-data-2.4.0" // { dependencies = [ (sources."is-builtin-module-1.0.0" // { dependencies = [ @@ -7410,7 +7926,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-5.1.2" - (sources."npm-registry-client-8.3.0" // { + (sources."npm-registry-client-8.4.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -7420,7 +7936,7 @@ in ]; }) sources."npm-user-validate-1.0.0" - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ @@ -7442,6 +7958,11 @@ in }) ]; }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."wide-align-1.1.2" ]; }) @@ -7456,11 +7977,11 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."pacote-2.7.36" // { + (sources."pacote-2.7.38" // { dependencies = [ - (sources."make-fetch-happen-2.4.12" // { + (sources."make-fetch-happen-2.5.0" // { dependencies = [ - (sources."agentkeepalive-3.2.0" // { + (sources."agentkeepalive-3.3.0" // { dependencies = [ (sources."humanize-ms-1.2.1" // { dependencies = [ @@ -7470,14 +7991,17 @@ in ]; }) sources."http-cache-semantics-3.7.3" - (sources."http-proxy-agent-1.0.0" // { + (sources."http-proxy-agent-2.0.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.1" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) - sources."extend-3.0.1" (sources."debug-2.6.8" // { dependencies = [ sources."ms-2.0.0" @@ -7485,11 +8009,15 @@ in }) ]; }) - (sources."https-proxy-agent-1.0.0" // { + (sources."https-proxy-agent-2.1.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.1" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) (sources."debug-2.6.8" // { @@ -7497,31 +8025,29 @@ in sources."ms-2.0.0" ]; }) - sources."extend-3.0.1" ]; }) - (sources."node-fetch-npm-2.0.1" // { + (sources."node-fetch-npm-2.0.2" // { dependencies = [ (sources."encoding-0.1.12" // { dependencies = [ sources."iconv-lite-0.4.18" ]; }) - (sources."json-parse-helpfulerror-1.0.3" // { - dependencies = [ - sources."jju-1.3.0" - ]; - }) + sources."json-parse-better-errors-1.0.1" ]; }) - (sources."socks-proxy-agent-2.1.1" // { + (sources."socks-proxy-agent-3.0.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.1" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) - sources."extend-3.0.1" (sources."socks-1.1.10" // { dependencies = [ sources."ip-1.1.5" @@ -7542,7 +8068,7 @@ in }) ]; }) - sources."npm-pick-manifest-1.0.3" + sources."npm-pick-manifest-1.0.4" (sources."promise-retry-1.1.1" // { dependencies = [ sources."err-code-1.1.2" @@ -7584,23 +8110,19 @@ in sources."util-extend-1.0.3" ]; }) - (sources."read-package-json-2.0.5" // { + (sources."read-package-json-2.0.12" // { dependencies = [ - (sources."json-parse-helpfulerror-1.0.3" // { - dependencies = [ - sources."jju-1.3.0" - ]; - }) + sources."json-parse-better-errors-1.0.1" + sources."slash-1.0.0" ]; }) sources."read-package-tree-5.1.6" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ 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."string_decoder-1.0.2" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7647,12 +8169,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -7672,9 +8198,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -7691,7 +8217,7 @@ in }) sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -7717,7 +8243,7 @@ in ]; }) sources."ssri-4.1.6" - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7732,27 +8258,59 @@ in ]; }) sources."unpipe-1.0.0" - (sources."update-notifier-2.1.0" // { + (sources."update-notifier-2.2.0" // { dependencies = [ - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.1" // { dependencies = [ sources."ansi-align-2.0.0" sources."camelcase-4.1.0" + (sources."chalk-2.1.0" // { + dependencies = [ + (sources."ansi-styles-3.2.0" // { + dependencies = [ + (sources."color-convert-1.9.0" // { + dependencies = [ + sources."color-name-1.1.3" + ]; + }) + ]; + }) + sources."escape-string-regexp-1.0.5" + (sources."supports-color-4.2.1" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + ]; + }) sources."cli-boxes-1.0.0" - (sources."string-width-2.0.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - (sources."term-size-0.1.1" // { + (sources."term-size-1.2.0" // { dependencies = [ - (sources."execa-0.4.0" // { + (sources."execa-0.7.0" // { dependencies = [ - sources."cross-spawn-async-2.2.5" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + (sources."shebang-command-1.2.0" // { + dependencies = [ + sources."shebang-regex-1.0.0" + ]; + }) + ]; + }) + sources."get-stream-3.0.0" sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."object-assign-4.1.1" - sources."path-key-1.0.0" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" ]; }) @@ -7768,6 +8326,11 @@ in sources."number-is-nan-1.0.1" ]; }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) ]; }) ]; @@ -7778,13 +8341,22 @@ in dependencies = [ sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" + (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."configstore-3.1.0" // { + (sources."configstore-3.1.1" // { dependencies = [ - (sources."dot-prop-4.1.1" // { + (sources."dot-prop-4.2.0" // { dependencies = [ sources."is-obj-1.0.1" ]; @@ -7801,6 +8373,7 @@ in }) ]; }) + sources."import-lazy-2.1.0" sources."is-npm-1.0.0" (sources."latest-version-3.1.0" // { dependencies = [ @@ -7854,12 +8427,11 @@ in }) ]; }) - sources."lazy-req-2.0.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" ]; }) - sources."uuid-3.0.1" + sources."uuid-3.1.0" (sources."validate-npm-package-name-3.0.0" // { dependencies = [ sources."builtins-1.0.3" @@ -7870,6 +8442,16 @@ in sources."isexe-2.0.0" ]; }) + (sources."worker-farm-1.4.1" // { + dependencies = [ + (sources."errno-0.1.4" // { + dependencies = [ + sources."prr-0.0.0" + ]; + }) + sources."xtend-4.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -7956,7 +8538,7 @@ in (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ @@ -8042,12 +8624,8 @@ in sources."supports-color-2.0.0" ]; }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.16.0" // { + sources."commander-2.11.0" + (sources."is-my-json-valid-2.16.1" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -8077,12 +8655,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -8102,9 +8684,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index b362281ee213..f9a3c9af2f21 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -8,6 +8,7 @@ , "coffee-script" , "cordova" , "csslint" +, "dhcp" , "dnschain" , "docker-registry-server" , "elasticdump" @@ -15,6 +16,7 @@ , "eslint" , "eslint_d" , "emojione" +, "fast-cli" , "fetch-bower" , "forever" , "git-run" @@ -30,12 +32,17 @@ , "jayschema" , "jshint" , "json" +, "js-beautify" +, "jsonlint" , "jsontool" +, "json-refs" , "json-server" , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } +, "lerna" , "lcov-result-merger" +, "livedown" , "meat" , "mocha" , "nijs" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 1fca65308082..15f37baf46ea 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4,51 +4,6 @@ let sources = { - "async-2.4.1" = { - name = "async"; - packageName = "async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; - sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; - }; - }; - "babel-core-6.25.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz"; - sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729"; - }; - }; - "babel-traverse-6.25.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz"; - sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1"; - }; - }; - "babel-types-6.25.0" = { - name = "babel-types"; - packageName = "babel-types"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz"; - sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e"; - }; - }; - "babylon-6.17.3" = { - name = "babylon"; - packageName = "babylon"; - version = "6.17.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz"; - sha1 = "1327d709950b558f204e5352587fd0290f8d8e48"; - }; - }; "colors-0.6.0-1" = { name = "colors"; packageName = "colors"; @@ -58,24 +13,6 @@ let sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; }; }; - "commander-0.6.1" = { - name = "commander"; - packageName = "commander"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }; - }; - "deasync-0.1.10" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz"; - sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe"; - }; - }; "ejs-2.3.4" = { name = "ejs"; packageName = "ejs"; @@ -85,13 +22,40 @@ let sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; }; }; - "global-paths-0.1.2" = { - name = "global-paths"; - packageName = "global-paths"; - version = "0.1.2"; + "pkginfo-0.2.2" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; - sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; + sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "wrench-1.3.9" = { + name = "wrench"; + packageName = "wrench"; + version = "1.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; + sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; + }; + }; + "xmldom-0.1.19" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }; }; "jsonlint-1.5.1" = { @@ -103,6 +67,51 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; + }; + }; + "resolve-1.4.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; + sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86"; + }; + }; + "global-paths-0.1.2" = { + name = "global-paths"; + packageName = "global-paths"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; + sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + }; + }; + "source-map-0.1.9" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; + sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + }; + }; + "xml2tss-0.0.5" = { + name = "xml2tss"; + packageName = "xml2tss"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; + sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + }; + }; "moment-2.17.1" = { name = "moment"; packageName = "moment"; @@ -121,591 +130,6 @@ let sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; }; }; - "pkginfo-0.2.2" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; - sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; - }; - }; - "resolve-1.3.3" = { - name = "resolve"; - packageName = "resolve"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; - sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; - }; - }; - "source-map-0.1.9" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; - sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; - }; - }; - "wrench-1.3.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; - sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; - }; - }; - "xml2tss-0.0.5" = { - name = "xml2tss"; - packageName = "xml2tss"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; - sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; - }; - }; - "xmldom-0.1.19" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.19"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - 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.22.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; - sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; - }; - }; - "babel-generator-6.25.0" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz"; - sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-template-6.25.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz"; - sha1 = "665241166b7c2aa4c619d71e192969552b10c071"; - }; - }; - "babel-runtime-6.23.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; - sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; - }; - }; - "babel-register-6.24.1" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz"; - sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f"; - }; - }; - "convert-source-map-1.5.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; - }; - }; - "debug-2.6.8" = { - name = "debug"; - packageName = "debug"; - version = "2.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; - sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; - }; - }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; - "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"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; - }; - }; - "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"; - }; - }; - "private-0.1.7" = { - name = "private"; - packageName = "private"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; - sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; - }; - }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; - }; - }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "js-tokens-3.0.1" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; - sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "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"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "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"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "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"; - }; - }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; - "jsesc-1.3.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; - }; - }; - "trim-right-1.0.1" = { - name = "trim-right"; - packageName = "trim-right"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "core-js-2.4.1" = { - name = "core-js"; - packageName = "core-js"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"; - sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; - }; - }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; - "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"; - }; - }; - "source-map-support-0.4.15" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz"; - sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; - }; - }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; - }; - }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; - }; - }; - "to-fast-properties-1.0.3" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; - }; - }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - }; - "nan-2.6.2" = { - name = "nan"; - packageName = "nan"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; - sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "is-windows-0.1.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz"; - sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; - }; - }; - "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"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; - sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; - }; - }; - "homedir-polyfill-1.0.1" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; - }; - }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - }; - "which-1.2.14" = { - name = "which"; - packageName = "which"; - version = "1.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; - }; - }; - "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"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; "nomnom-1.8.1" = { name = "nomnom"; packageName = "nomnom"; @@ -769,13 +193,157 @@ let sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; }; }; - "is-0.3.0" = { - name = "is"; - packageName = "is"; - version = "0.3.0"; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; - sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + 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"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-buffer-1.1.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "path-parse-1.0.5" = { @@ -787,6 +355,96 @@ let sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; + "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"; + }; + }; + "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"; + }; + }; + "is-windows-0.1.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz"; + sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; + }; + }; + "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"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; + sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + }; + }; + "homedir-polyfill-1.0.1" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + }; + }; + "ini-1.3.4" = { + name = "ini"; + packageName = "ini"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + }; + "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"; + sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a"; + }; + }; + "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"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -814,6 +472,15 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; + "is-0.3.0" = { + name = "is"; + packageName = "is"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; + sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + }; + }; "adal-node-0.1.21" = { name = "adal-node"; packageName = "adal-node"; @@ -940,13 +607,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-1.1.0-preview" = { + "azure-arm-network-2.0.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "1.1.0-preview"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-1.1.0-preview.tgz"; - sha1 = "e6ca3e27a0169ff49849f0378bc6c531b08a2b8b"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-2.0.0.tgz"; + sha1 = "95e3d2658a68ecb0a2f90f611966f9852877f625"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -1336,22 +1003,22 @@ let sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "ms-rest-1.15.7" = { + "ms-rest-2.2.1" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.7"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; - sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz"; + sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377"; }; }; - "ms-rest-azure-1.15.7" = { + "ms-rest-azure-2.2.3" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.7"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; - sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.3.tgz"; + sha1 = "a11fc443b276ee26adbd159b2c5b2107d6197266"; }; }; "node-forge-0.6.23" = { @@ -1516,15 +1183,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "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"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -1606,13 +1264,13 @@ let sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; - "safe-buffer-5.1.0" = { + "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; - sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1687,76 +1345,22 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; - "ms-rest-2.2.0" = { + "ms-rest-1.15.7" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.0"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.0.tgz"; - sha1 = "5f2507522f1585e26666815588dbacbcec7fb79f"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-azure-2.1.2" = { + "ms-rest-azure-1.15.7" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.1.2"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.1.2.tgz"; - sha1 = "9774b1d4141c8a3a250ae5da36fc2654542be738"; - }; - }; - "@types/node-7.0.31" = { - name = "@types/node"; - packageName = "@types/node"; - version = "7.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz"; - sha1 = "80ea4d175599b2a00149c29a10a4eb2dff592e86"; - }; - }; - "@types/request-0.0.42" = { - name = "@types/request"; - packageName = "@types/request"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-0.0.42.tgz"; - sha1 = "e47a53bf0b130464854fb693297746a0c0479c31"; - }; - }; - "@types/uuid-2.0.30" = { - name = "@types/uuid"; - packageName = "@types/uuid"; - version = "2.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz"; - sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; - "@types/form-data-0.0.33" = { - name = "@types/form-data"; - packageName = "@types/form-data"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; - sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; "async-0.2.7" = { @@ -2011,6 +1615,51 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; + "@types/node-7.0.43" = { + name = "@types/node"; + packageName = "@types/node"; + version = "7.0.43"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz"; + sha1 = "a187e08495a075f200ca946079c914e1a5fe962c"; + }; + }; + "@types/request-0.0.45" = { + name = "@types/request"; + packageName = "@types/request"; + version = "0.0.45"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz"; + sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6"; + }; + }; + "@types/uuid-2.0.30" = { + name = "@types/uuid"; + packageName = "@types/uuid"; + version = "2.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz"; + sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "@types/form-data-2.2.0" = { + name = "@types/form-data"; + packageName = "@types/form-data"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz"; + sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565"; + }; + }; "debug-0.7.4" = { name = "debug"; packageName = "debug"; @@ -2029,13 +1678,13 @@ let sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }; }; - "pkginfo-0.4.0" = { + "pkginfo-0.4.1" = { name = "pkginfo"; packageName = "pkginfo"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; - sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; + sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; "revalidator-0.1.8" = { @@ -2065,15 +1714,6 @@ let sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }; }; - "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"; - }; - }; "deep-equal-1.0.1" = { name = "deep-equal"; packageName = "deep-equal"; @@ -2092,6 +1732,15 @@ let sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; }; }; + "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"; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -2110,6 +1759,15 @@ let sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; + "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"; + }; + }; "glob-7.1.2" = { name = "glob"; packageName = "glob"; @@ -2137,6 +1795,15 @@ let 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"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -2146,6 +1813,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "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"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -2155,6 +1831,33 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "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"; + }; + }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2317,13 +2020,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.15" = { + "mime-types-2.1.16" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"; + sha1 = "2b858a52e5ecd516db897ac2be87487830698e23"; }; }; "oauth-sign-0.8.2" = { @@ -2380,22 +2083,49 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; + "async-2.5.0" = { + name = "async"; + packageName = "async"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d"; }; }; - "is-my-json-valid-2.16.0" = { + "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"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "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"; + sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563"; + }; + }; + "is-my-json-valid-2.16.1" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz"; - sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz"; + sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11"; }; }; "pinkie-promise-2.0.1" = { @@ -2407,13 +2137,58 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "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"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "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"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "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"; }; }; "generate-function-2.0.0" = { @@ -2515,13 +2290,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.4.0" = { + "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; "sshpk-1.13.1" = { @@ -2542,13 +2317,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "extsprintf-1.0.2" = { + "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; - version = "1.0.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; "json-schema-0.2.3" = { @@ -2560,13 +2335,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "verror-1.3.6" = { + "verror-1.10.0" = { name = "verror"; packageName = "verror"; - version = "1.3.6"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; "asn1-0.2.3" = { @@ -2632,13 +2407,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.27.0" = { + "mime-db-1.29.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.27.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "punycode-1.4.1" = { @@ -2731,31 +2506,22 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.11" = { + "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.11"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; - sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "string_decoder-1.0.2" = { + "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; - sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; }; }; "http-basic-2.5.1" = { @@ -2767,22 +2533,31 @@ let sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; }; }; - "promise-7.3.0" = { + "promise-7.3.1" = { name = "promise"; packageName = "promise"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.0.tgz"; - sha1 = "e7feec5aa87a2cbb81acf47d9a3adbd9d4642d7b"; + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf"; }; }; - "asap-2.0.5" = { + "asap-2.0.6" = { name = "asap"; packageName = "asap"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "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"; }; }; "async-1.0.0" = { @@ -2884,13 +2659,13 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "semver-5.3.0" = { + "semver-5.4.1" = { name = "semver"; packageName = "semver"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; }; }; "temp-0.8.3" = { @@ -2992,15 +2767,6 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "mime-db-1.28.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.28.0.tgz"; - sha1 = "fedd349be06d2865b7fc57d837c6de4f17d7ac3c"; - }; - }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -3010,15 +2776,6 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -3046,13 +2803,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.8" = { + "normalize-package-data-2.4.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; - sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; }; }; "object-assign-4.1.1" = { @@ -3127,13 +2884,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.2" = { + "hosted-git-info-2.5.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; - sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c"; }; }; "is-builtin-module-1.0.0" = { @@ -3316,6 +3073,33 @@ let sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -3379,6 +3163,33 @@ let sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; }; }; + "debug-2.6.8" = { + name = "debug"; + packageName = "debug"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; + sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3433,13 +3244,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.6" = { + "buffer-5.0.7" = { name = "buffer"; packageName = "buffer"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; - sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz"; + sha1 = "570a290b625cf2603290c1149223d27ccf04db97"; }; }; "cached-path-relative-1.0.1" = { @@ -3478,13 +3289,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "crypto-browserify-3.11.0" = { + "crypto-browserify-3.11.1" = { name = "crypto-browserify"; packageName = "crypto-browserify"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; - sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz"; + sha1 = "948945efc6757a400d6e5e5af47194d10064279f"; }; }; "defined-1.0.0" = { @@ -3829,13 +3640,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.2.0" = { + "base64-js-1.2.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; + sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886"; }; }; "ieee754-1.1.8" = { @@ -3910,13 +3721,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.12" = { + "pbkdf2-3.0.13" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz"; - sha1 = "be36785c5067ea48d806ff923288c5f750b6b8a2"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz"; + sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25"; }; }; "public-encrypt-4.0.0" = { @@ -3955,13 +3766,13 @@ let sha1 = "daa277717470922ed2fe18594118a175439721dd"; }; }; - "evp_bytestokey-1.0.0" = { + "evp_bytestokey-1.0.2" = { name = "evp_bytestokey"; packageName = "evp_bytestokey"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"; - sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53"; + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz"; + sha1 = "f66bb88ecd57f71a766821e20283ea38c68bf80a"; }; }; "buffer-xor-1.0.3" = { @@ -3973,13 +3784,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.3" = { + "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; - sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; }; }; "des.js-1.0.0" = { @@ -4000,13 +3811,13 @@ let sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; }; }; - "bn.js-4.11.6" = { + "bn.js-4.11.8" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.6"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; - sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; }; }; "browserify-rsa-4.0.1" = { @@ -4045,13 +3856,13 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "hash.js-1.0.3" = { + "hash.js-1.1.3" = { name = "hash.js"; packageName = "hash.js"; - version = "1.0.3"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"; - sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha1 = "340dedbe6290187151c1ea1d777a3448935df846"; }; }; "hmac-drbg-1.0.1" = { @@ -4459,13 +4270,13 @@ let sha1 = "68261be4efb48840239b5791af23ee3b8bd79808"; }; }; - "xml2js-0.4.17" = { + "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; - version = "0.4.17"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; - sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; + sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; }; }; "xspfr-0.3.1" = { @@ -4846,6 +4657,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4954,22 +4774,22 @@ let sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; }; }; - "parse-torrent-file-4.0.2" = { + "parse-torrent-file-4.0.3" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; - sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; + sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37"; }; }; - "simple-get-2.6.0" = { + "simple-get-2.7.0" = { name = "simple-get"; packageName = "simple-get"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.6.0.tgz"; - sha1 = "bb01144db49b3d4c107615dcf48d3ee404b16e06"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; + sha1 = "ad37f926d08129237ff08c4f2edfd6f10e0380b5"; }; }; "thirty-two-1.0.2" = { @@ -4990,13 +4810,13 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; - "bencode-0.11.0" = { + "bencode-1.0.0" = { name = "bencode"; packageName = "bencode"; - version = "0.11.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz"; - sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64"; + url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; + sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e"; }; }; "simple-sha1-2.1.0" = { @@ -5017,6 +4837,15 @@ let sha1 = "b264ddaa4d49a1d67300061858ba9358c4adca14"; }; }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + }; "simple-concat-1.0.0" = { name = "simple-concat"; packageName = "simple-concat"; @@ -5026,13 +4855,13 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; + "mimic-response-1.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; }; }; "once-1.2.0" = { @@ -5431,13 +5260,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.2" = { + "k-rpc-socket-1.7.1" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; - sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz"; + sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95"; }; }; "bencode-0.8.0" = { @@ -5512,13 +5341,13 @@ let sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; }; }; - "ipaddr.js-1.3.0" = { + "ipaddr.js-1.5.2" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.3.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; - sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz"; + sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0"; }; }; "get-browser-rtc-1.0.2" = { @@ -5539,6 +5368,15 @@ let sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80"; }; }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + }; + }; "ultron-1.1.0" = { name = "ultron"; packageName = "ultron"; @@ -5836,40 +5674,40 @@ let sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; }; }; - "voc-0.5.0" = { + "voc-1.0.0" = { name = "voc"; packageName = "voc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-0.5.0.tgz"; - sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; - }; - }; - "exit-on-epipe-1.0.0" = { - name = "exit-on-epipe"; - packageName = "exit-on-epipe"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz"; - sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; + url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; + sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae"; }; }; - "sax-1.2.2" = { + "exit-on-epipe-1.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + }; + }; + "sax-1.2.4" = { name = "sax"; packageName = "sax"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; - sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; }; - "xmlbuilder-4.2.1" = { + "xmlbuilder-9.0.4" = { name = "xmlbuilder"; packageName = "xmlbuilder"; - version = "4.2.1"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; - sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; + sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; }; }; "configstore-2.1.0" = { @@ -6097,13 +5935,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.23" = { + "big-integer-1.6.24" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.23"; + version = "1.6.24"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz"; - sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz"; + sha1 = "1ed84d018ac3c1c72b307e7f7d94008e8ee20311"; }; }; "sax-0.3.5" = { @@ -6259,6 +6097,15 @@ let sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; + "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"; + }; + }; "shelljs-0.3.0" = { name = "shelljs"; packageName = "shelljs"; @@ -6313,13 +6160,13 @@ let sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "acorn-5.0.3" = { + "acorn-5.1.1" = { name = "acorn"; packageName = "acorn"; - version = "5.0.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; - sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"; + sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75"; }; }; "foreach-2.0.5" = { @@ -6430,58 +6277,49 @@ let sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "compression-1.6.2" = { + "compression-1.7.0" = { name = "compression"; packageName = "compression"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz"; - sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz"; + sha1 = "030c9f198f1643a057d776a738e922da4373012d"; }; }; - "express-4.15.3" = { + "express-4.15.4" = { name = "express"; packageName = "express"; - version = "4.15.3"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; + sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; }; }; - "accepts-1.3.3" = { + "accepts-1.3.4" = { name = "accepts"; packageName = "accepts"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; + sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; }; }; - "bytes-2.3.0" = { + "bytes-2.5.0" = { name = "bytes"; packageName = "bytes"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"; - sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; + url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; + sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; }; }; - "compressible-2.0.10" = { + "compressible-2.0.11" = { name = "compressible"; packageName = "compressible"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; - sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; - }; - }; - "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"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz"; + sha1 = "16718a75de283ed8e604041625a2064586797d8a"; }; }; "on-headers-1.0.1" = { @@ -6511,15 +6349,6 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6565,22 +6394,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; - "depd-1.1.0" = { + "depd-1.1.1" = { name = "depd"; packageName = "depd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; "encodeurl-1.0.1" = { @@ -6610,13 +6430,13 @@ let sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-1.0.3" = { + "finalhandler-1.0.4" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz"; - sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; + sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"; }; }; "fresh-0.5.0" = { @@ -6673,40 +6493,40 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.4" = { + "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; - sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "qs-6.4.0" = { + "qs-6.5.0" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49"; }; }; - "send-0.15.3" = { + "send-0.15.4" = { name = "send"; packageName = "send"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; + sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; }; }; - "serve-static-1.12.3" = { + "serve-static-1.12.4" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; + sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; }; }; "setprototypeof-1.0.3" = { @@ -6772,6 +6592,15 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; + "ipaddr.js-1.4.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -6781,13 +6610,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.1" = { + "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; "mime-1.3.4" = { @@ -6835,13 +6664,13 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "read-package-json-2.0.5" = { + "read-package-json-2.0.12" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.5"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz"; - sha1 = "f93a64e641529df68a08c64de46389e8a3f88845"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; + sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951"; }; }; "validate-npm-package-name-3.0.0" = { @@ -6853,22 +6682,22 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "json-parse-helpfulerror-1.0.3" = { - name = "json-parse-helpfulerror"; - packageName = "json-parse-helpfulerror"; - version = "1.0.3"; + "json-parse-better-errors-1.0.1" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; - sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; + sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a"; }; }; - "jju-1.3.0" = { - name = "jju"; - packageName = "jju"; - version = "1.3.0"; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; - sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; }; }; "builtins-1.0.3" = { @@ -7132,6 +6961,15 @@ let sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4"; }; }; + "normalize-package-data-2.3.8" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; + sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + }; + }; "npm-cache-filename-1.0.2" = { name = "npm-cache-filename"; packageName = "npm-cache-filename"; @@ -7294,6 +7132,15 @@ let sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; }; }; + "which-1.2.14" = { + name = "which"; + packageName = "which"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + }; + }; "write-file-atomic-1.1.4" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -7798,13 +7645,13 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; - "duplexify-3.5.0" = { + "duplexify-3.5.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; - sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; + sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd"; }; }; "infinity-agent-2.0.3" = { @@ -7879,6 +7726,15 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; + "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"; @@ -8321,6 +8177,24 @@ let sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; + "bindings-1.3.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; + sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"; + }; + }; + "nan-2.6.2" = { + name = "nan"; + packageName = "nan"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + }; + }; "jsonparse-0.0.6" = { name = "jsonparse"; packageName = "jsonparse"; @@ -8450,24 +8324,6 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "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"; - }; - }; - "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"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -8567,13 +8423,13 @@ let sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "cors-2.8.3" = { + "cors-2.8.4" = { name = "cors"; packageName = "cors"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; + sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; }; }; "docker-parse-image-3.0.1" = { @@ -8585,15 +8441,6 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "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"; - }; - }; "from2-1.3.0" = { name = "from2"; packageName = "from2"; @@ -8999,6 +8846,15 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "nan-2.1.0" = { name = "nan"; packageName = "nan"; @@ -9062,13 +8918,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.72.0" = { + "aws-sdk-2.104.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.72.0"; + version = "2.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.72.0.tgz"; - sha1 = "59021c14e354f34a4fb4f229ac10f8e36428f4d4"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.104.0.tgz"; + sha1 = "335e0553380c0ae8dd43d11b76d73dfb926f6333"; }; }; "request-2.81.0" = { @@ -9116,6 +8972,24 @@ let sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; }; }; + "xml2js-0.4.17" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; + sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; + }; + }; + "xmlbuilder-4.2.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; + sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -9143,6 +9017,15 @@ let 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"; + }; + }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -9188,13 +9071,22 @@ let sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "clipboardy-0.1.2" = { + "auto-bind-1.1.0" = { + name = "auto-bind"; + packageName = "auto-bind"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz"; + sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961"; + }; + }; + "clipboardy-1.1.4" = { name = "clipboardy"; packageName = "clipboardy"; - version = "0.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz"; - sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.1.4.tgz"; + sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; }; }; "conf-1.1.2" = { @@ -9206,13 +9098,49 @@ let sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50"; }; }; - "got-6.7.1" = { + "got-7.1.0" = { name = "got"; packageName = "got"; - version = "6.7.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; + sha1 = "05450fd84094e6bbea56f451a43a9c289166385a"; + }; + }; + "has-ansi-3.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; + sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; + }; + }; + "import-jsx-1.3.0" = { + name = "import-jsx"; + packageName = "import-jsx"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; + sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb"; + }; + }; + "ink-0.3.1" = { + name = "ink"; + packageName = "ink"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; + sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213"; + }; + }; + "ink-text-input-1.1.0" = { + name = "ink-text-input"; + packageName = "ink-text-input"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz"; + sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1"; }; }; "lodash.debounce-4.0.8" = { @@ -9224,15 +9152,6 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; - }; - }; "mem-1.1.0" = { name = "mem"; packageName = "mem"; @@ -9251,31 +9170,31 @@ let sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; }; }; - "execa-0.5.1" = { + "execa-0.6.3" = { name = "execa"; packageName = "execa"; - version = "0.5.1"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; - sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; }; }; - "cross-spawn-4.0.2" = { + "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "4.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "get-stream-2.3.1" = { + "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; "npm-run-path-2.0.2" = { @@ -9314,6 +9233,24 @@ let sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -9323,13 +9260,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "dot-prop-4.1.1" = { + "dot-prop-4.2.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; - sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; }; "env-paths-1.0.0" = { @@ -9404,15 +9341,6 @@ let sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - }; "duplexer3-0.1.4" = { name = "duplexer3"; packageName = "duplexer3"; @@ -9422,15 +9350,6 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "is-retry-allowed-1.1.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -9440,6 +9359,33 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"; + }; + }; + "p-cancelable-0.3.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa"; + }; + }; + "p-timeout-1.2.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz"; + sha1 = "9820f99434c5817868b4f34809ee5291660d5b6c"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -9458,13 +9404,544 @@ let sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; }; }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "has-to-string-tag-x-1.4.0" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz"; + sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "has-symbol-support-x-1.4.0" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz"; + sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256"; + }; + }; + "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-core-6.26.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; + sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; + }; + }; + "babel-plugin-transform-es2015-destructuring-6.23.0" = { + name = "babel-plugin-transform-es2015-destructuring"; + packageName = "babel-plugin-transform-es2015-destructuring"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; + }; + }; + "babel-plugin-transform-object-rest-spread-6.26.0" = { + name = "babel-plugin-transform-object-rest-spread"; + packageName = "babel-plugin-transform-object-rest-spread"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; + sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; + }; + }; + "babel-plugin-transform-react-jsx-6.24.1" = { + name = "babel-plugin-transform-react-jsx"; + packageName = "babel-plugin-transform-react-jsx"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; + sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "require-from-string-1.2.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; + sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "babel-code-frame-6.26.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + }; + "babel-generator-6.26.0" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; + sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; + }; + }; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + }; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + }; + "babel-register-6.26.0" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babel-template-6.26.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + }; + "babel-traverse-6.26.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + }; + "babel-types-6.26.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"; + }; + }; + "convert-source-map-1.5.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "private-0.1.7" = { + name = "private"; + packageName = "private"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + }; + "trim-right-1.0.1" = { + name = "trim-right"; + packageName = "trim-right"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + }; + "core-js-2.5.0" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz"; + sha1 = "569c050918be6486b3837552028ae0466b717086"; + }; + }; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + }; + "source-map-support-0.4.16" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.16"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz"; + sha1 = "16fecf98212467d017d586a2af68d628b9421cd8"; + }; + }; + "regenerator-runtime-0.11.0" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"; + sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1"; + }; + }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + }; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + }; + }; + "to-fast-properties-1.0.3" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + }; + "babel-plugin-syntax-object-rest-spread-6.13.0" = { + name = "babel-plugin-syntax-object-rest-spread"; + packageName = "babel-plugin-syntax-object-rest-spread"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; + }; + }; + "babel-helper-builder-react-jsx-6.26.0" = { + name = "babel-helper-builder-react-jsx"; + packageName = "babel-helper-builder-react-jsx"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz"; + sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; + }; + }; + "babel-plugin-syntax-jsx-6.18.0" = { + name = "babel-plugin-syntax-jsx"; + packageName = "babel-plugin-syntax-jsx"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + 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"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "log-update-2.1.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-2.1.0.tgz"; + sha1 = "ea37258b5354edb02e73b29190016c87d1c87141"; + }; + }; + "prop-types-15.5.10" = { + name = "prop-types"; + packageName = "prop-types"; + version = "15.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz"; + sha1 = "2797dfc3126182e3a95e3dfbb2e893ddd7456154"; + }; + }; + "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"; + sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88"; + }; + }; + "supports-color-4.2.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"; + sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "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"; + }; + }; + "ansi-escapes-2.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; + sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "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"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; "mimic-fn-1.1.0" = { @@ -9476,6 +9953,114 @@ let sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; }; }; + "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"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + }; + "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.14" = { + name = "fbjs"; + packageName = "fbjs"; + version = "0.8.14"; + src = fetchurl { + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz"; + sha1 = "d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"; + }; + }; + "core-js-1.2.7" = { + name = "core-js"; + packageName = "core-js"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; + sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; + }; + }; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "ua-parser-js-0.7.14" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.14"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz"; + sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca"; + }; + }; + "node-fetch-1.7.2" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz"; + sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7"; + }; + }; + "whatwg-fetch-2.0.3" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "iconv-lite-0.4.18" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; + sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; + }; + }; "unicode-emoji-modifier-base-1.0.0" = { name = "unicode-emoji-modifier-base"; packageName = "unicode-emoji-modifier-base"; @@ -9485,6 +10070,15 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; + "ajv-5.2.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; + sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; + }; + }; "doctrine-2.0.0" = { name = "doctrine"; packageName = "doctrine"; @@ -9503,13 +10097,13 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "espree-3.4.3" = { + "espree-3.5.0" = { name = "espree"; packageName = "espree"; - version = "3.4.3"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz"; - sha1 = "2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz"; + sha1 = "98358625bdd055861ea27e2867ea729faf463d8d"; }; }; "esquery-1.0.0" = { @@ -9539,22 +10133,31 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "ignore-3.3.3" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.3"; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz"; - sha1 = "432352e57accd87ab3110e82d3fea0e47812156d"; + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "inquirer-3.1.0" = { + "ignore-3.3.4" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz"; + sha1 = "85ab6d0a9ca8b27b31604c09efe1c14dc21ab872"; + }; + }; + "inquirer-3.2.2" = { name = "inquirer"; packageName = "inquirer"; - version = "3.1.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.1.0.tgz"; - sha1 = "e05400d48b94937c2d3caa7038663ba9189aab01"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz"; + sha1 = "c2aaede1507cc54d826818737742d621bef2e823"; }; }; "is-resolvable-1.0.0" = { @@ -9566,13 +10169,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.4" = { + "js-yaml-3.9.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.4"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; + sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0"; }; }; "levn-0.3.0" = { @@ -9638,22 +10241,31 @@ let sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; }; }; - "esrecurse-4.1.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.1.0"; + "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/esrecurse/-/esrecurse-4.1.0.tgz"; - sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; }; }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; + "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/estraverse/-/estraverse-4.1.1.tgz"; - sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; + "esrecurse-4.2.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; + sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; "acorn-jsx-3.0.1" = { @@ -9683,13 +10295,13 @@ let sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; }; }; - "circular-json-0.3.1" = { + "circular-json-0.3.3" = { name = "circular-json"; packageName = "circular-json"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz"; - sha1 = "be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; + sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; }; }; "del-2.2.2" = { @@ -9746,15 +10358,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -9773,31 +10376,13 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; - "ansi-escapes-2.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; - sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "cli-width-2.1.0" = { + "cli-width-2.2.0" = { name = "cli-width"; packageName = "cli-width"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz"; - sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; }; "external-editor-2.0.4" = { @@ -9845,49 +10430,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "string-width-2.0.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "iconv-lite-0.4.18" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.18"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; - sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; - }; - }; - "jschardet-1.4.2" = { + "jschardet-1.5.1" = { name = "jschardet"; packageName = "jschardet"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"; - sha1 = "2aa107f142af4121d145659d44f50830961e699a"; + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz"; + sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9"; }; }; "tmp-0.0.31" = { @@ -9908,15 +10457,6 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; - "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"; - }; - }; "tryit-1.0.3" = { name = "tryit"; packageName = "tryit"; @@ -9935,13 +10475,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-3.1.3" = { + "esprima-4.0.0" = { name = "esprima"; packageName = "esprima"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804"; }; }; "prelude-ls-1.1.2" = { @@ -10034,13 +10574,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "eslint-3.19.0" = { + "eslint-4.5.0" = { name = "eslint"; packageName = "eslint"; - version = "3.19.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.5.0.tgz"; + sha1 = "bb75d3b8bde97fb5e13efcd539744677feb019c3"; }; }; "supports-color-3.2.3" = { @@ -10052,132 +10592,6 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; - }; - }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; - }; - }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; - "table-3.8.3" = { - name = "table"; - packageName = "table"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - }; - "es6-weak-map-2.0.2" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; - sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; - }; - }; - "d-1.0.0" = { - name = "d"; - packageName = "d"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; - sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; - }; - }; - "es5-ext-0.10.23" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.23"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz"; - sha1 = "7578b51be974207a5487821b56538c224e4e7b38"; - }; - }; - "es6-iterator-2.0.1" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; - sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; - }; - }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; - "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"; - }; - }; "has-flag-1.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -10187,6 +10601,204 @@ let sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "ora-1.3.0" = { + name = "ora"; + packageName = "ora"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; + sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + }; + }; + "phantomjs-prebuilt-2.1.15" = { + name = "phantomjs-prebuilt"; + packageName = "phantomjs-prebuilt"; + version = "2.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz"; + sha1 = "20f86e82d3349c505917527745b7a411e08b3903"; + }; + }; + "promise-phantom-3.1.6" = { + name = "promise-phantom"; + packageName = "promise-phantom"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; + sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + }; + }; + "zen-observable-0.5.2" = { + name = "zen-observable"; + packageName = "zen-observable"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; + sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a"; + }; + }; + "cli-spinners-1.0.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz"; + sha1 = "ef987ed3d48391ac3dab9180b406a742180d6e6a"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "es6-promise-4.0.5" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz"; + sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42"; + }; + }; + "extract-zip-1.6.5" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz"; + sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440"; + }; + }; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + }; + }; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + }; + }; + "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"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "yauzl-2.4.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; + sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + }; + }; + "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"; + }; + }; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "mkpath-1.0.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; + sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; + }; + }; + "node-phantom-simple-2.2.4" = { + name = "node-phantom-simple"; + packageName = "node-phantom-simple"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; + sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; + }; + }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -10349,13 +10961,13 @@ let sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }; }; - "anymatch-1.3.0" = { + "anymatch-1.3.2" = { name = "anymatch"; packageName = "anymatch"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"; - sha1 = "a3e52fa39168c825ff57b0248126ce5a8ff95507"; + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; }; }; "async-each-1.0.1" = { @@ -10421,6 +11033,15 @@ let 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"; @@ -10475,24 +11096,6 @@ let 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"; - }; - }; - "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"; - }; - }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -10520,13 +11123,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.3" = { + "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"; - sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; }; }; "expand-range-1.8.2" = { @@ -10592,15 +11195,6 @@ let sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c"; }; }; - "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"; @@ -10628,15 +11222,6 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "remove-trailing-separator-1.0.2" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; - sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; - }; - }; "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; @@ -10700,13 +11285,22 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "binary-extensions-1.8.0" = { + "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.10.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"; - sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz"; + sha1 = "9aeb9a6c5e88638aad171e167f5900abe24835d0"; }; }; "set-immediate-shim-1.0.1" = { @@ -10727,13 +11321,13 @@ let sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; }; }; - "npmlog-4.1.0" = { + "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz"; - sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; }; "tar-pack-3.4.0" = { @@ -10781,6 +11375,15 @@ let sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1"; }; }; + "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"; + }; + }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -10889,13 +11492,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.73.0" = { + "simple-git-1.75.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.73.0"; + version = "1.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz"; - sha1 = "87683a729b1bee016a3182f95a2ab72317bb0230"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.75.0.tgz"; + sha1 = "eaddc90118b40a1dca3837d51c50ac064ee1d288"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10935,13 +11538,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.6" = { + "coffee-script-1.12.7" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; }; "jade-1.11.0" = { @@ -10980,13 +11583,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.27" = { + "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.27"; + version = "3.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz"; - sha1 = "adef75b31c160ffa5d72f4de67966e2660c1a255"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; + sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; "commander-2.6.0" = { @@ -11070,6 +11673,15 @@ let sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; }; }; + "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"; + }; + }; "acorn-2.7.0" = { name = "acorn"; packageName = "acorn"; @@ -11160,96 +11772,6 @@ let sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; "acorn-1.2.2" = { name = "acorn"; packageName = "acorn"; @@ -11637,13 +12159,13 @@ let sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; }; }; - "fined-1.0.2" = { + "fined-1.1.0" = { name = "fined"; packageName = "fined"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"; - sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; "flagged-respawn-0.3.2" = { @@ -11718,31 +12240,40 @@ let sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; }; }; - "lodash.assignwith-4.2.0" = { - name = "lodash.assignwith"; - packageName = "lodash.assignwith"; - version = "4.2.0"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; - sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "lodash.isempty-4.4.0" = { - name = "lodash.isempty"; - packageName = "lodash.isempty"; - version = "4.4.0"; + "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.isempty/-/lodash.isempty-4.4.0.tgz"; - sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + 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" = { @@ -11754,6 +12285,42 @@ let 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"; + }; + }; + "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.0.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; + sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + }; + }; + "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-0.2.6" = { name = "is-absolute"; packageName = "is-absolute"; @@ -12240,40 +12807,40 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "@reactivex/rxjs-5.4.1" = { + "@reactivex/rxjs-5.4.3" = { name = "@reactivex/rxjs"; packageName = "@reactivex/rxjs"; - version = "5.4.1"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.1.tgz"; - sha1 = "e472c38c84eb411690f281253d3a93a3466ad041"; + url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz"; + sha1 = "d28f83ed19f10cf4bc9dc84db3c424788a1c541e"; }; }; - "chai-4.0.2" = { + "chai-4.1.1" = { name = "chai"; packageName = "chai"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz"; - sha1 = "2f7327c4de6f385dd7787999e2ab02697a32b83b"; + url = "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz"; + sha1 = "66e21279e6f3c6415ff8231878227900e2171b39"; }; }; - "chai-as-promised-7.0.0" = { + "chai-as-promised-7.1.1" = { name = "chai-as-promised"; packageName = "chai-as-promised"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.0.0.tgz"; - sha1 = "c87ee613eaa196766393da6fbb4052f112acf675"; + url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; + sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0"; }; }; - "fast-json-patch-1.2.2" = { + "fast-json-patch-2.0.4" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "1.2.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; - sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.4.tgz"; + sha1 = "6aa2b2918ff6f5a16daddf2745547a9ccf36a9fb"; }; }; "iterare-0.0.8" = { @@ -12285,6 +12852,15 @@ let sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; }; }; + "jaeger-client-3.5.3" = { + name = "jaeger-client"; + packageName = "jaeger-client"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.5.3.tgz"; + sha1 = "30a3989642ee3e8ea06d10c2b9f9e046d424d8ed"; + }; + }; "mz-2.6.0" = { name = "mz"; packageName = "mz"; @@ -12339,13 +12915,13 @@ let sha1 = "3d38321828231e434f287514959c37a82b629f42"; }; }; - "vscode-jsonrpc-3.3.0" = { + "vscode-jsonrpc-3.3.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.0.tgz"; - sha1 = "03bdab0b10f04727ec3b8d403cd511a8a365b13d"; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"; + sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67"; }; }; "vscode-languageserver-3.3.0" = { @@ -12438,6 +13014,78 @@ let sha1 = "46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55"; }; }; + "node-int64-0.4.0" = { + name = "node-int64"; + packageName = "node-int64"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + }; + "thriftrw-3.11.1" = { + name = "thriftrw"; + packageName = "thriftrw"; + version = "3.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; + sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; + }; + }; + "xorshift-0.2.1" = { + name = "xorshift"; + packageName = "xorshift"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xorshift/-/xorshift-0.2.1.tgz"; + sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; + }; + }; + "opentracing-0.13.0" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; + sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; + }; + }; + "bufrw-1.2.1" = { + name = "bufrw"; + packageName = "bufrw"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; + sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; + }; + }; + "error-7.0.2" = { + name = "error"; + packageName = "error"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz"; + sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; + }; + }; + "ansi-color-0.2.1" = { + name = "ansi-color"; + packageName = "ansi-color"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; + sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; + }; + }; + "string-template-0.2.1" = { + name = "string-template"; + packageName = "string-template"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; + sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + }; + }; "any-promise-1.3.0" = { name = "any-promise"; packageName = "any-promise"; @@ -12483,6 +13131,123 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; + "editorconfig-0.13.3" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; + sha1 = "e5219e587951d60958fd94ea9a9a008cdeff1b34"; + }; + }; + "bluebird-3.5.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; + sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + }; + }; + "lru-cache-3.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; + sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; + }; + }; + "graphlib-2.1.1" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; + sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; + }; + }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; + "path-loader-1.0.2" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.2.tgz"; + sha1 = "cd5c73e7e39a91011be148d6bfdd8a85bb931ef9"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "superagent-3.6.0" = { + name = "superagent"; + packageName = "superagent"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz"; + sha1 = "eb679651057c3462199c7b902b696c25350e1b87"; + }; + }; + "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"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "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"; + }; + }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + }; + }; "body-parser-1.17.2" = { name = "body-parser"; packageName = "body-parser"; @@ -12510,6 +13275,24 @@ let sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; + "express-urlrewrite-1.2.0" = { + name = "express-urlrewrite"; + packageName = "express-urlrewrite"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; + sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; + }; + }; + "json-parse-helpfulerror-1.0.3" = { + name = "json-parse-helpfulerror"; + packageName = "json-parse-helpfulerror"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; + sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + }; + }; "lodash-id-0.13.0" = { name = "lodash-id"; packageName = "lodash-id"; @@ -12546,6 +13329,15 @@ let sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687"; }; }; + "please-upgrade-node-3.0.1" = { + name = "please-upgrade-node"; + packageName = "please-upgrade-node"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; + sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; + }; + }; "pluralize-3.1.0" = { name = "pluralize"; packageName = "pluralize"; @@ -12600,6 +13392,15 @@ let sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; }; }; + "debug-2.6.7" = { + name = "debug"; + packageName = "debug"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; + sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + }; + }; "iconv-lite-0.4.15" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -12618,6 +13419,24 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "jju-1.3.0" = { + name = "jju"; + packageName = "jju"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; + sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -12717,6 +13536,15 @@ let sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; }; }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; "node-status-codes-1.0.0" = { name = "node-status-codes"; packageName = "node-status-codes"; @@ -12744,6 +13572,15 @@ let sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; }; }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "camelcase-3.0.0" = { name = "camelcase"; packageName = "camelcase"; @@ -12852,15 +13689,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "bluebird-3.5.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; - sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; - }; - }; "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; @@ -12870,13 +13698,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.6.2" = { + "connect-3.6.3" = { name = "connect"; packageName = "connect"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz"; - sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz"; + sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301"; }; }; "di-0.0.1" = { @@ -12951,13 +13779,13 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "useragent-2.1.13" = { + "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; - version = "2.1.13"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz"; - sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; "custom-event-1.0.1" = { @@ -13113,6 +13941,15 @@ let sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; + "accepts-1.3.3" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; + sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + }; + }; "base64id-1.0.0" = { name = "base64id"; packageName = "base64id"; @@ -13203,15 +14040,6 @@ let sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; "engine.io-client-1.8.3" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -13347,13 +14175,13 @@ let sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "passport-0.3.2" = { + "passport-0.4.0" = { name = "passport"; packageName = "passport"; - version = "0.3.2"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; - sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; + url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz"; + sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; }; }; "passport-google-oauth-1.0.0" = { @@ -13833,6 +14661,654 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "command-join-2.0.0" = { + name = "command-join"; + packageName = "command-join"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; + sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; + }; + }; + "conventional-changelog-cli-1.3.2" = { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz"; + sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125"; + }; + }; + "conventional-recommended-bump-1.0.1" = { + name = "conventional-recommended-bump"; + packageName = "conventional-recommended-bump"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz"; + sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c"; + }; + }; + "dedent-0.7.0" = { + name = "dedent"; + packageName = "dedent"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + }; + }; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + }; + }; + "fs-extra-4.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz"; + sha1 = "7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"; + }; + }; + "get-port-3.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; + sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "is-ci-1.0.10" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; + sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + }; + }; + "load-json-file-3.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-3.0.0.tgz"; + sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440"; + }; + }; + "read-cmd-shim-1.0.1" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "strong-log-transformer-1.0.6" = { + name = "strong-log-transformer"; + packageName = "strong-log-transformer"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; + sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + }; + }; + "temp-write-3.3.0" = { + name = "temp-write"; + packageName = "temp-write"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; + sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + }; + }; + "write-file-atomic-2.3.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; + sha1 = "1ff61575c2e2a4e8e510d6fa4e243cce183999ab"; + }; + }; + "write-json-file-2.2.0" = { + name = "write-json-file"; + packageName = "write-json-file"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz"; + sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876"; + }; + }; + "write-pkg-3.1.0" = { + name = "write-pkg"; + packageName = "write-pkg"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; + sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "add-stream-1.0.0" = { + name = "add-stream"; + packageName = "add-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; + sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + }; + }; + "conventional-changelog-1.1.4" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz"; + sha1 = "108bc750c2a317e200e2f9b413caaa1f8c7efa3b"; + }; + }; + "tempfile-1.1.1" = { + name = "tempfile"; + packageName = "tempfile"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; + sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + }; + }; + "conventional-changelog-angular-1.4.0" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz"; + sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b"; + }; + }; + "conventional-changelog-atom-0.1.1" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz"; + sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f"; + }; + }; + "conventional-changelog-codemirror-0.1.0" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz"; + sha1 = "7577a591dbf9b538e7a150a7ee62f65a2872b334"; + }; + }; + "conventional-changelog-core-1.9.0" = { + name = "conventional-changelog-core"; + packageName = "conventional-changelog-core"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz"; + sha1 = "de5dfbc091847656508d4a389e35c9a1bc49e7f4"; + }; + }; + "conventional-changelog-ember-0.2.6" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz"; + sha1 = "8b7355419f5127493c4c562473ab2fc792f1c2b6"; + }; + }; + "conventional-changelog-eslint-0.1.0" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz"; + sha1 = "a52411e999e0501ce500b856b0a643d0330907e2"; + }; + }; + "conventional-changelog-express-0.1.0" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz"; + sha1 = "55c6c841c811962036c037bdbd964a54ae310fce"; + }; + }; + "conventional-changelog-jquery-0.1.0" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; + sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; + }; + }; + "conventional-changelog-jscs-0.1.0" = { + name = "conventional-changelog-jscs"; + packageName = "conventional-changelog-jscs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; + sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; + }; + }; + "conventional-changelog-jshint-0.1.0" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz"; + sha1 = "00cab8e9a3317487abd94c4d84671342918d2a07"; + }; + }; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + }; + }; + "github-url-from-git-1.5.0" = { + name = "github-url-from-git"; + packageName = "github-url-from-git"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz"; + sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + }; + }; + "conventional-changelog-writer-1.4.1" = { + name = "conventional-changelog-writer"; + packageName = "conventional-changelog-writer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz"; + sha1 = "3f4cb4d003ebb56989d30d345893b52a43639c8e"; + }; + }; + "conventional-commits-parser-1.3.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz"; + sha1 = "e327b53194e1a7ad5dc63479ee9099a52b024865"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "get-pkg-repo-1.4.0" = { + name = "get-pkg-repo"; + packageName = "get-pkg-repo"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz"; + sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; + }; + }; + "git-raw-commits-1.2.0" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz"; + sha1 = "0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"; + }; + }; + "git-remote-origin-url-2.0.0" = { + name = "git-remote-origin-url"; + packageName = "git-remote-origin-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"; + sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; + }; + }; + "git-semver-tags-1.2.1" = { + name = "git-semver-tags"; + packageName = "git-semver-tags"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz"; + sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490"; + }; + }; + "conventional-commits-filter-1.0.0" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz"; + sha1 = "6fc2a659372bc3f2339cf9ffff7e1b0344b93039"; + }; + }; + "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"; + sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + }; + }; + "is-subset-0.1.1" = { + name = "is-subset"; + packageName = "is-subset"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; + }; + }; + "modify-values-1.0.0" = { + name = "modify-values"; + packageName = "modify-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; + sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + }; + }; + "is-text-path-1.0.1" = { + name = "is-text-path"; + packageName = "is-text-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + }; + }; + "trim-off-newlines-1.0.1" = { + name = "trim-off-newlines"; + packageName = "trim-off-newlines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; + sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + }; + }; + "text-extensions-1.5.0" = { + name = "text-extensions"; + packageName = "text-extensions"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz"; + sha1 = "d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"; + }; + }; + "parse-github-repo-url-1.4.0" = { + name = "parse-github-repo-url"; + packageName = "parse-github-repo-url"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz"; + sha1 = "286c53e2c9962e0641649ee3ac9508fca4dd959c"; + }; + }; + "dargs-4.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; + sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; + }; + }; + "lodash.template-4.4.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; + sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + }; + }; + "lodash.templatesettings-4.1.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; + sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + }; + }; + "gitconfiglocal-1.0.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"; + sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; + }; + }; + "conventional-commits-parser-2.0.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz"; + sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "universalify-0.1.1" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; + sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + }; + }; + "ci-info-1.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; + sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; + }; + }; + "parse-json-3.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; + sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + }; + "minimist-0.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + 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"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; "vinyl-1.2.0" = { name = "vinyl"; packageName = "vinyl"; @@ -13887,15 +15363,6 @@ let sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "lodash.isequal-4.5.0" = { - name = "lodash.isequal"; - packageName = "lodash.isequal"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; - }; - }; "merge-stream-1.0.1" = { name = "merge-stream"; packageName = "merge-stream"; @@ -14004,6 +15471,213 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; + "markdown-it-8.4.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; + sha1 = "e2400881bf171f7018ed1bd9da441dac8af6306d"; + }; + }; + "markdown-it-emoji-1.4.0" = { + name = "markdown-it-emoji"; + packageName = "markdown-it-emoji"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; + sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; + }; + }; + "markdown-it-github-headings-1.0.1" = { + name = "markdown-it-github-headings"; + packageName = "markdown-it-github-headings"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.0.1.tgz"; + sha1 = "ac3e694de3fa3f0296961f4057f5160143fc2710"; + }; + }; + "markdown-it-task-checkbox-1.0.4" = { + name = "markdown-it-task-checkbox"; + packageName = "markdown-it-task-checkbox"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.4.tgz"; + sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581"; + }; + }; + "opn-5.1.0" = { + name = "opn"; + packageName = "opn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; + sha1 = "72ce2306a17dbea58ff1041853352b4a8fc77519"; + }; + }; + "socket.io-2.0.3" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz"; + sha1 = "4359f06a24933ae6bd087798af78c680eae345e3"; + }; + }; + "linkify-it-2.0.3" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; + sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; + }; + }; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + }; + "uc.micro-1.0.3" = { + name = "uc.micro"; + packageName = "uc.micro"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + }; + }; + "github-slugger-1.1.3" = { + name = "github-slugger"; + packageName = "github-slugger"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.1.3.tgz"; + sha1 = "314a6e759a18c2b0cc5760d512ccbab549c549a7"; + }; + }; + "innertext-1.0.2" = { + name = "innertext"; + packageName = "innertext"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz"; + sha1 = "11a197b3143a593636fba5d59213835e6954580a"; + }; + }; + "emoji-regex-6.1.1" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; + sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + }; + }; + "html-entities-1.2.1" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "engine.io-3.1.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz"; + sha1 = "5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e"; + }; + }; + "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.3" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz"; + sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b"; + }; + }; + "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.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz"; + sha1 = "415a9852badb14fa008fa3ef1e31608db6761325"; + }; + }; "express-2.5.11" = { name = "express"; packageName = "express"; @@ -14130,13 +15804,13 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "debug-2.6.0" = { - name = "debug"; - packageName = "debug"; - version = "2.6.0"; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; "diff-3.2.0" = { @@ -14211,40 +15885,40 @@ let sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-8.4.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c"; }; }; - "npmconf-2.0.9" = { + "npmconf-2.1.2" = { name = "npmconf"; packageName = "npmconf"; - version = "2.0.9"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz"; - sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2"; + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; + sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; }; }; - "tar-1.0.3" = { + "tar-3.1.15" = { name = "tar"; packageName = "tar"; - version = "1.0.3"; + version = "3.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"; - sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44"; + url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz"; + sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f"; }; }; - "fs.extra-1.2.1" = { + "fs.extra-1.3.2" = { name = "fs.extra"; packageName = "fs.extra"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; - sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733"; + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; + sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; }; }; "findit-2.0.0" = { @@ -14265,31 +15939,13 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; + "ssri-4.1.6" = { + name = "ssri"; + packageName = "ssri"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; - "npmlog-3.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz"; - sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; - }; - }; - "gauge-2.6.0" = { - name = "gauge"; - packageName = "gauge"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; - sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; }; }; "uid-number-0.0.5" = { @@ -14301,6 +15957,33 @@ let sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; }; }; + "minipass-2.2.1" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; + sha1 = "5ada97538b1027b4cf7213432428578cb564011f"; + }; + }; + "minizlib-1.0.3" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz"; + sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5"; + }; + }; + "yallist-3.0.2" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; + sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + }; + }; "fs-extra-0.6.4" = { name = "fs-extra"; packageName = "fs-extra"; @@ -14310,13 +15993,13 @@ let sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; - "walk-2.2.1" = { + "walk-2.3.9" = { name = "walk"; packageName = "walk"; - version = "2.2.1"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; - sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016"; + url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; + sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; }; }; "jsonfile-1.0.1" = { @@ -14328,22 +16011,13 @@ let sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; }; }; - "forEachAsync-2.2.1" = { - name = "forEachAsync"; - packageName = "forEachAsync"; - version = "2.2.1"; + "foreachasync-3.0.0" = { + name = "foreachasync"; + packageName = "foreachasync"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz"; - sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec"; - }; - }; - "sequence-2.2.1" = { - name = "sequence"; - packageName = "sequence"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; }; }; "biased-opener-0.2.8" = { @@ -14589,22 +16263,13 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "bcryptjs-2.4.0" = { + "bcryptjs-2.4.3" = { name = "bcryptjs"; packageName = "bcryptjs"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz"; - sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678"; - }; - }; - "body-parser-1.15.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; - sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; "cheerio-0.22.0" = { @@ -14616,15 +16281,6 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "clone-2.1.0" = { - name = "clone"; - packageName = "clone"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; - sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; - }; - }; "cookie-parser-1.4.3" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -14634,13 +16290,13 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; - "cors-2.8.1" = { + "cors-2.8.3" = { name = "cors"; packageName = "cors"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; - sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; + sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; }; }; "cron-1.2.1" = { @@ -14652,31 +16308,31 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; - "express-4.14.0" = { + "express-4.15.3" = { name = "express"; packageName = "express"; - version = "4.14.0"; + version = "4.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; + sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; }; }; - "follow-redirects-1.2.1" = { + "express-session-1.15.2" = { + name = "express-session"; + packageName = "express-session"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; + }; + }; + "follow-redirects-1.2.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz"; - sha1 = "796c716970df4fb0096165393545040f61b00f59"; - }; - }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; + sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea"; }; }; "fs.notify-0.0.4" = { @@ -14688,6 +16344,15 @@ let sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "i18next-1.10.6" = { name = "i18next"; packageName = "i18next"; @@ -14697,31 +16362,40 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.4" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; + sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; }; }; - "jsonata-1.0.10" = { + "jsonata-1.2.6" = { name = "jsonata"; packageName = "jsonata"; - version = "1.0.10"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz"; - sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; + sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5"; }; }; - "mqtt-2.2.1" = { + "mqtt-2.9.0" = { name = "mqtt"; packageName = "mqtt"; - version = "2.2.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz"; - sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; + sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d"; + }; + }; + "multer-1.3.0" = { + name = "multer"; + packageName = "multer"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; + sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; }; }; "mustache-2.3.0" = { @@ -14733,13 +16407,22 @@ let sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; }; }; - "oauth2orize-1.7.0" = { + "oauth2orize-1.8.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz"; - sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; + sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; + }; + }; + "passport-0.3.2" = { + name = "passport"; + packageName = "passport"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; + sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; }; }; "passport-http-bearer-1.0.1" = { @@ -14769,22 +16452,22 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; - "uglify-js-2.7.5" = { + "uglify-js-3.0.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; + sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5"; }; }; - "when-3.7.7" = { + "when-3.7.8" = { name = "when"; packageName = "when"; - version = "3.7.7"; + version = "3.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; - sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; }; }; "ws-1.1.1" = { @@ -14805,13 +16488,13 @@ let sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; }; }; - "node-red-node-email-0.1.23" = { + "node-red-node-email-0.1.24" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.23"; + version = "0.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.23.tgz"; - sha1 = "ff910b8abb34ac926c1228e082d7667f92bb3737"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; + sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; }; }; "node-red-node-twitter-0.1.11" = { @@ -14832,40 +16515,13 @@ let sha1 = "a670c1542a6eaf5e06db45490c2a7edf8a9f70b6"; }; }; - "bcrypt-1.0.2" = { + "bcrypt-1.0.3" = { name = "bcrypt"; packageName = "bcrypt"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz"; - sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736"; - }; - }; - "http-errors-1.5.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; - sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; - }; - }; - "qs-6.2.0" = { - name = "qs"; - packageName = "qs"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; - sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; - }; - }; - "setprototypeof-1.0.2" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; - sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; + sha1 = "b02ddc6c0b52ea16b8d3cf375d5a32e780dab548"; }; }; "css-select-1.2.0" = { @@ -14958,6 +16614,15 @@ let sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; }; }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -15030,49 +16695,49 @@ let sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; - "content-disposition-0.5.1" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; - }; - }; - "finalhandler-0.5.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; - }; - }; - "send-0.14.1" = { + "send-0.15.3" = { name = "send"; packageName = "send"; - version = "0.14.1"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; + url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; + sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; }; }; - "serve-static-1.11.2" = { + "serve-static-1.12.3" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; - sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; + sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; }; }; - "send-0.14.2" = { - name = "send"; - packageName = "send"; - version = "0.14.2"; + "crc-3.4.4" = { + name = "crc"; + packageName = "crc"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; - sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + }; + }; + "debug-2.6.3" = { + name = "debug"; + packageName = "debug"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + }; + }; + "uid-safe-2.1.5" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; + sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"; }; }; "retry-0.6.1" = { @@ -15120,6 +16785,15 @@ let sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; }; }; + "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"; @@ -15138,13 +16812,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.3.0" = { + "mqtt-packet-5.4.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; - sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; + sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22"; }; }; "reinterval-1.1.0" = { @@ -15156,13 +16830,13 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "websocket-stream-3.3.3" = { + "websocket-stream-5.0.1" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.3"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; - sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz"; + sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700"; }; }; "leven-1.0.2" = { @@ -15219,6 +16893,51 @@ let sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; }; }; + "ws-3.1.0" = { + name = "ws"; + packageName = "ws"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz"; + sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c"; + }; + }; + "append-field-0.1.0" = { + name = "append-field"; + packageName = "append-field"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; + sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; + }; + }; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -15408,15 +17127,6 @@ let sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; "uue-3.1.0" = { name = "uue"; packageName = "uue"; @@ -15462,42 +17172,6 @@ let sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; - "nan-2.5.0" = { - name = "nan"; - packageName = "nan"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; - }; - }; - "node-pre-gyp-0.6.32" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.32"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; - sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; - }; - }; - "rc-1.1.7" = { - name = "rc"; - packageName = "rc"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; - sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; - }; - }; - "tar-pack-3.3.0" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; - sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; - }; - }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -15768,6 +17442,15 @@ let sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }; }; + "debug-3.0.1" = { + name = "debug"; + packageName = "debug"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz"; + sha1 = "0564c612b521dc92d9f2988f0549e34f9c98db64"; + }; + }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -16092,13 +17775,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "cacache-9.2.8" = { + "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; - version = "9.2.8"; + version = "9.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; - sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd"; }; }; "call-limit-1.1.0" = { @@ -16110,15 +17793,6 @@ let sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; }; }; - "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"; - }; - }; "fstream-npm-1.2.1" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -16137,6 +17811,15 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; + "libnpx-9.2.3" = { + name = "libnpx"; + packageName = "libnpx"; + version = "9.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz"; + sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -16209,15 +17892,6 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-8.3.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; - sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; - }; - }; "npm-user-validate-1.0.0" = { name = "npm-user-validate"; packageName = "npm-user-validate"; @@ -16236,13 +17910,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.36" = { + "pacote-2.7.38" = { name = "pacote"; packageName = "pacote"; - version = "2.7.36"; + version = "2.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; - sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz"; + sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1"; }; }; "promise-inflight-1.0.1" = { @@ -16254,15 +17928,6 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; - }; - }; "read-package-tree-5.1.6" = { name = "read-package-tree"; packageName = "read-package-tree"; @@ -16281,15 +17946,6 @@ let sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; - "ssri-4.1.6" = { - name = "ssri"; - packageName = "ssri"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; - }; - }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -16299,13 +17955,22 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "update-notifier-2.1.0" = { + "update-notifier-2.2.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; - sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + }; + }; + "worker-farm-1.4.1" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz"; + sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; }; }; "write-file-atomic-2.1.0" = { @@ -16344,6 +18009,15 @@ let sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093"; }; }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -16398,13 +18072,13 @@ let sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; }; }; - "copy-concurrently-1.0.3" = { + "copy-concurrently-1.0.5" = { name = "copy-concurrently"; packageName = "copy-concurrently"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz"; - sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250"; + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; }; }; "run-queue-1.0.3" = { @@ -16416,22 +18090,22 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.12" = { + "make-fetch-happen-2.5.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.12"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; - sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz"; + sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8"; }; }; - "npm-pick-manifest-1.0.3" = { + "npm-pick-manifest-1.0.4" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz"; - sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8"; }; }; "promise-retry-1.1.1" = { @@ -16461,13 +18135,13 @@ let sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; }; }; - "agentkeepalive-3.2.0" = { + "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; - sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha1 = "6d5de5829afd3be2712201a39275fd11c651857c"; }; }; "http-cache-semantics-3.7.3" = { @@ -16479,40 +18153,40 @@ let sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; }; }; - "http-proxy-agent-1.0.0" = { + "http-proxy-agent-2.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-1.0.0" = { + "https-proxy-agent-2.1.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; + sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443"; }; }; - "node-fetch-npm-2.0.1" = { + "node-fetch-npm-2.0.2" = { name = "node-fetch-npm"; packageName = "node-fetch-npm"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz"; - sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; + url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; + sha1 = "7258c9046182dca345b4208eda918daf33697ff7"; }; }; - "socks-proxy-agent-2.1.1" = { + "socks-proxy-agent-3.0.0" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; - sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; + sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245"; }; }; "humanize-ms-1.2.1" = { @@ -16524,22 +18198,31 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-2.1.1" = { + "agent-base-4.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "2.1.1"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; + sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a"; }; }; "socks-1.1.10" = { @@ -16596,22 +18279,31 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.1.0" = { + "boxen-1.2.1" = { name = "boxen"; packageName = "boxen"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz"; - sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; + sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; }; }; - "configstore-3.1.0" = { + "configstore-3.1.1" = { name = "configstore"; packageName = "configstore"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz"; - sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; + }; + }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; "latest-version-3.1.0" = { @@ -16623,15 +18315,6 @@ let sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; - "lazy-req-2.0.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; - sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; - }; - }; "xdg-basedir-3.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -16650,58 +18333,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "term-size-0.1.1" = { + "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz"; - sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca"; - }; - }; - "execa-0.4.0" = { - name = "execa"; - packageName = "execa"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; - }; - }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; - }; - }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; "unique-string-1.0.0" = { @@ -16731,6 +18369,24 @@ let sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -16776,15 +18432,6 @@ let sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; }; }; - "fs.extra-1.3.2" = { - name = "fs.extra"; - packageName = "fs.extra"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; - sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; - }; - }; "findit-1.2.0" = { name = "findit"; packageName = "findit"; @@ -16893,24 +18540,6 @@ let sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }; }; - "walk-2.3.9" = { - name = "walk"; - packageName = "walk"; - version = "2.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; - }; - }; - "foreachasync-3.0.0" = { - name = "foreachasync"; - packageName = "foreachasync"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; - }; - }; "cint-8.2.1" = { name = "cint"; packageName = "cint"; @@ -16983,22 +18612,22 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.34.4" = { + "snyk-1.40.1" = { name = "snyk"; packageName = "snyk"; - version = "1.34.4"; + version = "1.40.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.34.4.tgz"; - sha1 = "9f0d50ab4f0544b125fa21c67dd162de1e7ce91b"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.40.1.tgz"; + sha1 = "36120e6ab1659185db33fd3404377152bb92cdf2"; }; }; - "spawn-please-0.2.0" = { + "spawn-please-0.3.0" = { name = "spawn-please"; packageName = "spawn-please"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz"; - sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; + sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; "aproba-1.0.4" = { @@ -17046,6 +18675,15 @@ let sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; }; }; + "npmlog-3.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz"; + sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; + }; + }; "path-array-1.0.1" = { name = "path-array"; packageName = "path-array"; @@ -17055,6 +18693,15 @@ let sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; }; }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; "array-index-1.0.0" = { name = "array-index"; packageName = "array-index"; @@ -17064,6 +18711,42 @@ let sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; }; }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + }; + }; + "es5-ext-0.10.30" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.30"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz"; + sha1 = "7141a16836697dbabfaaaeee41495ce29f52c939"; + }; + }; + "es6-iterator-2.0.1" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; + sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -17100,6 +18783,24 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; + "snyk-go-plugin-1.1.2" = { + name = "snyk-go-plugin"; + packageName = "snyk-go-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.1.2.tgz"; + sha1 = "af93ab38d34ab40c67f1ffb00eb3bf6e4b6ab17c"; + }; + }; + "snyk-gradle-plugin-1.1.1" = { + name = "snyk-gradle-plugin"; + packageName = "snyk-gradle-plugin"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.1.tgz"; + sha1 = "9d75c973ce0e2e94bbf031ca737a354d9f2aa026"; + }; + }; "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; @@ -17109,6 +18810,15 @@ let sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; + "snyk-mvn-plugin-1.0.0" = { + name = "snyk-mvn-plugin"; + packageName = "snyk-mvn-plugin"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz"; + sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10"; + }; + }; "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -17118,13 +18828,13 @@ let sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; - "snyk-python-plugin-1.0.0" = { + "snyk-python-plugin-1.2.3" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.0.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.0.0.tgz"; - sha1 = "d3915fbd933305d9988d86a56a7381e73c4565f7"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.3.tgz"; + sha1 = "c7c7df73576c6f8e9fab25364e8bab0b325b5ca9"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -17154,6 +18864,15 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; + "snyk-sbt-plugin-1.1.0" = { + name = "snyk-sbt-plugin"; + packageName = "snyk-sbt-plugin"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz"; + sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050"; + }; + }; "snyk-tree-1.0.0" = { name = "snyk-tree"; packageName = "snyk-tree"; @@ -17172,15 +18891,6 @@ let sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; }; }; - "tempfile-1.1.1" = { - name = "tempfile"; - packageName = "tempfile"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; - sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; - }; - }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -17226,6 +18936,78 @@ let sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; }; }; + "fs-0.0.1-security" = { + name = "fs"; + packageName = "fs"; + version = "0.0.1-security"; + src = fetchurl { + url = "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz"; + sha1 = "8a7bd37186b6dddf3813f23858b57ecaaf5e41d4"; + }; + }; + "toml-2.3.2" = { + name = "toml"; + packageName = "toml"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-2.3.2.tgz"; + sha1 = "5eded5ca42887924949fd06eb0e955656001e834"; + }; + }; + "clone-deep-0.3.0" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; + sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; + }; + }; + "shallow-clone-0.1.2" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; + sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; + }; + }; + "kind-of-2.0.1" = { + name = "kind-of"; + packageName = "kind-of"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; + sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; + }; + }; + "lazy-cache-0.2.7" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; + sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; + }; + }; + "mixin-object-2.0.1" = { + name = "mixin-object"; + packageName = "mixin-object"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; + sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; + }; + }; + "for-in-0.1.8" = { + name = "for-in"; + packageName = "for-in"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"; + sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; + }; + }; "minimatch-3.0.2" = { name = "minimatch"; packageName = "minimatch"; @@ -17353,13 +19135,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.28" = { + "domino-1.0.29" = { name = "domino"; packageName = "domino"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; - sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz"; + sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06"; }; }; "express-handlebars-3.0.0" = { @@ -17454,33 +19236,6 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "busboy-0.2.14" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; - sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; - }; - }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; - }; - }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }; - }; "object.assign-4.0.4" = { name = "object.assign"; packageName = "object.assign"; @@ -17499,13 +19254,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "bunyan-1.8.10" = { + "bunyan-1.8.12" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.10"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; - sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; + sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -17562,13 +19317,13 @@ let sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "dtrace-provider-0.8.3" = { + "dtrace-provider-0.8.5" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz"; - sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz"; + sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92"; }; }; "mv-2.1.1" = { @@ -17680,13 +19435,13 @@ let sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "msgpack5-3.4.1" = { + "msgpack5-3.5.0" = { name = "msgpack5"; packageName = "msgpack5"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; - sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz"; + sha1 = "193b3e864959a826d33074460c2651d1ed04b07a"; }; }; "dom-storage-2.0.2" = { @@ -17770,6 +19525,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "winreg-1.2.3" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz"; + sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; + }; + }; "airplay-protocol-2.0.2" = { name = "airplay-protocol"; packageName = "airplay-protocol"; @@ -17842,13 +19606,13 @@ let sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; }; }; - "buffer-indexof-1.1.0" = { + "buffer-indexof-1.1.1" = { name = "buffer-indexof"; packageName = "buffer-indexof"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; - sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; }; }; "next-line-1.1.0" = { @@ -17914,13 +19678,13 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.1.1" = { + "dns-packet-1.2.2" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.1.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz"; - sha1 = "2369d45038af045f3898e6fa56862aed3f40296c"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; + sha1 = "a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"; }; }; "external-editor-1.1.1" = { @@ -17995,24 +19759,6 @@ let sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; "engine.io-1.8.4" = { name = "engine.io"; packageName = "engine.io"; @@ -18049,24 +19795,6 @@ let sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; "request-2.67.0" = { name = "request"; packageName = "request"; @@ -18076,15 +19804,6 @@ let sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; - }; - }; "concat-stream-1.5.0" = { name = "concat-stream"; packageName = "concat-stream"; @@ -18094,24 +19813,6 @@ let sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; }; }; - "mkdirp-0.5.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }; - }; - "yauzl-2.4.1" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; - }; - }; "bl-1.0.3" = { name = "bl"; packageName = "bl"; @@ -18139,15 +19840,6 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18716,24 +20408,6 @@ let sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; }; }; - "mdurl-1.0.1" = { - name = "mdurl"; - packageName = "mdurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; - }; - }; - "uc.micro-1.0.3" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; - sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; - }; - }; "regexp-quote-0.0.0" = { name = "regexp-quote"; packageName = "regexp-quote"; @@ -18878,15 +20552,6 @@ let sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; }; }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; - }; - }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -18959,13 +20624,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.2.0" = { + "csv-parse-1.2.1" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; - sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.1.tgz"; + sha1 = "9199c23f2490d98c4d9ab2a0167b06927498c9df"; }; }; "stream-transform-0.1.2" = { @@ -19040,6 +20705,15 @@ let sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; }; }; + "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"; + }; + }; "once-1.3.0" = { name = "once"; packageName = "once"; @@ -19139,13 +20813,22 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.3" = { + "coa-1.0.4" = { name = "coa"; packageName = "coa"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz"; - sha1 = "1b54a5e1dcf77c990455d4deea98c564416dc893"; + url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; + sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + }; + }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "whet.extend-0.9.9" = { @@ -19193,13 +20876,13 @@ let sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; }; }; - "tapable-0.2.6" = { + "tapable-0.2.8" = { name = "tapable"; packageName = "tapable"; - version = "0.2.6"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; - sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz"; + sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; }; }; "memory-fs-0.3.0" = { @@ -19220,13 +20903,13 @@ let sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9"; }; }; - "color-1.0.3" = { + "color-2.0.0" = { name = "color"; packageName = "color"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz"; - sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d"; + url = "https://registry.npmjs.org/color/-/color-2.0.0.tgz"; + sha1 = "e0c9972d1e969857004b101eaa55ceab5961d67d"; }; }; "crossroads-0.12.2" = { @@ -19247,13 +20930,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-session-1.15.3" = { + "express-session-1.15.5" = { name = "express-session"; packageName = "express-session"; - version = "1.15.3"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.3.tgz"; - sha1 = "db545f0435a7b1b228ae02da8197f65141735c67"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz"; + sha1 = "f49a18227263b316f6f8544da5fee25a540259ec"; }; }; "forever-monitor-1.1.0" = { @@ -19283,15 +20966,6 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; - "ignore-3.2.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; - sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; - }; - }; "just-detect-adblock-1.0.0" = { name = "just-detect-adblock"; packageName = "just-detect-adblock"; @@ -19355,13 +21029,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.2.1" = { + "raven-2.1.2" = { name = "raven"; packageName = "raven"; - version = "1.2.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; - sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; + url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz"; + sha1 = "4aa7a72c4b3061d7fde06bfc62d669a74a651e27"; }; }; "signals-1.0.0" = { @@ -19382,6 +21056,15 @@ let sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; + "superagent-3.5.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; + sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; + }; + }; "winston-2.3.1" = { name = "winston"; packageName = "winston"; @@ -19391,24 +21074,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; - }; - }; "color-string-1.5.2" = { name = "color-string"; packageName = "color-string"; @@ -19418,15 +21083,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -19445,6 +21101,15 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; + "diff-3.3.0" = { + name = "diff"; + packageName = "diff"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz"; + sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9"; + }; + }; "hogan.js-3.0.2" = { name = "hogan.js"; packageName = "hogan.js"; @@ -19454,24 +21119,6 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "whatwg-fetch-2.0.3" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; - }; - }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; "broadway-0.2.10" = { name = "broadway"; packageName = "broadway"; @@ -19598,6 +21245,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "hosted-git-info-2.4.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + }; + }; "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -19607,6 +21263,33 @@ let sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; + "readable-stream-2.2.11" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; + sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + }; + }; + "update-notifier-2.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; + sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; + }; + }; + "lazy-req-2.0.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; + sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19616,15 +21299,6 @@ let sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -19634,6 +21308,15 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + }; + }; "eve-0.5.4" = { name = "eve"; packageName = "eve"; @@ -19643,69 +21326,6 @@ let sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "os-locale-2.0.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; - sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; "adm-zip-0.4.7" = { name = "adm-zip"; packageName = "adm-zip"; @@ -19742,6 +21362,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -19760,22 +21389,40 @@ let sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; - "enhanced-resolve-3.1.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "3.1.0"; + "ajv-keywords-2.1.0" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; - sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; + sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; }; }; - "json-loader-0.5.4" = { + "enhanced-resolve-3.4.1" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; + sha1 = "0421e339fd71419b3da13d129b3979040230476e"; + }; + }; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + }; + "json-loader-0.5.7" = { name = "json-loader"; packageName = "json-loader"; - version = "0.5.4"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; - sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; + sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d"; }; }; "loader-runner-2.3.0" = { @@ -19787,13 +21434,13 @@ let sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; - "loader-utils-0.2.17" = { + "loader-utils-1.1.0" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.17"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz"; - sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; + sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; }; }; "memory-fs-0.4.1" = { @@ -19814,22 +21461,67 @@ let sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "watchpack-1.3.1" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.3.1"; + "uglifyjs-webpack-plugin-0.4.6" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz"; - sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; + sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; - "webpack-sources-0.2.3" = { + "watchpack-1.4.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; + sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; + }; + }; + "webpack-sources-1.0.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "0.2.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz"; - sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz"; + sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-weak-map-2.0.2" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; "big.js-3.1.3" = { @@ -19859,40 +21551,22 @@ let sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"; }; }; - "timers-browserify-2.0.2" = { + "timers-browserify-2.0.4" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz"; - sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz"; + sha1 = "96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"; }; }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; - }; - }; - "source-list-map-1.1.2" = { + "source-list-map-2.0.0" = { name = "source-list-map"; packageName = "source-list-map"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz"; - sha1 = "9889019d1024cce55cdc069498337ef6186a11a1"; - }; - }; - "bytes-2.5.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; - sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; + sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085"; }; }; "death-1.1.0" = { @@ -19904,22 +21578,13 @@ let sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; - "gunzip-maybe-1.4.0" = { + "gunzip-maybe-1.4.1" = { name = "gunzip-maybe"; packageName = "gunzip-maybe"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz"; - sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19"; - }; - }; - "is-ci-1.0.10" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha1 = "39c72ed89d1b49ba708e18776500488902a52027"; }; }; "leven-2.1.0" = { @@ -19931,13 +21596,13 @@ let sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; - "node-emoji-1.5.1" = { + "node-emoji-1.8.1" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.5.1"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz"; - sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz"; + sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826"; }; }; "object-path-0.11.4" = { @@ -20003,13 +21668,13 @@ let sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; - "ci-info-1.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.0.0"; + "lodash.toarray-4.4.0" = { + name = "lodash.toarray"; + packageName = "lodash.toarray"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; - sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; + url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; + sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; "cli-list-0.2.0" = { @@ -20021,15 +21686,6 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; "fullname-3.3.0" = { name = "fullname"; packageName = "fullname"; @@ -20120,15 +21776,6 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; - }; - }; "yeoman-character-1.1.0" = { name = "yeoman-character"; packageName = "yeoman-character"; @@ -20147,49 +21794,22 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.0" = { + "yeoman-environment-2.0.2" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz"; - sha1 = "dafa2fc512c168cb8313453e5318e64731265915"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz"; + sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331"; }; }; - "yosay-2.0.0" = { + "yosay-2.0.1" = { name = "yosay"; packageName = "yosay"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz"; - sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe"; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; - "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"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz"; + sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f"; }; }; "filter-obj-1.1.0" = { @@ -20255,13 +21875,40 @@ let sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; - "indent-string-3.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.1.0"; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz"; - sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d"; + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; + "cross-spawn-async-2.2.5" = { + name = "cross-spawn-async"; + packageName = "cross-spawn-async"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; + sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + }; + }; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; }; }; "execall-1.0.0" = { @@ -20345,15 +21992,6 @@ let sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; - }; - }; "bin-version-check-2.1.0" = { name = "bin-version-check"; packageName = "bin-version-check"; @@ -20372,15 +22010,6 @@ let sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; }; }; - "log-symbols-1.0.2" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; - }; - }; "object-values-1.0.0" = { name = "object-values"; packageName = "object-values"; @@ -20435,15 +22064,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -20516,15 +22136,6 @@ let sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; }; }; - "ansi-styles-3.1.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; - sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; - }; - }; "pad-component-0.0.1" = { name = "pad-component"; packageName = "pad-component"; @@ -20549,91 +22160,54 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.2"; + version = "1.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.2.tgz"; - sha1 = "998e5cc410fc8eec02fb9007ef95c76ab4ac586f"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.13.tgz"; + sha1 = "5ab8089cee9a9bf4ba46298d87c7039a4f2a7410"; }; dependencies = [ - sources."async-2.4.1" - (sources."babel-core-6.25.0" // { + sources."colors-0.6.0-1" + sources."ejs-2.3.4" + sources."pkginfo-0.2.2" + sources."commander-0.6.1" + sources."wrench-1.3.9" + sources."xmldom-0.1.19" + sources."jsonlint-1.5.1" + (sources."uglify-js-2.6.1" // { dependencies = [ - sources."source-map-0.5.6" + sources."source-map-0.5.7" ]; }) - sources."babel-traverse-6.25.0" - sources."babel-types-6.25.0" - sources."babylon-6.17.3" - sources."colors-0.6.0-1" - sources."commander-0.6.1" - sources."deasync-0.1.10" - sources."ejs-2.3.4" + sources."resolve-1.4.0" sources."global-paths-0.1.2" - sources."jsonlint-1.5.1" + sources."source-map-0.1.9" + sources."xml2tss-0.0.5" sources."moment-2.17.1" sources."node.extend-1.0.10" - sources."pkginfo-0.2.2" - sources."resolve-1.3.3" - sources."source-map-0.1.9" - sources."wrench-1.3.9" - sources."xml2tss-0.0.5" - sources."xmldom-0.1.19" - sources."lodash-4.17.4" - sources."babel-code-frame-6.22.0" - (sources."babel-generator-6.25.0" // { - dependencies = [ - sources."source-map-0.5.6" - ]; - }) - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-template-6.25.0" - sources."babel-runtime-6.23.0" - sources."babel-register-6.24.1" - sources."convert-source-map-1.5.0" - sources."debug-2.6.8" - sources."json5-0.5.1" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."private-0.1.7" - sources."slash-1.0.0" - sources."chalk-1.1.3" - sources."esutils-2.0.2" - sources."js-tokens-3.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."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-2.4.1" - sources."regenerator-runtime-0.10.5" - sources."home-or-tmp-2.0.0" - sources."mkdirp-0.5.1" - (sources."source-map-support-0.4.15" // { - dependencies = [ - sources."source-map-0.5.6" - ]; - }) - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."minimist-0.0.8" - sources."ms-2.0.0" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."globals-9.18.0" - sources."invariant-2.2.2" - sources."loose-envify-1.3.1" - sources."to-fast-properties-1.0.3" - sources."bindings-1.2.1" - sources."nan-2.6.2" + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + sources."async-0.2.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."wordwrap-0.0.2" + 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.5" + sources."path-parse-1.0.5" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { dependencies = [ @@ -20648,24 +22222,13 @@ in }) sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.14" + sources."which-1.3.0" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."chalk-0.4.0" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" - ]; - }) - sources."JSV-4.0.2" - sources."underscore-1.6.0" - sources."has-color-0.1.7" - sources."is-0.3.0" - sources."path-parse-1.0.5" sources."amdefine-1.0.1" sources."xml2js-0.2.8" sources."sax-0.5.8" + sources."is-0.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -20678,10 +22241,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.14"; + version = "0.10.15"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.14.tgz"; - sha1 = "e702e81a68b2b52db11e707796b484001b22063e"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.15.tgz"; + sha1 = "15386d528bcd2521147934e3f183b53897a18c2c"; }; dependencies = [ sources."adal-node-0.1.21" @@ -20693,56 +22256,92 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.3" - sources."azure-arm-commerce-0.2.0" - (sources."azure-arm-compute-3.0.0-preview" // { + (sources."azure-arm-cdn-1.0.3" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-commerce-0.2.0" // { + dependencies = [ + sources."ms-rest-azure-1.15.7" + sources."ms-rest-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-arm-compute-3.0.0-preview" + (sources."azure-arm-datalake-analytics-1.0.2-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-datalake-store-1.0.2-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-datalake-analytics-1.0.2-preview" - sources."azure-arm-datalake-store-1.0.2-preview" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - (sources."azure-arm-iothub-1.0.1-preview" // { + sources."azure-arm-iothub-1.0.1-preview" + (sources."azure-arm-servermanagement-0.1.2" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-azure-1.15.7" + sources."ms-rest-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-servermanagement-0.1.2" - (sources."azure-arm-network-1.1.0-preview" // { + sources."azure-arm-network-2.0.0" + (sources."azure-arm-powerbiembedded-0.1.0" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-powerbiembedded-0.1.0" - (sources."azure-arm-trafficmanager-1.1.0-preview" // { + sources."azure-arm-trafficmanager-1.1.0-preview" + (sources."azure-arm-dns-0.11.1" // { dependencies = [ - sources."ms-rest-azure-2.1.2" - sources."ms-rest-2.2.0" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-dns-0.11.1" - sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.3" - sources."azure-arm-devtestlabs-0.1.0" - (sources."azure-graph-2.1.0-preview" // { + (sources."azure-arm-website-0.11.4" // { dependencies = [ - sources."ms-rest-azure-2.1.2" - sources."ms-rest-2.2.0" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) + (sources."azure-arm-rediscache-0.2.3" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-devtestlabs-0.1.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-graph-2.1.0-preview" sources."azure-gallery-2.0.0-pre.18" - sources."azure-keyvault-0.11.0" + (sources."azure-keyvault-0.11.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -20753,8 +22352,20 @@ in ]; }) sources."azure-asm-network-0.13.0" - sources."azure-arm-resource-1.6.1-preview" - sources."azure-arm-storage-0.15.0-preview" + (sources."azure-arm-resource-1.6.1-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-storage-0.15.0-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" @@ -20771,9 +22382,27 @@ in sources."xml2js-0.2.7" ]; }) - sources."azure-arm-batch-0.3.0" - sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.5" + (sources."azure-arm-batch-0.3.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-batch-0.5.2" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-servicefabric-0.1.5" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."applicationinsights-0.16.0" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -20796,8 +22425,8 @@ in ]; }) sources."moment-2.18.1" - sources."ms-rest-1.15.7" - (sources."ms-rest-azure-1.15.7" // { + sources."ms-rest-2.2.1" + (sources."ms-rest-azure-2.2.3" // { dependencies = [ sources."async-0.2.7" ]; @@ -20858,19 +22487,13 @@ in sources."xpath.js-1.0.7" sources."base64url-2.0.0" sources."jwa-1.1.5" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.9" sources."dateformat-1.0.2-1.2.3" sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" - sources."@types/node-7.0.31" - sources."@types/request-0.0.42" - sources."@types/uuid-2.0.30" - sources."is-buffer-1.1.5" - sources."is-stream-1.1.0" - sources."@types/form-data-0.0.33" sources."browserify-mime-1.2.9" sources."extend-1.2.1" sources."json-edm-parser-0.1.2" @@ -20903,9 +22526,15 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" + sources."@types/node-7.0.43" + sources."@types/request-0.0.45" + sources."@types/uuid-2.0.30" + sources."is-buffer-1.1.5" + sources."is-stream-1.1.0" + sources."@types/form-data-2.2.0" sources."debug-0.7.4" sources."q-0.9.7" - sources."pkginfo-0.4.0" + sources."pkginfo-0.4.1" sources."revalidator-0.1.8" (sources."utile-0.2.1" // { dependencies = [ @@ -20942,13 +22571,13 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" ]; }) (sources."har-validator-2.0.6" // { dependencies = [ sources."chalk-1.1.3" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."ansi-styles-2.2.1" sources."strip-ansi-3.0.1" ]; @@ -20957,7 +22586,7 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."qs-6.2.3" sources."stringstream-0.0.5" @@ -20965,13 +22594,12 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."lodash-4.17.4" - sources."is-my-json-valid-2.16.0" + sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -20983,7 +22611,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20993,9 +22621,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -21011,7 +22643,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" @@ -21020,17 +22652,16 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."readable-stream-2.3.3" + sources."string_decoder-1.0.3" ]; }) sources."http-response-object-1.1.0" sources."then-request-2.2.0" sources."typedarray-0.0.6" sources."http-basic-2.5.1" - sources."promise-7.3.0" - sources."asap-2.0.5" + sources."promise-7.3.1" + sources."asap-2.0.6" sources."os-homedir-1.0.2" sources."mute-stream-0.0.7" ]; @@ -21079,7 +22710,7 @@ in }) sources."lodash-4.2.1" sources."promised-temp-0.1.0" - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."temp-0.8.3" // { dependencies = [ sources."rimraf-2.2.8" @@ -21095,13 +22726,13 @@ in sources."ext-list-2.2.2" sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."mime-db-1.28.0" + sources."mime-db-1.29.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-1.2.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -21110,7 +22741,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -21208,7 +22839,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.6" + sources."buffer-5.0.7" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -21218,7 +22849,7 @@ in }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."domain-browser-1.1.7" @@ -21243,21 +22874,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) - sources."resolve-1.3.3" + sources."readable-stream-2.3.3" + sources."resolve-1.4.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.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."subarg-1.0.0" sources."syntax-error-1.3.0" sources."through2-2.0.3" @@ -21282,9 +22905,9 @@ in sources."convert-source-map-1.1.3" sources."inline-source-map-0.6.2" sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."pako-0.2.9" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" @@ -21298,29 +22921,34 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.0" + sources."evp_bytestokey-1.0.2" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" + sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + 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.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" - sources."ripemd160-2.0.1" + (sources."ripemd160-2.0.1" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) sources."sha.js-2.4.8" - sources."hash-base-2.0.2" - sources."safe-buffer-5.1.0" sources."miller-rabin-4.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -21411,10 +23039,9 @@ in sources."router-0.6.2" sources."srt2vtt-1.3.1" sources."stream-transcoder-0.0.5" - (sources."xml2js-0.4.17" // { + (sources."xml2js-0.4.19" // { dependencies = [ - sources."xmlbuilder-4.2.1" - sources."lodash-4.17.4" + sources."xmlbuilder-9.0.4" ]; }) sources."xspfr-0.3.1" @@ -21456,7 +23083,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" @@ -21464,9 +23091,9 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -21554,17 +23181,18 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.7" - sources."parse-torrent-file-4.0.2" - sources."simple-get-2.6.0" - sources."safe-buffer-5.1.0" + sources."parse-torrent-file-4.0.3" + sources."simple-get-2.7.0" + sources."safe-buffer-5.1.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.11.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" sources."rusha-0.8.6" + sources."decompress-response-3.3.0" sources."once-1.4.0" sources."simple-concat-1.0.0" - sources."unzip-response-2.0.1" + sources."mimic-response-1.0.0" sources."wrappy-1.0.2" (sources."end-of-stream-1.0.0" // { dependencies = [ @@ -21645,26 +23273,25 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.2" - sources."bn.js-4.11.6" + sources."k-rpc-socket-1.7.1" + 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" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."ws-2.3.1" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" ]; }) sources."string2compact-1.2.2" @@ -21673,7 +23300,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.5.2" sources."get-browser-rtc-1.0.2" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -21710,20 +23337,18 @@ in sources."sntp-0.1.4" sources."codepage-1.4.0" sources."utfx-1.0.1" - sources."voc-0.5.0" + sources."voc-1.0.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) - sources."exit-on-epipe-1.0.0" - sources."commander-2.9.0" + sources."exit-on-epipe-1.0.1" + sources."commander-2.11.0" sources."typedarray-0.0.6" - sources."graceful-readlink-1.0.1" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; @@ -21737,10 +23362,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; buildInputs = globalBuildInputs; meta = { @@ -21770,6 +23395,7 @@ in sources."glob-7.1.1" sources."nopt-4.0.1" sources."plist-2.0.1" + sources."semver-5.3.0" sources."shelljs-0.3.0" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" @@ -21810,11 +23436,11 @@ in sources."glob-5.0.15" sources."minimatch-3.0.4" sources."plist-1.2.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."shelljs-0.5.3" sources."underscore-1.8.3" sources."unorm-1.4.1" - sources."big-integer-1.6.23" + sources."big-integer-1.6.24" sources."sax-0.3.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -21870,6 +23496,7 @@ in ]; }) sources."nopt-3.0.6" + sources."normalize-package-data-2.3.8" sources."npm-package-arg-4.1.1" sources."readable-stream-2.1.5" sources."request-2.74.0" @@ -21900,7 +23527,7 @@ in sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-5.0.3" + sources."acorn-5.1.1" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" @@ -21914,7 +23541,7 @@ in sources."interpret-1.0.3" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."path-parse-1.0.5" (sources."browserify-13.3.0" // { dependencies = [ @@ -21932,7 +23559,7 @@ in sources."browserify-zlib-0.1.4" (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."isarray-1.0.0" ]; }) @@ -21945,7 +23572,7 @@ in }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."domain-browser-1.1.7" @@ -21964,11 +23591,10 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."shasum-1.0.2" @@ -22007,7 +23633,7 @@ in sources."convert-source-map-1.1.3" sources."inline-source-map-0.6.2" sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."pako-0.2.9" sources."ieee754-1.1.8" sources."typedarray-0.0.6" @@ -22020,29 +23646,34 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.0" + sources."evp_bytestokey-1.0.2" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" + sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + 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.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" - sources."ripemd160-2.0.1" + (sources."ripemd160-2.0.1" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) sources."sha.js-2.4.8" - sources."hash-base-2.0.2" - sources."safe-buffer-5.1.0" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" sources."is-buffer-1.1.5" @@ -22070,60 +23701,45 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" sources."chalk-1.1.3" - sources."compression-1.6.2" - (sources."express-4.15.3" // { - dependencies = [ - sources."debug-2.6.7" - sources."ms-2.0.0" - ]; - }) + sources."compression-1.7.0" + sources."express-4.15.4" 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."accepts-1.3.3" - sources."bytes-2.3.0" - sources."compressible-2.0.10" - sources."debug-2.2.0" + sources."accepts-1.3.4" + sources."bytes-2.5.0" + sources."compressible-2.0.11" + sources."debug-2.6.8" sources."on-headers-1.0.1" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" - sources."ms-0.7.1" + sources."mime-db-1.29.0" + sources."ms-2.0.0" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { - dependencies = [ - sources."debug-2.6.7" - sources."ms-2.0.0" - ]; - }) + sources."finalhandler-1.0.4" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" - sources."qs-6.4.0" + sources."proxy-addr-1.1.5" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { - dependencies = [ - sources."debug-2.6.7" - sources."ms-2.0.0" - ]; - }) - sources."serve-static-1.12.3" + sources."send-0.15.4" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" @@ -22131,26 +23747,26 @@ in sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" sources."mime-1.3.4" sources."media-typer-0.3.0" sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" sources."read-1.0.7" - (sources."read-package-json-2.0.5" // { + (sources."read-package-json-2.0.12" // { dependencies = [ sources."glob-7.1.2" ]; }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."mute-stream-0.0.7" - sources."json-parse-helpfulerror-1.0.3" - sources."normalize-package-data-2.3.8" - sources."jju-1.3.0" + sources."json-parse-better-errors-1.0.1" + sources."normalize-package-data-2.4.0" + sources."slash-1.0.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -22182,6 +23798,7 @@ in (sources."node-gyp-3.6.2" // { dependencies = [ sources."glob-7.1.2" + sources."semver-5.3.0" ]; }) sources."normalize-git-url-3.0.2" @@ -22217,7 +23834,7 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."iferr-0.1.5" sources."fstream-ignore-1.0.5" sources."pseudomap-1.0.2" @@ -22258,15 +23875,14 @@ in sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - (sources."async-2.4.1" // { + (sources."async-2.5.0" // { dependencies = [ sources."lodash-4.17.4" ]; }) - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" + sources."commander-2.11.0" + sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -22277,7 +23893,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22287,9 +23903,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -22357,7 +23977,7 @@ in ]; }) sources."registry-url-3.1.0" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."is-redirect-1.0.0" sources."is-stream-1.1.0" @@ -22366,11 +23986,7 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" (sources."rc-1.2.1" // { dependencies = [ @@ -22408,6 +24024,25 @@ in }; production = true; }; + dhcp = nodeEnv.buildNodePackage { + name = "dhcp"; + packageName = "dhcp"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz"; + sha1 = "204208be1cef2788d528744fb263f60a528363a2"; + }; + dependencies = [ + sources."minimist-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A DHCP server written in JavaScript"; + homepage = https://github.com/infusion/node-dhcp; + license = "MIT OR GPL-2.0"; + }; + production = true; + }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; packageName = "dnschain"; @@ -22487,9 +24122,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.5.3" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -22497,7 +24132,7 @@ in sources."ipaddr.js-1.0.5" sources."destroy-1.0.3" sources."mime-1.2.11" - sources."bindings-1.2.1" + sources."bindings-1.3.0" sources."nan-2.6.2" sources."jsonparse-0.0.6" sources."es5class-2.3.1" @@ -22560,7 +24195,7 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."docker-parse-image-3.0.1" sources."end-of-stream-1.4.0" sources."from2-1.3.0" @@ -22601,9 +24236,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."pump-1.0.2" @@ -22616,9 +24251,9 @@ in (sources."tar-stream-1.5.4" // { dependencies = [ sources."bl-1.2.1" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."through2-0.6.5" // { @@ -22639,19 +24274,17 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - (sources."duplexify-3.5.0" // { + (sources."duplexify-3.5.1" // { dependencies = [ - sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.11" - sources."once-1.3.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."lru-cache-2.7.3" sources."stream-shift-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" @@ -22712,17 +24345,18 @@ in }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.4.1" + sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.72.0" + sources."aws-sdk-2.104.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.81.0" sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" - sources."buffer-5.0.6" + sources."buffer-4.9.1" sources."crypto-browserify-1.0.9" + sources."events-1.1.1" sources."jmespath-0.15.0" sources."querystring-0.2.0" sources."sax-1.2.1" @@ -22730,8 +24364,9 @@ in sources."uuid-3.0.1" sources."xml2js-0.4.17" sources."xmlbuilder-4.2.1" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" + sources."isarray-1.0.0" sources."punycode-1.3.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" @@ -22747,11 +24382,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -22771,7 +24406,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22781,9 +24416,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -22799,7 +24439,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; buildInputs = globalBuildInputs; meta = { @@ -22812,49 +24452,51 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-1.1.0.tgz"; - sha1 = "5a43ae17f6bf672cd8e40891357f84b086c52509"; + url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz"; + sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f"; }; dependencies = [ - sources."chalk-1.1.3" - sources."clipboardy-0.1.2" + sources."auto-bind-1.1.0" + sources."clipboardy-1.1.4" sources."conf-1.1.2" - (sources."got-6.7.1" // { + sources."got-7.1.0" + sources."has-ansi-3.0.0" + sources."import-jsx-1.3.0" + (sources."ink-0.3.1" // { dependencies = [ - sources."get-stream-3.0.0" + sources."chalk-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" ]; }) - sources."has-ansi-2.0.0" + sources."ink-text-input-1.1.0" sources."lodash.debounce-4.0.8" - sources."log-update-1.0.2" sources."mem-1.1.0" - sources."meow-3.7.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."skin-tone-1.0.0" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."execa-0.5.1" - sources."cross-spawn-4.0.2" - sources."get-stream-2.3.1" + sources."execa-0.6.3" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" sources."p-finally-1.0.0" sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" sources."lru-cache-4.1.1" - sources."which-1.2.14" + sources."shebang-command-1.2.0" + sources."which-1.3.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" sources."isexe-2.0.0" - sources."object-assign-4.1.1" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" sources."path-key-2.0.1" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."env-paths-1.0.0" sources."make-dir-1.0.0" sources."pkg-up-2.0.0" @@ -22865,49 +24507,164 @@ in sources."p-locate-2.0.0" sources."path-exists-3.0.0" sources."p-limit-1.1.0" - sources."create-error-class-3.0.2" + sources."decompress-response-3.3.0" sources."duplexer3-0.1.4" - sources."is-redirect-1.0.0" + sources."is-plain-obj-1.1.0" sources."is-retry-allowed-1.1.0" + sources."isurl-1.0.0" sources."lowercase-keys-1.0.0" - sources."safe-buffer-5.1.0" + sources."p-cancelable-0.3.0" + sources."p-timeout-1.2.0" + sources."safe-buffer-5.1.1" 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."url-to-options-1.0.1" + sources."mimic-response-1.0.0" + sources."has-to-string-tag-x-1.4.0" + sources."is-object-1.0.1" + sources."has-symbol-support-x-1.4.0" sources."prepend-http-1.0.4" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + sources."ansi-regex-3.0.0" + sources."babel-core-6.26.0" + sources."babel-plugin-transform-es2015-destructuring-6.23.0" + sources."babel-plugin-transform-object-rest-spread-6.26.0" + sources."babel-plugin-transform-react-jsx-6.24.1" + sources."caller-path-2.0.0" + sources."require-from-string-1.2.1" + sources."resolve-from-3.0.0" + sources."babel-code-frame-6.26.0" + sources."babel-generator-6.26.0" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + sources."babel-register-6.26.0" + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."convert-source-map-1.5.0" + sources."debug-2.6.8" + sources."json5-0.5.1" + sources."lodash-4.17.4" + sources."minimatch-3.0.4" + sources."path-is-absolute-1.0.1" + sources."private-0.1.7" + sources."slash-1.0.0" + sources."source-map-0.5.7" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."has-ansi-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) + sources."esutils-2.0.2" + sources."js-tokens-3.0.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.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-2.5.0" + sources."home-or-tmp-2.0.0" + sources."mkdirp-0.5.1" + sources."source-map-support-0.4.16" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."minimist-0.0.8" + sources."regenerator-runtime-0.11.0" + sources."globals-9.18.0" + sources."invariant-2.2.2" + sources."loose-envify-1.3.1" + sources."to-fast-properties-1.0.3" + sources."ms-2.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-helper-builder-react-jsx-6.26.0" + sources."babel-plugin-syntax-jsx-6.18.0" + sources."caller-callsite-2.0.0" + sources."callsites-2.0.0" + sources."arrify-1.0.1" + sources."indent-string-3.2.0" + sources."lodash.flattendeep-4.4.0" + sources."lodash.isequal-4.5.0" + sources."log-update-2.1.0" + sources."prop-types-15.5.10" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" sources."mimic-fn-1.1.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + (sources."fbjs-0.8.14" // { + dependencies = [ + sources."core-js-1.2.7" + ]; + }) + sources."isomorphic-fetch-2.2.1" + sources."object-assign-4.1.1" + sources."promise-7.3.1" + sources."setimmediate-1.0.5" + sources."ua-parser-js-0.7.14" + sources."node-fetch-1.7.2" + sources."whatwg-fetch-2.0.3" + sources."encoding-0.1.12" + sources."iconv-lite-0.4.18" + sources."asap-2.0.6" 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-1.2.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ sources."find-up-1.1.2" sources."path-exists-2.1.0" ]; }) - sources."redent-1.0.0" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + ]; + }) sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."read-pkg-1.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" sources."graceful-fs-4.1.11" @@ -22916,11 +24673,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."indent-string-2.1.0" sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."unicode-emoji-modifier-base-1.0.0" ]; @@ -22935,34 +24688,47 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.0.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.0.0.tgz"; - sha1 = "7277c01437fdf41dccd168d5aa0e49b75ca1f260"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.5.0.tgz"; + sha1 = "bb75d3b8bde97fb5e13efcd539744677feb019c3"; }; dependencies = [ - sources."babel-code-frame-6.22.0" - sources."chalk-1.1.3" + sources."ajv-5.2.2" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + ]; + }) + (sources."chalk-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + ]; + }) sources."concat-stream-1.6.0" + sources."cross-spawn-5.1.0" sources."debug-2.6.8" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" - sources."espree-3.4.3" + sources."espree-3.5.0" 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-9.18.0" - sources."ignore-3.3.3" + sources."ignore-3.3.4" sources."imurmurhash-0.1.4" - sources."inquirer-3.1.0" - sources."is-my-json-valid-2.16.0" + sources."inquirer-3.2.2" sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" + sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.2" @@ -22970,40 +24736,60 @@ in sources."pluralize-4.0.0" sources."progress-2.0.0" sources."require-uncached-1.0.3" + sources."semver-5.4.1" + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) sources."strip-json-comments-2.0.1" - sources."table-4.0.1" + (sources."table-4.0.1" // { + dependencies = [ + sources."ajv-4.11.8" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + ]; + }) sources."text-table-0.2.0" - sources."js-tokens-3.0.1" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."js-tokens-3.0.2" 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."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" sources."ms-2.0.0" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) + sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" + sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" sources."write-0.2.1" @@ -23020,46 +24806,40 @@ in sources."pinkie-2.0.4" 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."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.1.0" + sources."cli-width-2.2.0" sources."external-editor-2.0.4" 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."string-width-2.0.0" + sources."string-width-2.1.1" sources."through-2.3.8" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" - 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."tryit-1.0.3" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" sources."type-check-0.3.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."deep-is-0.1.3" sources."wordwrap-1.0.0" @@ -23067,10 +24847,8 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."co-4.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23083,10 +24861,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "4.2.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-4.2.5.tgz"; - sha1 = "f0d3a150e2960a7d787841ab83eaef746432c5e1"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz"; + sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -23094,86 +24872,107 @@ in sources."supports-color-2.0.0" ]; }) - sources."eslint-3.19.0" + (sources."eslint-4.5.0" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) sources."optionator-0.8.2" - sources."resolve-1.3.3" - sources."supports-color-3.2.3" + sources."resolve-1.4.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-3.0.1" sources."ansi-regex-2.1.1" - sources."babel-code-frame-6.22.0" + sources."ajv-5.2.2" + sources."babel-code-frame-6.26.0" sources."concat-stream-1.6.0" + sources."cross-spawn-5.1.0" sources."debug-2.6.8" sources."doctrine-2.0.0" - sources."escope-3.6.0" - sources."espree-3.4.3" + sources."eslint-scope-3.7.1" + sources."espree-3.5.0" 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-9.18.0" - sources."ignore-3.3.3" + sources."ignore-3.3.4" sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-my-json-valid-2.16.0" + (sources."inquirer-3.2.2" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" + sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" + sources."pluralize-4.0.0" + sources."progress-2.0.0" sources."require-uncached-1.0.3" - sources."shelljs-0.7.8" - sources."strip-bom-3.0.0" + sources."semver-5.4.1" sources."strip-json-comments-2.0.1" - (sources."table-3.8.3" // { + (sources."table-4.0.1" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."ajv-4.11.8" ]; }) sources."text-table-0.2.0" - sources."user-home-2.0.0" - sources."js-tokens-3.0.1" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."js-tokens-3.0.2" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" sources."ms-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."d-1.0.0" - sources."es5-ext-0.10.23" - sources."es6-iterator-2.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" + sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" + sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" sources."write-0.2.1" @@ -23190,57 +24989,55 @@ in sources."pinkie-2.0.4" 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."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-2.1.0" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."external-editor-2.0.4" + 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."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" - 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."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."signal-exit-3.0.2" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.5.1" + sources."tmp-0.0.31" + 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-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" sources."type-check-0.3.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."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."interpret-1.0.3" - sources."rechoir-0.6.2" - sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."co-4.6.0" - sources."os-homedir-1.0.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" sources."path-parse-1.0.5" - sources."has-flag-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23253,10 +25050,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.0.3"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.0.3.tgz"; - sha1 = "7b4c61210bf6949f0ac16803889ea1abf2b285ea"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; + sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; }; buildInputs = globalBuildInputs; meta = { @@ -23265,6 +25062,198 @@ in }; production = true; }; + fast-cli = nodeEnv.buildNodePackage { + name = "fast-cli"; + packageName = "fast-cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; + sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."log-update-1.0.2" + sources."meow-3.7.0" + (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.15" + sources."promise-phantom-3.1.6" + sources."zen-observable-0.5.2" + 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."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.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-1.2.0" + sources."normalize-package-data-2.4.0" + sources."object-assign-4.1.1" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.2" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.5.0" + sources."is-builtin-module-1.0.0" + sources."semver-5.4.1" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."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-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.11" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + sources."cli-spinners-1.0.0" + sources."log-symbols-1.0.2" + sources."mimic-fn-1.1.0" + sources."es6-promise-4.0.5" + sources."extract-zip-1.6.5" + sources."fs-extra-1.0.0" + sources."hasha-2.2.0" + sources."kew-0.7.0" + sources."progress-1.1.8" + sources."request-2.81.0" + sources."request-progress-2.0.1" + sources."which-1.2.14" + sources."concat-stream-1.6.0" + sources."debug-2.2.0" + (sources."mkdirp-0.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."yauzl-2.4.1" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + 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."ms-0.7.1" + sources."fd-slicer-1.0.1" + sources."pend-1.2.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."is-stream-1.1.0" + 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."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.16" + 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.2" + 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."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" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."asn1-0.2.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + 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.29.0" + sources."punycode-1.4.1" + sources."throttleit-1.0.0" + sources."isexe-2.0.0" + sources."mkpath-1.0.0" + sources."node-phantom-simple-2.2.4" + sources."tmp-0.0.31" + sources."os-tmpdir-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Test your download speed using fast.com"; + homepage = "https://github.com/sindresorhus/fast-cli#readme"; + license = "MIT"; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -23358,7 +25347,7 @@ in sources."chokidar-1.7.0" sources."minimatch-3.0.4" sources."ps-tree-0.0.3" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."inherits-2.0.3" @@ -23366,8 +25355,8 @@ in sources."is-glob-2.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" 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" @@ -23376,11 +25365,10 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" 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.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23401,7 +25389,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -23409,14 +25396,15 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -23426,7 +25414,7 @@ in ]; }) sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -23434,7 +25422,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -23476,7 +25464,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -23496,7 +25484,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23506,9 +25494,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -23524,7 +25516,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -23572,10 +25564,10 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" - sources."simple-git-1.73.0" + sources."simple-git-1.75.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" sources."microee-0.0.2" @@ -23649,17 +25641,17 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.5" + sources."asap-2.0.6" ]; }) - sources."xml2js-0.4.17" + sources."xml2js-0.4.19" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.27" // { + (sources."clean-css-3.4.28" // { dependencies = [ sources."commander-2.8.1" ]; @@ -23678,7 +25670,7 @@ in }) (sources."uglify-js-2.8.29" // { dependencies = [ - sources."source-map-0.5.6" + sources."source-map-0.5.7" ]; }) sources."void-elements-2.0.1" @@ -23721,9 +25713,8 @@ in sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" - sources."sax-1.2.2" - sources."xmlbuilder-4.2.1" - sources."lodash-4.17.4" + sources."sax-1.2.4" + sources."xmlbuilder-9.0.4" sources."nan-2.6.2" ]; buildInputs = globalBuildInputs; @@ -23784,9 +25775,9 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."vinyl-0.5.3" @@ -23813,19 +25804,23 @@ in sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."extend-3.0.1" sources."findup-sync-0.4.3" - sources."fined-1.0.2" + (sources."fined-1.1.0" // { + dependencies = [ + sources."expand-tilde-2.0.2" + ]; + }) 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."rechoir-0.6.2" - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -23843,7 +25838,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23867,7 +25862,7 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" + sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -23883,13 +25878,28 @@ in sources."is-windows-0.2.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.14" + sources."which-1.3.0" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" - sources."lodash.assignwith-4.2.0" - sources."lodash.isempty-4.4.0" - sources."lodash.pick-4.4.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."object.defaults-1.1.0" // { + dependencies = [ + sources."for-own-1.0.0" + sources."isobject-3.0.1" + ]; + }) + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."parse-filepath-1.0.1" + 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."path-root-0.1.1" @@ -24085,9 +26095,9 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.4" // { + (sources."js-yaml-3.9.1" // { dependencies = [ - sources."esprima-3.1.3" + sources."esprima-4.0.0" ]; }) (sources."mkdirp-0.5.1" // { @@ -24099,7 +26109,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.2.3" - sources."which-1.2.14" + sources."which-1.3.0" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -24126,7 +26136,7 @@ in }) (sources."uglify-js-2.8.29" // { dependencies = [ - sources."source-map-0.5.6" + sources."source-map-0.5.7" ]; }) sources."minimist-0.0.10" @@ -24164,20 +26174,25 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.0.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.0.tgz"; - sha1 = "aad1582560c53dc91c13be6c2abb76cebbc9c971"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.2.1.tgz"; + sha1 = "26c2f378cad3ad94282f8dcf0f2b1b8ddc33c612"; }; dependencies = [ - sources."@reactivex/rxjs-5.4.1" - sources."chai-4.0.2" - sources."chai-as-promised-7.0.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."fast-json-patch-1.2.2" + sources."@reactivex/rxjs-5.4.3" + sources."chai-4.1.1" + sources."chai-as-promised-7.1.1" + sources."chalk-2.1.0" + sources."commander-2.11.0" + sources."fast-json-patch-2.0.4" sources."glob-7.1.2" sources."iterare-0.0.8" + (sources."jaeger-client-3.5.3" // { + dependencies = [ + sources."opentracing-0.13.0" + ]; + }) sources."lodash-4.17.4" sources."mz-2.6.0" sources."object-hash-1.1.8" @@ -24185,7 +26200,7 @@ in sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.3.4" - sources."vscode-jsonrpc-3.3.0" + sources."vscode-jsonrpc-3.3.1" sources."vscode-languageserver-3.3.0" sources."vscode-languageserver-types-3.3.0" sources."symbol-observable-1.0.4" @@ -24199,152 +26214,34 @@ in sources."get-func-name-2.0.0" sources."pathval-1.1.0" sources."type-detect-4.0.3" - sources."eslint-3.19.0" - sources."babel-code-frame-6.22.0" - sources."concat-stream-1.6.0" - sources."debug-2.6.8" - sources."doctrine-2.0.0" - sources."escope-3.6.0" - sources."espree-3.4.3" - sources."esquery-1.0.0" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."file-entry-cache-2.0.0" - sources."globals-9.18.0" - sources."ignore-3.3.3" - sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-my-json-valid-2.16.0" - sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" - sources."json-stable-stringify-1.0.1" - sources."levn-0.3.0" - sources."mkdirp-0.5.1" - sources."natural-compare-1.4.0" - sources."optionator-0.8.2" - sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" - sources."require-uncached-1.0.3" - sources."shelljs-0.7.8" - sources."strip-bom-3.0.0" - sources."strip-json-comments-2.0.1" - (sources."table-3.8.3" // { - dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - ]; - }) - sources."text-table-0.2.0" - sources."user-home-2.0.0" - sources."js-tokens-3.0.1" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" - 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."string_decoder-1.0.2" - sources."util-deprecate-1.0.2" - sources."ms-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."d-1.0.0" - sources."es5-ext-0.10.23" - sources."es6-iterator-2.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" - sources."object-assign-4.1.1" - sources."acorn-5.0.3" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" - sources."del-2.2.2" - sources."graceful-fs-4.1.11" - sources."write-0.2.1" - sources."globby-5.0.0" - sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" - sources."pify-2.3.0" - sources."pinkie-promise-2.0.1" - sources."rimraf-2.6.1" - 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."pinkie-2.0.4" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."cli-cursor-1.0.2" - sources."cli-width-2.1.0" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" - sources."once-1.4.0" - sources."wrappy-1.0.2" - 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."tryit-1.0.3" - sources."argparse-1.0.9" - sources."esprima-3.1.3" - sources."sprintf-js-1.0.3" - sources."jsonify-0.0.0" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - sources."minimist-0.0.8" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.6" - sources."caller-path-0.1.0" - sources."resolve-from-1.0.1" - sources."callsites-0.2.0" - sources."interpret-1.0.3" - sources."rechoir-0.6.2" - sources."resolve-1.3.3" - sources."path-parse-1.0.5" - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" - sources."co-4.6.0" - sources."os-homedir-1.0.2" - sources."ansi-styles-2.2.1" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" + sources."supports-color-4.2.1" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."deep-equal-1.0.1" 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."node-int64-0.4.0" + sources."thriftrw-3.11.1" + sources."xorshift-0.2.1" + sources."bufrw-1.2.1" + sources."error-7.0.2" + sources."long-2.4.0" + sources."ansi-color-0.2.1" + sources."xtend-4.0.1" + sources."string-template-0.2.1" sources."any-promise-1.3.0" + sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" ]; @@ -24359,10 +26256,10 @@ in jayschema = nodeEnv.buildNodePackage { name = "jayschema"; packageName = "jayschema"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; - sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; + sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b"; }; dependencies = [ sources."when-3.4.6" @@ -24378,10 +26275,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz"; - sha1 = "5e3ba97848d5290273db514aee47fe24cf592934"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; + sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; }; dependencies = [ sources."cli-1.0.1" @@ -24441,6 +26338,62 @@ in }; production = true; }; + js-beautify = nodeEnv.buildNodePackage { + name = "js-beautify"; + packageName = "js-beautify"; + version = "1.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz"; + sha1 = "d3b8f7322d02b9277d58bd238264c327e58044cd"; + }; + dependencies = [ + sources."config-chain-1.1.11" + sources."editorconfig-0.13.3" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."proto-list-1.2.4" + sources."ini-1.3.4" + sources."bluebird-3.5.0" + sources."commander-2.11.0" + sources."lru-cache-3.2.0" + sources."semver-5.4.1" + sources."sigmund-1.0.1" + sources."pseudomap-1.0.2" + sources."minimist-0.0.8" + sources."abbrev-1.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "jsbeautifier.org for node"; + homepage = http://jsbeautifier.org/; + license = "MIT"; + }; + production = true; + }; + jsonlint = nodeEnv.buildNodePackage { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + }; + dependencies = [ + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Validate JSON"; + homepage = http://zaach.github.com/jsonlint/; + }; + production = true; + }; jsontool = nodeEnv.buildNodePackage { name = "jsontool"; packageName = "jsontool"; @@ -24456,28 +26409,91 @@ in }; production = true; }; + json-refs = nodeEnv.buildNodePackage { + name = "json-refs"; + packageName = "json-refs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.0.tgz"; + sha1 = "1b52b826691862b4873224bc1d07a2060645663c"; + }; + dependencies = [ + sources."commander-2.11.0" + sources."graphlib-2.1.1" + sources."js-yaml-3.9.1" + sources."lodash-4.17.4" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.2" + sources."slash-1.0.0" + sources."uri-js-3.0.2" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" + sources."superagent-3.6.0" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."debug-2.6.8" + sources."extend-3.0.1" + sources."form-data-2.3.1" + sources."formidable-1.1.1" + sources."methods-1.1.2" + sources."mime-1.3.6" + sources."qs-6.5.0" + sources."readable-stream-2.3.3" + sources."ms-2.0.0" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + sources."mime-types-2.1.16" + sources."delayed-stream-1.0.0" + sources."mime-db-1.29.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."punycode-2.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; + homepage = https://github.com/whitlockjc/json-refs; + license = "MIT"; + }; + production = true; + }; json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.10.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.10.1.tgz"; - sha1 = "1edd299681d3960959cf3b1859d192dc19898a40"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz"; + sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308"; }; dependencies = [ sources."body-parser-1.17.2" sources."chalk-1.1.3" - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" ]; }) sources."connect-pause-0.1.1" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."errorhandler-1.5.0" - sources."express-4.15.3" + (sources."express-4.15.4" // { + dependencies = [ + sources."debug-2.6.8" + sources."qs-6.5.0" + ]; + }) + (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.13.0" @@ -24493,6 +26509,7 @@ in ]; }) sources."object-assign-4.1.1" + sources."please-upgrade-node-3.0.1" sources."pluralize-3.1.0" sources."request-2.81.0" sources."server-destroy-1.0.1" @@ -24506,8 +26523,8 @@ in sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + 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.4.0" @@ -24520,17 +26537,18 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.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-2.0.0" sources."ansi-regex-2.1.1" - sources."accepts-1.3.3" - sources."compressible-2.0.10" + sources."accepts-1.3.4" + sources."compressible-2.0.11" sources."on-headers-1.0.1" + sources."safe-buffer-5.1.1" sources."vary-1.1.1" sources."negotiator-0.6.1" sources."escape-html-1.0.3" @@ -24540,21 +26558,30 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."etag-1.8.0" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" - sources."serve-static-1.12.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."serve-static-1.12.4" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" + sources."isarray-0.0.1" sources."jju-1.3.0" sources."graceful-fs-4.1.11" sources."is-promise-2.1.0" @@ -24575,7 +26602,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -24592,7 +26618,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24602,9 +26628,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -24657,7 +26688,7 @@ in sources."got-5.7.1" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" sources."is-redirect-1.0.0" @@ -24668,9 +26699,9 @@ in sources."parse-json-2.2.0" sources."pinkie-promise-2.0.1" sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ - sources."safe-buffer-5.0.1" + sources."isarray-1.0.0" ]; }) sources."timed-out-3.1.3" @@ -24680,14 +26711,8 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."pinkie-2.0.4" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" (sources."rc-1.2.1" // { @@ -24720,12 +26745,12 @@ in sources."read-pkg-1.1.0" sources."path-exists-2.1.0" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24744,14 +26769,14 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.4"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; + sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0"; }; dependencies = [ sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -24780,8 +26805,12 @@ in sources."lodash-4.17.4" ]; }) - sources."connect-3.6.2" - sources."core-js-2.4.1" + (sources."connect-3.6.3" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."core-js-2.5.0" sources."di-0.0.1" sources."dom-serialize-2.2.1" (sources."expand-braces-0.1.2" // { @@ -24811,7 +26840,7 @@ in sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" @@ -24819,14 +26848,14 @@ in sources."ms-0.7.2" ]; }) - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."tmp-0.0.31" - sources."useragent-2.1.13" + sources."useragent-2.2.1" sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + 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.4.0" @@ -24839,9 +26868,9 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" - sources."anymatch-1.3.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" @@ -24849,8 +26878,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" 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" @@ -24859,11 +26888,10 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" 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.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -24884,7 +26912,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -24892,33 +26919,26 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."request-2.81.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -24976,7 +26996,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24986,9 +27006,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -25011,7 +27035,11 @@ in sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."encodeurl-1.0.1" @@ -25115,14 +27143,14 @@ in }; dependencies = [ sources."express-3.21.2" - (sources."passport-0.3.2" // { + (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.17" + sources."xml2js-0.4.19" sources."basic-auth-1.0.4" sources."connect-2.30.2" sources."content-disposition-0.5.0" @@ -25158,7 +27186,7 @@ in sources."csurf-1.8.3" (sources."errorhandler-1.4.3" // { dependencies = [ - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."escape-html-1.0.3" sources."negotiator-0.6.1" ]; @@ -25184,7 +27212,7 @@ in sources."qs-4.0.0" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.0" + sources."depd-1.1.1" ]; }) (sources."serve-favicon-2.3.2" // { @@ -25201,7 +27229,7 @@ in dependencies = [ sources."escape-html-1.0.3" sources."send-0.13.2" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."statuses-1.2.1" ]; }) @@ -25218,10 +27246,10 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.10" - sources."mime-types-2.1.15" + sources."compressible-2.0.11" + sources."mime-types-2.1.16" sources."negotiator-0.5.3" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.1" sources."csrf-3.0.6" sources."rndm-1.2.0" @@ -25251,9 +27279,8 @@ in sources."oauth-0.9.15" sources."passport-oauth2-1.4.0" sources."uid2-0.0.3" - sources."sax-1.2.2" - sources."xmlbuilder-4.2.1" - sources."lodash-4.17.4" + sources."sax-1.2.4" + sources."xmlbuilder-9.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -25262,6 +27289,358 @@ in }; production = true; }; + lerna = nodeEnv.buildNodePackage { + name = "lerna"; + packageName = "lerna"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lerna/-/lerna-2.1.0.tgz"; + sha1 = "22da4c9cb09f7733a7e87ba8f34779a509c172ea"; + }; + dependencies = [ + sources."async-1.5.2" + sources."chalk-2.1.0" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."command-join-2.0.0" + sources."conventional-changelog-cli-1.3.2" + (sources."conventional-recommended-bump-1.0.1" // { + dependencies = [ + sources."conventional-commits-parser-2.0.0" + ]; + }) + sources."dedent-0.7.0" + sources."execa-0.8.0" + sources."find-up-2.1.0" + sources."fs-extra-4.0.1" + sources."get-port-3.2.0" + sources."glob-7.1.2" + sources."globby-6.1.0" + sources."graceful-fs-4.1.11" + (sources."inquirer-3.2.2" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."is-ci-1.0.10" + (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."p-finally-1.0.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.1" + sources."safe-buffer-5.1.1" + sources."semver-5.4.1" + sources."signal-exit-3.0.2" + (sources."strong-log-transformer-1.0.6" // { + dependencies = [ + sources."minimist-0.1.0" + ]; + }) + (sources."temp-write-3.3.0" // { + dependencies = [ + sources."uuid-3.1.0" + ]; + }) + sources."write-file-atomic-2.3.0" + sources."write-json-file-2.2.0" + (sources."write-pkg-3.1.0" // { + dependencies = [ + sources."sort-keys-2.0.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."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.2.1" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."mkdirp-0.5.1" + sources."minimist-0.0.8" + sources."strip-ansi-3.0.1" + sources."wcwidth-1.0.1" + sources."ansi-regex-2.1.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."add-stream-1.0.0" + sources."conventional-changelog-1.1.4" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."read-pkg-up-1.0.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."tempfile-1.1.1" + sources."conventional-changelog-angular-1.4.0" + sources."conventional-changelog-atom-0.1.1" + sources."conventional-changelog-codemirror-0.1.0" + (sources."conventional-changelog-core-1.9.0" // { + dependencies = [ + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."load-json-file-1.1.0" + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) + sources."conventional-changelog-ember-0.2.6" + sources."conventional-changelog-eslint-0.1.0" + sources."conventional-changelog-express-0.1.0" + sources."conventional-changelog-jquery-0.1.0" + sources."conventional-changelog-jscs-0.1.0" + sources."conventional-changelog-jshint-0.1.0" + sources."compare-func-1.3.2" + sources."github-url-from-git-1.5.0" + sources."q-1.5.0" + sources."read-pkg-up-2.0.0" + sources."array-ify-1.0.0" + sources."dot-prop-3.0.0" + sources."is-obj-1.0.1" + sources."conventional-changelog-writer-1.4.1" + sources."conventional-commits-parser-1.3.0" + sources."dateformat-1.0.12" + sources."get-pkg-repo-1.4.0" + sources."git-raw-commits-1.2.0" + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-1.2.1" + sources."normalize-package-data-2.4.0" + sources."through2-2.0.3" + sources."conventional-commits-filter-1.0.0" + sources."handlebars-4.0.10" + 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.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + sources."yargs-3.10.0" + ]; + }) + sources."wordwrap-0.0.3" + sources."amdefine-1.0.1" + sources."uglify-to-browserify-1.0.2" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."through-2.3.8" + sources."JSONStream-1.3.1" + sources."is-text-path-1.0.1" + sources."split2-2.1.1" + sources."trim-off-newlines-1.0.1" + sources."jsonparse-1.3.1" + sources."text-extensions-1.5.0" + sources."get-stdin-4.0.1" + sources."parse-github-repo-url-1.4.0" + sources."hosted-git-info-2.5.0" + sources."dargs-4.1.0" + sources."lodash.template-4.4.0" + sources."number-is-nan-1.0.1" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.templatesettings-4.1.0" + sources."gitconfiglocal-1.0.0" + sources."pify-2.3.0" + sources."ini-1.3.4" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pinkie-promise-2.0.1" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."pinkie-2.0.4" + sources."is-utf8-0.2.1" + sources."readable-stream-2.3.3" + sources."xtend-4.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."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."object-assign-4.1.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."currently-unhandled-0.4.1" + sources."array-find-index-1.0.2" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."os-tmpdir-1.0.2" + sources."uuid-2.0.3" + sources."concat-stream-1.6.0" + sources."typedarray-0.0.6" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + 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."jsonfile-3.0.1" + sources."universalify-0.1.1" + 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."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."external-editor-2.0.4" + 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."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.5.1" + sources."tmp-0.0.31" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."ci-info-1.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.1.2" + sources."has-unicode-2.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."byline-5.0.0" + sources."duplexer-0.1.1" + sources."moment-2.18.1" + sources."make-dir-1.0.0" + sources."temp-dir-1.0.0" + sources."imurmurhash-0.1.4" + sources."detect-indent-5.0.0" + sources."sort-keys-1.1.2" + sources."is-plain-obj-1.1.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-2.1.0" // { + dependencies = [ + sources."execa-0.7.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-2.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-7.0.0" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."invert-kv-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Tool for managing JavaScript projects with multiple packages"; + homepage = https://lernajs.io/; + license = "MIT"; + }; + production = true; + }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -25274,19 +27653,19 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."xtend-4.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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" (sources."glob-stream-5.3.5" // { dependencies = [ sources."through2-0.6.5" @@ -25307,9 +27686,9 @@ in sources."strip-bom-stream-1.0.0" sources."through2-filter-2.0.0" sources."vali-date-1.0.0" - sources."end-of-stream-1.0.0" + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."extend-3.0.1" sources."glob-5.0.15" @@ -25352,7 +27731,7 @@ in ]; }) sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -25372,7 +27751,7 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" + sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -25403,6 +27782,322 @@ in }; production = true; }; + livedown = nodeEnv.buildNodePackage { + name = "livedown"; + packageName = "livedown"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; + sha1 = "896f8e28af72fdaa1137fda105d1066aadc65314"; + }; + dependencies = [ + sources."body-parser-1.17.2" + sources."chokidar-1.7.0" + (sources."express-4.15.4" // { + dependencies = [ + sources."debug-2.6.8" + sources."qs-6.5.0" + ]; + }) + sources."markdown-it-8.4.0" + sources."markdown-it-emoji-1.4.0" + sources."markdown-it-github-headings-1.0.1" + sources."markdown-it-task-checkbox-1.0.4" + sources."minimist-1.2.0" + sources."opn-5.1.0" + sources."request-2.81.0" + sources."socket.io-2.0.3" + sources."bytes-2.4.0" + sources."content-type-1.0.2" + 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.4.0" + sources."raw-body-2.2.0" + sources."type-is-1.6.15" + sources."ms-2.0.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" + sources."anymatch-1.3.2" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."path-is-absolute-1.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.1.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" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.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" + sources."regex-cache-0.4.3" + 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."kind-of-4.0.0" + ]; + }) + sources."repeat-string-1.6.1" + sources."isarray-1.0.0" + sources."is-buffer-1.1.5" + 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."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" + 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."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."nan-2.6.2" + sources."node-pre-gyp-0.6.36" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + sources."rc-1.2.1" + sources."rimraf-2.6.1" + sources."semver-5.4.1" + sources."tar-2.2.1" + sources."tar-pack-3.4.0" + sources."abbrev-1.1.0" + 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."aproba-1.1.2" + 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.4" + sources."strip-json-comments-2.0.1" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.11" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."accepts-1.3.4" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.2" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.8.0" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."fresh-0.5.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.5" + sources."range-parser-1.2.0" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."serve-static-1.12.4" + sources."utils-merge-1.0.0" + sources."vary-1.1.1" + sources."negotiator-0.6.1" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.4.0" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."argparse-1.0.9" + sources."entities-1.1.1" + sources."linkify-it-2.0.3" + sources."mdurl-1.0.1" + sources."uc.micro-1.0.3" + sources."sprintf-js-1.0.3" + sources."github-slugger-1.1.3" + sources."innertext-1.0.2" + sources."emoji-regex-6.1.1" + sources."html-entities-1.2.1" + sources."is-wsl-1.1.0" + 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."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + 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."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" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."asn1-0.2.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."punycode-1.4.1" + (sources."engine.io-3.1.0" // { + dependencies = [ + sources."accepts-1.3.3" + ]; + }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.3" + (sources."socket.io-parser-3.1.2" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."base64id-1.0.0" + sources."engine.io-parser-2.1.1" + (sources."ws-2.3.1" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) + sources."uws-0.14.5" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + (sources."has-binary2-1.0.2" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."ultron-1.1.0" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."engine.io-client-3.1.1" + sources."has-cors-1.1.0" + sources."indexof-0.0.1" + 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."parsejson-0.0.3" + sources."xmlhttprequest-ssl-1.5.3" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Live Markdown previews for your favourite editor."; + homepage = https://github.com/shime/livedown; + license = "MIT"; + }; + production = true; + }; meat = nodeEnv.buildNodePackage { name = "meat"; packageName = "meat"; @@ -25441,15 +28136,15 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.4.2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz"; - sha1 = "d0ef4d332126dbf18d0d640c9b382dd48be97594"; + url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz"; + sha1 = "1328567d2717f997030f8006234bce9b8cd72465"; }; dependencies = [ sources."browser-stdout-1.3.0" sources."commander-2.9.0" - sources."debug-2.6.0" + sources."debug-2.6.8" sources."diff-3.2.0" sources."escape-string-regexp-1.0.5" sources."glob-7.1.1" @@ -25459,7 +28154,7 @@ in sources."mkdirp-0.5.1" sources."supports-color-3.1.2" sources."graceful-readlink-1.0.1" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -25512,64 +28207,63 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz"; - sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.3.0.tgz"; + sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc"; }; dependencies = [ sources."optparse-1.0.5" - sources."semver-5.3.0" - sources."npm-registry-client-7.1.2" - (sources."npmconf-2.0.9" // { + sources."semver-5.4.1" + 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-1.0.3" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - (sources."fs.extra-1.2.1" // { + sources."tar-3.1.15" + sources."temp-0.8.3" + (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" sources."nijs-0.0.23" - sources."chownr-1.0.1" sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."normalize-package-data-2.3.8" - sources."npm-package-arg-4.2.1" + sources."normalize-package-data-2.4.0" + sources."npm-package-arg-5.1.2" sources."once-1.4.0" sources."request-2.81.0" - sources."retry-0.8.0" - sources."rimraf-2.6.1" + sources."retry-0.10.1" sources."slide-1.1.6" - sources."npmlog-3.1.2" + sources."ssri-4.1.6" + sources."npmlog-4.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."minimist-0.0.8" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" + sources."osenv-0.1.4" + sources."validate-npm-package-name-3.0.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."builtins-1.0.3" sources."wrappy-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -25584,7 +28278,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -25604,7 +28298,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25614,9 +28308,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -25632,23 +28330,14 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" - 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."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.1.2" - sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -25661,26 +28350,25 @@ in sources."ansi-regex-2.1.1" sources."config-chain-1.1.11" sources."ini-1.3.4" + sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."osenv-0.1.4" sources."uid-number-0.0.5" sources."proto-list-1.2.4" + sources."minimist-0.0.8" sources."abbrev-1.1.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."block-stream-0.0.9" - sources."fstream-1.0.11" + sources."minipass-2.2.1" + sources."minizlib-1.0.3" + sources."yallist-3.0.2" + sources."rimraf-2.2.8" (sources."fs-extra-0.6.4" // { dependencies = [ sources."mkdirp-0.3.5" - sources."rimraf-2.2.8" ]; }) - sources."walk-2.2.1" + sources."walk-2.3.9" sources."ncp-0.4.2" sources."jsonfile-1.0.1" - sources."forEachAsync-2.2.1" - sources."sequence-2.2.1" + sources."foreachasync-3.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -25705,13 +28393,13 @@ in sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."osenv-0.1.4" sources."request-2.81.0" sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.14" + sources."which-1.3.0" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -25728,12 +28416,12 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -25761,7 +28449,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -25781,7 +28469,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25791,9 +28479,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -25809,7 +28501,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."isexe-2.0.0" @@ -25834,11 +28526,7 @@ in sources."async-0.9.2" sources."biased-opener-0.2.8" sources."debug-2.6.8" - (sources."express-4.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."express-4.15.4" sources."glob-5.0.15" sources."path-is-absolute-1.0.1" sources."rc-1.2.1" @@ -25847,7 +28535,7 @@ in sources."strong-data-uri-1.0.4" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" - sources."which-1.2.14" + sources."which-1.3.0" sources."ws-1.1.4" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -25885,12 +28573,12 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.23" + sources."big-integer-1.6.24" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -25899,7 +28587,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -25927,50 +28615,42 @@ in sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."ms-2.0.0" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."finalhandler-1.0.4" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" - sources."qs-6.4.0" + sources."proxy-addr-1.1.5" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) - sources."serve-static-1.12.3" + sources."send-0.15.4" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" sources."mime-1.3.4" sources."inherits-2.0.3" sources."media-typer-0.3.0" @@ -25990,13 +28670,17 @@ in (sources."node-pre-gyp-0.6.36" // { dependencies = [ sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."glob-7.1.2" ]; }) sources."nopt-4.0.1" - sources."npmlog-4.1.0" - sources."request-2.81.0" + sources."npmlog-4.1.2" + (sources."request-2.81.0" // { + dependencies = [ + sources."qs-6.4.0" + ]; + }) sources."tar-2.2.1" (sources."tar-pack-3.4.0" // { dependencies = [ @@ -26010,11 +28694,19 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.2" + (sources."string_decoder-1.0.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."aproba-1.1.2" sources."has-unicode-2.0.1" sources."string-width-1.0.2" @@ -26054,7 +28746,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26064,9 +28756,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26117,7 +28813,7 @@ in dependencies = [ sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -26125,7 +28821,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -26138,13 +28834,13 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -26173,7 +28869,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26193,7 +28889,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26203,9 +28899,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26221,7 +28921,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -26272,7 +28972,7 @@ in }) sources."undefsafe-0.0.3" sources."update-notifier-0.5.0" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."inherits-2.0.3" @@ -26281,8 +28981,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" 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" @@ -26291,11 +28991,10 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" 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.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -26316,7 +29015,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -26324,20 +29022,21 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -26345,7 +29044,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -26385,7 +29084,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26405,7 +29104,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26415,9 +29114,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26433,7 +29136,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -26493,7 +29196,7 @@ in ]; }) sources."registry-url-3.1.0" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."is-redirect-1.0.0" sources."is-stream-1.1.0" @@ -26502,11 +29205,7 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -26523,93 +29222,91 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.2"; + version = "0.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; - sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz"; + sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; }; dependencies = [ sources."basic-auth-1.1.0" - sources."bcryptjs-2.4.0" - (sources."body-parser-1.15.2" // { - dependencies = [ - sources."raw-body-2.1.7" - ]; - }) + sources."bcryptjs-2.4.3" + sources."body-parser-1.17.2" sources."cheerio-0.22.0" - sources."clone-2.1.0" + sources."clone-2.1.1" + sources."cookie-0.3.1" sources."cookie-parser-1.4.3" - sources."cors-2.8.1" + sources."cors-2.8.3" sources."cron-1.2.1" - sources."express-4.14.0" - (sources."follow-redirects-1.2.1" // { + sources."express-4.15.3" + (sources."express-session-1.15.2" // { dependencies = [ - sources."debug-2.6.8" - sources."ms-2.0.0" + 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" + sources."hash-sum-1.0.2" sources."i18next-1.10.6" sources."is-utf8-0.2.1" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.4" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.0.10" + sources."jsonata-1.2.6" sources."media-typer-0.3.0" - sources."mqtt-2.2.1" + sources."mqtt-2.9.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) sources."mustache-2.3.0" sources."nopt-3.0.6" - sources."oauth2orize-1.7.0" + sources."oauth2orize-1.8.0" sources."on-headers-1.0.1" sources."passport-0.3.2" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" - (sources."raw-body-2.2.0" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) + sources."raw-body-2.2.0" sources."semver-5.3.0" sources."sentiment-2.1.0" - (sources."uglify-js-2.7.5" // { + sources."uglify-js-3.0.20" + sources."when-3.7.8" + (sources."ws-1.1.1" // { dependencies = [ - sources."async-0.2.10" + sources."ultron-1.0.2" ]; }) - sources."when-3.7.7" - 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.23" + sources."node-red-node-email-0.1.24" (sources."node-red-node-twitter-0.1.11" // { dependencies = [ sources."request-2.81.0" sources."caseless-0.12.0" sources."form-data-2.1.4" sources."har-validator-4.2.1" - sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) sources."node-red-node-rbe-0.1.11" - sources."bcrypt-1.0.2" + sources."bcrypt-1.0.3" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.2.0" - sources."depd-1.1.0" - sources."http-errors-1.5.1" - sources."iconv-lite-0.4.13" + 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.2.0" + sources."qs-6.4.0" 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.2" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."unpipe-1.0.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -26636,45 +29333,48 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."cookie-0.3.1" sources."cookie-signature-1.0.6" + sources."object-assign-4.1.1" sources."vary-1.1.1" sources."moment-timezone-0.5.13" sources."moment-2.18.1" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.14.1" - (sources."serve-static-1.11.2" // { - dependencies = [ - sources."send-0.14.2" - sources."ms-0.7.2" - ]; - }) + sources."send-0.15.3" + sources."serve-static-1.12.3" sources."utils-merge-1.0.0" sources."negotiator-0.6.1" + sources."unpipe-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" + sources."crc-3.4.4" + sources."uid-safe-2.1.5" + sources."random-bytes-1.0.0" sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" @@ -26685,18 +29385,22 @@ in sources."json5-0.2.0" sources."keygrip-1.0.1" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."commist-1.0.0" sources."concat-stream-1.6.0" sources."end-of-stream-1.4.0" sources."help-me-1.1.0" sources."minimist-1.2.0" - sources."mqtt-packet-5.3.0" + sources."mqtt-packet-5.4.0" sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" - sources."websocket-stream-3.3.3" + (sources."websocket-stream-5.0.1" // { + dependencies = [ + sources."ws-3.1.0" + ]; + }) sources."xtend-4.0.1" sources."leven-1.0.2" sources."typedarray-0.0.6" @@ -26711,7 +29415,7 @@ in sources."is-negated-glob-1.0.0" sources."ordered-read-streams-1.0.1" sources."pumpify-1.3.5" - sources."remove-trailing-separator-1.0.2" + sources."remove-trailing-separator-1.1.0" sources."to-absolute-glob-2.0.1" sources."unique-stream-2.2.1" sources."fs.realpath-1.0.0" @@ -26724,12 +29428,7 @@ in sources."is-glob-3.1.0" sources."path-dirname-1.0.2" sources."is-extglob-2.1.1" - (sources."duplexify-3.5.0" // { - dependencies = [ - sources."end-of-stream-1.0.0" - sources."once-1.3.3" - ]; - }) + sources."duplexify-3.5.1" sources."stream-shift-1.0.0" sources."extend-shallow-2.0.1" sources."is-absolute-0.2.6" @@ -26742,29 +29441,37 @@ in sources."through2-filter-2.0.0" sources."jsonify-0.0.0" sources."bl-1.2.1" + sources."ultron-1.1.0" + sources."append-field-0.1.0" + (sources."busboy-0.2.14" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."dicer-0.2.5" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + sources."streamsearch-0.1.2" sources."abbrev-1.1.0" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" sources."pause-0.0.1" - sources."source-map-0.5.6" - 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."wordwrap-0.0.2" - 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.5" + sources."commander-2.9.0" + sources."source-map-0.5.7" + sources."graceful-readlink-1.0.1" sources."options-0.0.6" - sources."ultron-1.0.2" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" (sources."feedparser-1.1.3" // { @@ -26778,6 +29485,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."bl-1.1.2" + sources."qs-6.2.3" sources."readable-stream-2.0.6" sources."string_decoder-0.10.31" ]; @@ -26791,7 +29499,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" ]; }) sources."har-validator-2.0.6" @@ -26806,8 +29514,7 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" + sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26815,7 +29522,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -26826,7 +29532,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26836,9 +29542,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26889,6 +29599,7 @@ in sources."minimist-0.0.10" ]; }) + sources."wordwrap-0.0.3" (sources."mimelib-0.3.1" // { dependencies = [ sources."addressparser-1.0.1" @@ -26905,34 +29616,25 @@ in sources."ajv-4.11.8" sources."har-schema-1.0.5" sources."co-4.6.0" - sources."bindings-1.2.1" - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.6.2" + (sources."node-pre-gyp-0.6.36" // { dependencies = [ + sources."nopt-4.0.1" sources."request-2.81.0" sources."caseless-0.12.0" sources."form-data-2.1.4" sources."har-validator-4.2.1" - sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."npmlog-4.1.0" - sources."rc-1.1.7" - sources."rimraf-2.5.4" + sources."npmlog-4.1.2" + sources."rc-1.2.1" + sources."rimraf-2.6.1" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - sources."string_decoder-0.10.31" - ]; - }) + sources."tar-pack-3.4.0" + 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" @@ -26940,7 +29642,6 @@ in sources."delegates-1.0.0" sources."aproba-1.1.2" 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."wide-align-1.1.2" @@ -26954,7 +29655,6 @@ in sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."buffer-shims-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -27018,7 +29718,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.8" // { + (sources."debug-3.0.1" // { dependencies = [ sources."ms-2.0.0" ]; @@ -27028,7 +29728,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -27093,25 +29793,30 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.3"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; - sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; + url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz"; + sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17"; }; dependencies = [ sources."JSONStream-1.3.1" sources."abbrev-1.1.0" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - sources."cacache-9.2.8" + sources."cacache-9.2.9" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" - sources."columnify-1.5.4" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."config-chain-1.1.11" sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" @@ -27123,20 +29828,21 @@ in sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" + sources."libnpx-9.2.3" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" sources."mississippi-1.3.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" @@ -27146,33 +29852,29 @@ in ]; }) sources."nopt-4.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.3.0" + sources."npm-registry-client-8.4.0" sources."npm-user-validate-1.0.0" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - sources."pacote-2.7.36" + sources."pacote-2.7.38" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."request-2.81.0" sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -27186,17 +29888,18 @@ in ]; }) sources."ssri-4.1.6" - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" - sources."update-notifier-2.1.0" - sources."uuid-3.0.1" + sources."update-notifier-2.2.0" + sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.2.14" + sources."worker-farm-1.4.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -27216,7 +29919,7 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.4" sources."brace-expansion-1.1.8" @@ -27225,17 +29928,74 @@ in sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."dotenv-4.0.0" + sources."yargs-8.0.2" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + 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-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."yargs-parser-7.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."execa-0.7.0" + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" + sources."invert-kv-1.0.0" + sources."mimic-fn-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-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."pseudomap-1.0.2" sources."yallist-2.1.2" sources."concat-stream-1.6.0" - (sources."duplexify-3.5.0" // { - dependencies = [ - sources."end-of-stream-1.0.0" - sources."once-1.3.3" - ]; - }) + sources."duplexify-3.5.1" sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" @@ -27249,49 +30009,51 @@ in sources."cyclist-0.2.2" sources."xtend-4.0.1" sources."minimist-0.0.8" - sources."copy-concurrently-1.0.3" + sources."copy-concurrently-1.0.5" sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-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."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."delegates-1.0.0" sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - sources."string-width-1.0.2" - 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."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."make-fetch-happen-2.4.12" - sources."npm-pick-manifest-1.0.3" + sources."make-fetch-happen-2.5.0" + sources."npm-pick-manifest-1.0.4" sources."promise-retry-1.1.1" sources."protoduck-4.0.0" sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" - sources."agentkeepalive-3.2.0" + sources."agentkeepalive-3.3.0" sources."http-cache-semantics-3.7.3" - sources."http-proxy-agent-1.0.0" - sources."https-proxy-agent-1.0.0" - sources."node-fetch-npm-2.0.1" - sources."socks-proxy-agent-2.1.1" + sources."http-proxy-agent-2.0.0" + sources."https-proxy-agent-2.1.0" + sources."node-fetch-npm-2.0.2" + sources."socks-proxy-agent-3.0.0" sources."humanize-ms-1.2.1" sources."ms-2.0.0" - (sources."agent-base-2.1.1" // { - dependencies = [ - sources."semver-5.0.3" - ]; - }) - sources."extend-3.0.1" + sources."agent-base-4.1.1" sources."debug-2.6.8" + sources."es6-promisify-5.0.0" + sources."es6-promise-4.1.1" sources."encoding-0.1.12" - sources."json-parse-helpfulerror-1.0.3" + sources."json-parse-better-errors-1.0.1" sources."iconv-lite-0.4.18" - sources."jju-1.3.0" sources."socks-1.1.10" sources."ip-1.1.5" sources."smart-buffer-1.1.15" @@ -27300,19 +30062,17 @@ in sources."bl-1.2.1" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" + sources."slash-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" 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" @@ -27321,7 +30081,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -27340,7 +30100,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27350,9 +30110,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -27368,49 +30132,55 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.1" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."chalk-2.1.0" ]; }) - sources."chalk-1.1.3" - sources."configstore-3.1.0" + (sources."chalk-1.1.3" // { + dependencies = [ + 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."configstore-3.1.1" + sources."import-lazy-2.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" - sources."lazy-req-2.0.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" - (sources."ansi-align-2.0.0" // { + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + sources."term-size-1.2.0" + (sources."widest-line-1.0.0" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" ]; }) - sources."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - sources."term-size-0.1.1" - sources."widest-line-1.0.0" - sources."execa-0.4.0" - sources."cross-spawn-async-2.2.5" - sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" - sources."strip-eof-1.0.0" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."dot-prop-4.1.1" + sources."supports-color-4.2.1" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."dot-prop-4.2.0" sources."make-dir-1.0.0" sources."unique-string-1.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" sources."crypto-random-string-1.0.0" sources."package-json-4.0.1" sources."got-6.7.1" @@ -27418,7 +30188,6 @@ in sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" - sources."get-stream-3.0.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" @@ -27436,6 +30205,8 @@ in sources."strip-json-comments-2.0.1" sources."builtins-1.0.3" sources."isexe-2.0.0" + sources."errno-0.1.4" + sources."prr-0.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" @@ -27485,7 +30256,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.81.0" @@ -27496,7 +30267,7 @@ in sources."rimraf-2.6.1" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -27510,11 +30281,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -27531,7 +30302,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27541,9 +30312,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -27559,7 +30335,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -27577,19 +30353,10 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) - sources."core-util-is-1.0.2" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -27641,33 +30408,37 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.11.3"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.3.tgz"; - sha1 = "5e0172857f89004340b1b9afc0e9acb3bc56d440"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz"; + sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d"; }; dependencies = [ sources."bluebird-3.5.0" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."fast-diff-1.1.1" sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."json-parse-helpfulerror-1.0.3" sources."lodash-4.17.4" sources."node-alias-1.0.4" - sources."npm-3.10.10" + (sources."npm-3.10.10" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" ]; }) sources."require-dir-0.3.2" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.34.4" // { + (sources."snyk-1.40.1" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -27678,13 +30449,30 @@ in sources."timed-out-2.0.0" ]; }) - sources."spawn-please-0.2.0" - (sources."update-notifier-1.0.3" // { + sources."spawn-please-0.3.0" + (sources."update-notifier-2.2.0" // { dependencies = [ - sources."boxen-0.6.0" - sources."configstore-2.1.0" - sources."camelcase-2.1.1" - sources."uuid-2.0.3" + (sources."boxen-1.2.1" // { + dependencies = [ + sources."chalk-2.1.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."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."dot-prop-4.2.0" + sources."write-file-atomic-2.3.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-2.2.1" @@ -27694,7 +30482,6 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."colors-1.0.3" - sources."graceful-readlink-1.0.1" sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -27704,7 +30491,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -27764,7 +30551,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" (sources."readable-stream-2.1.5" // { dependencies = [ @@ -27837,26 +30624,28 @@ in sources."es6-symbol-3.1.1" sources."ms-2.0.0" sources."d-1.0.0" - sources."es5-ext-0.10.23" + sources."es5-ext-0.10.30" sources."es6-iterator-2.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" ]; }) 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."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" + sources."json-parse-better-errors-1.0.1" + sources."slash-1.0.0" sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -27877,7 +30666,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."qs-6.2.3" @@ -27886,7 +30675,7 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."is-my-json-valid-2.16.0" + sources."is-my-json-valid-2.16.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -27897,7 +30686,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27907,9 +30696,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -27925,7 +30718,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" @@ -27949,9 +30742,12 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" + sources."snyk-go-plugin-1.1.2" + sources."snyk-gradle-plugin-1.1.1" sources."snyk-module-1.8.1" + sources."snyk-mvn-plugin-1.0.0" sources."snyk-policy-1.7.1" - sources."snyk-python-plugin-1.0.0" + sources."snyk-python-plugin-1.2.3" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -27963,6 +30759,7 @@ in sources."minimist-1.2.0" ]; }) + sources."snyk-sbt-plugin-1.1.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.2.0" (sources."tempfile-1.1.1" // { @@ -27981,7 +30778,7 @@ in sources."xdg-basedir-2.0.0" sources."async-1.5.2" sources."cli-cursor-1.0.2" - sources."cli-width-2.1.0" + sources."cli-width-2.2.0" sources."figures-1.7.0" sources."run-async-2.3.0" sources."rx-4.1.0" @@ -28015,9 +30812,28 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" - sources."js-yaml-3.8.4" + sources."fs-0.0.1-security" + sources."toml-2.3.2" + 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" // { + dependencies = [ + sources."kind-of-2.0.1" + sources."lazy-cache-0.2.7" + ]; + }) + sources."for-in-1.0.2" + sources."isobject-3.0.1" + sources."is-extendable-0.1.1" + (sources."mixin-object-2.0.1" // { + dependencies = [ + sources."for-in-0.1.8" + ]; + }) + sources."js-yaml-3.9.1" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" (sources."clite-0.3.0" // { dependencies = [ @@ -28094,21 +30910,41 @@ in sources."is-utf8-0.2.1" sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."promise-7.3.0" + sources."promise-7.3.1" sources."string-length-1.0.1" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."nested-error-stacks-1.0.2" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" sources."querystring-0.2.0" - sources."lazy-req-1.1.0" - sources."ansi-align-1.1.0" + sources."import-lazy-2.1.0" + (sources."ansi-align-2.0.0" // { + 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."cli-boxes-1.0.0" + sources."term-size-1.2.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."execa-0.7.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" + sources."make-dir-1.0.0" + sources."unique-string-1.0.0" + sources."crypto-random-string-1.0.0" + sources."duplexer3-0.1.4" ]; buildInputs = globalBuildInputs; meta = { @@ -28134,23 +30970,24 @@ in sources."content-type-1.0.2" ]; }) - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" ]; }) sources."connect-busboy-0.0.2" sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."core-js-2.4.1" + sources."core-js-2.5.0" sources."diff-1.4.0" - sources."domino-1.0.28" + sources."domino-1.0.29" sources."entities-1.1.1" - (sources."express-4.15.3" // { + (sources."express-4.15.4" // { dependencies = [ sources."content-type-1.0.2" - sources."finalhandler-1.0.3" + sources."debug-2.6.8" + sources."finalhandler-1.0.4" + sources."qs-6.5.0" ]; }) sources."express-handlebars-3.0.0" @@ -28160,14 +30997,14 @@ in sources."ms-0.7.1" ]; }) - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.1" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" sources."request-2.81.0" - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."serve-favicon-2.4.3" // { dependencies = [ sources."safe-buffer-5.0.1" @@ -28189,12 +31026,12 @@ in sources."camelcase-3.0.0" ]; }) - sources."asap-2.0.5" + sources."asap-2.0.6" sources."is-arguments-1.0.2" sources."bytes-2.4.0" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + 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.4.0" @@ -28207,11 +31044,12 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" - sources."accepts-1.3.3" - sources."compressible-2.0.10" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" + sources."accepts-1.3.4" + sources."compressible-2.0.11" sources."on-headers-1.0.1" + sources."safe-buffer-5.1.1" sources."vary-1.1.1" sources."busboy-0.2.14" sources."dicer-0.2.5" @@ -28232,13 +31070,17 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" - sources."serve-static-1.12.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."serve-static-1.12.4" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" @@ -28249,7 +31091,7 @@ in ]; }) sources."object.assign-4.0.4" - sources."promise-7.3.0" + sources."promise-7.3.1" sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."once-1.4.0" @@ -28262,7 +31104,7 @@ in sources."source-map-0.4.4" (sources."uglify-js-2.8.29" // { dependencies = [ - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."yargs-3.10.0" ]; }) @@ -28291,7 +31133,7 @@ in sources."define-properties-1.1.2" sources."foreach-2.0.5" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -28308,7 +31150,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -28325,7 +31166,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28335,9 +31176,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -28355,20 +31200,19 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."bluebird-3.5.0" - sources."bunyan-1.8.10" + sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" sources."hot-shots-4.5.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.3" + sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -28391,29 +31235,26 @@ in sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."lodash-3.10.1" sources."merge-1.2.0" - (sources."msgpack5-3.4.1" // { + (sources."msgpack5-3.5.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."process-nextick-args-1.0.7" @@ -28421,10 +31262,9 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."get-caller-file-1.0.2" @@ -28452,7 +31292,7 @@ in sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" @@ -28460,7 +31300,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -28485,10 +31325,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.3"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.3.tgz"; - sha1 = "7100ab8190192a19633c98a2ea124e089a68c19e"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; + sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048"; }; dependencies = [ sources."airplayer-2.0.0" @@ -28527,7 +31367,7 @@ in sources."bencode-0.7.0" ]; }) - sources."windows-no-runnable-0.0.6" + sources."winreg-1.2.3" sources."xtend-4.0.1" sources."airplay-protocol-2.0.2" sources."appendable-cli-menu-2.0.0" @@ -28541,15 +31381,15 @@ in sources."plist-1.2.0" sources."reverse-http-1.3.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.23" + sources."big-integer-1.6.24" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + 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.0.1" - sources."string_decoder-1.0.2" + 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" @@ -28559,7 +31399,7 @@ in sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.1" - sources."buffer-indexof-1.1.0" + sources."buffer-indexof-1.1.1" sources."next-line-1.1.0" sources."wrappy-1.0.2" sources."chalk-1.1.3" @@ -28580,7 +31420,7 @@ in sources."dns-txt-2.0.2" sources."multicast-dns-6.1.1" sources."multicast-dns-service-types-1.1.0" - sources."dns-packet-1.1.1" + sources."dns-packet-1.2.2" sources."thunky-0.1.0" sources."ip-1.1.5" sources."meow-3.7.0" @@ -28588,7 +31428,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -28597,9 +31437,9 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -28626,7 +31466,7 @@ in sources."get-stdin-4.0.1" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" - sources."cli-width-2.1.0" + sources."cli-width-2.2.0" sources."external-editor-1.1.1" sources."figures-1.7.0" sources."mute-stream-0.0.6" @@ -28645,15 +31485,16 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.7" - sources."parse-torrent-file-4.0.2" - sources."simple-get-2.6.0" + sources."parse-torrent-file-4.0.3" + sources."simple-get-2.7.0" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.11.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" sources."rusha-0.8.6" + sources."decompress-response-3.3.0" sources."simple-concat-1.0.0" - sources."unzip-response-2.0.1" + sources."mimic-response-1.0.0" sources."end-of-stream-1.4.0" sources."deep-extend-0.4.2" sources."ini-1.3.4" @@ -28682,11 +31523,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."randombytes-2.0.5" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" sources."buffer-alloc-unsafe-1.0.0" sources."debug-2.6.8" @@ -28732,8 +31569,8 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.2" - sources."bn.js-4.11.6" + sources."k-rpc-socket-1.7.1" + sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" @@ -28741,6 +31578,7 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."ws-2.3.1" + sources."safe-buffer-5.0.1" ]; }) sources."string2compact-1.2.2" @@ -28749,7 +31587,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.5.2" sources."get-browser-rtc-1.0.2" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" @@ -28805,8 +31643,8 @@ in sources."pend-1.2.0" sources."ee-first-1.1.1" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."basic-auth-1.0.4" (sources."connect-2.30.2" // { dependencies = [ @@ -28845,7 +31683,7 @@ in sources."csurf-1.8.3" (sources."errorhandler-1.4.3" // { dependencies = [ - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."escape-html-1.0.3" sources."negotiator-0.6.1" ]; @@ -28869,7 +31707,7 @@ in sources."pause-0.1.0" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.0" + sources."depd-1.1.1" ]; }) (sources."serve-favicon-2.3.2" // { @@ -28886,7 +31724,7 @@ in dependencies = [ sources."escape-html-1.0.3" sources."send-0.13.2" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."range-parser-1.0.3" sources."statuses-1.2.1" ]; @@ -28901,7 +31739,7 @@ in }) sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."negotiator-0.5.3" sources."ms-0.7.1" sources."csrf-3.0.6" @@ -29047,7 +31885,7 @@ in sources."run-parallel-1.1.6" sources."thunky-1.0.2" sources."buffer-alloc-unsafe-1.0.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."ip-1.1.5" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -29083,43 +31921,43 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - (sources."k-rpc-socket-1.6.2" // { + (sources."k-rpc-socket-1.7.1" // { dependencies = [ - sources."bencode-0.11.0" + sources."bencode-1.0.0" ]; }) - sources."bn.js-4.11.6" + 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.6.0" + sources."simple-get-2.7.0" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."ws-2.3.1" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" sources."ultron-1.1.0" ]; }) sources."string2compact-1.2.2" sources."uniq-1.0.1" + sources."decompress-response-3.3.0" sources."simple-concat-1.0.0" - sources."unzip-response-2.0.1" + sources."mimic-response-1.0.0" sources."get-browser-rtc-1.0.2" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."addr-to-ip-port-1.4.2" - sources."which-1.2.14" + sources."which-1.3.0" sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; @@ -29185,7 +32023,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -29199,11 +32037,11 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29213,9 +32051,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -29237,15 +32079,14 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" + sources."commander-2.11.0" + sources."is-my-json-valid-2.16.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."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -29265,10 +32106,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.4.4"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.4.4.tgz"; - sha1 = "a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.5.3.tgz"; + sha1 = "59dadc683345ec6b88f88b94ed4ae7e1da394bfe"; }; buildInputs = globalBuildInputs; meta = { @@ -29293,7 +32134,7 @@ in sources."source-map-0.1.31" ]; }) - sources."commander-2.9.0" + sources."commander-2.11.0" sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" @@ -29302,7 +32143,6 @@ in sources."private-0.1.7" sources."q-1.5.0" sources."recast-0.11.23" - sources."graceful-readlink-1.0.1" sources."acorn-4.0.13" sources."defined-1.0.0" sources."inflight-1.0.6" @@ -29317,7 +32157,7 @@ in sources."minimist-0.0.8" sources."ast-types-0.9.6" sources."esprima-3.1.3" - sources."source-map-0.5.6" + 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" @@ -29364,7 +32204,7 @@ in sources."crypto-0.0.3" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."coffee-script-1.6.3" sources."node-uuid-1.4.1" (sources."connect-2.11.0" // { @@ -29380,7 +32220,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.8" + sources."debug-3.0.1" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -29422,10 +32262,10 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -29442,7 +32282,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29452,9 +32292,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -29470,7 +32314,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -29482,10 +32326,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; }; buildInputs = globalBuildInputs; meta = { @@ -29515,22 +32359,22 @@ in sources."ms-2.0.0" ]; }) - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" + sources."ms-2.0.0" ]; }) - sources."commander-2.9.0" - sources."js-yaml-3.8.4" + sources."commander-2.11.0" + sources."js-yaml-3.9.1" sources."cookies-0.7.0" sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.10" + sources."bunyan-1.8.12" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -29539,7 +32383,7 @@ in sources."JSONStream-1.3.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" @@ -29548,20 +32392,20 @@ in }) sources."fs-ext-0.6.0" sources."crypt3-0.2.0" - sources."accepts-1.3.3" + sources."accepts-1.3.4" sources."array-flatten-2.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."debug-2.6.1" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { + (sources."finalhandler-1.0.4" // { dependencies = [ - sources."debug-2.6.7" + sources."debug-2.6.8" sources."ms-2.0.0" ]; }) @@ -29572,7 +32416,7 @@ in sources."parseurl-1.3.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."qs-6.4.0" sources."range-parser-1.2.0" (sources."router-1.3.1" // { @@ -29588,25 +32432,25 @@ in sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."on-headers-1.0.1" - sources."graceful-readlink-1.0.1" + sources."safe-buffer-5.1.1" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" sources."aws-sign2-0.6.0" @@ -29624,7 +32468,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -29641,7 +32484,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29651,9 +32494,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -29672,7 +32520,7 @@ in sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.3" + sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -29708,8 +32556,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.11" - sources."safe-buffer-5.0.1" + sources."readable-stream-2.3.3" ]; }) sources."regexp-quote-0.0.0" @@ -29722,14 +32569,9 @@ in sources."domelementtype-1.1.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.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."jsonparse-1.3.1" sources."through-2.3.8" @@ -29764,7 +32606,7 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.4" - sources."readable-stream-2.2.11" + 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" @@ -29773,8 +32615,8 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -29814,9 +32656,9 @@ in sources."assert-plus-0.1.2" sources."clone-0.1.5" sources."dashdash-1.10.1" - (sources."http-signature-1.1.1" // { + (sources."http-signature-1.2.0" // { dependencies = [ - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" ]; }) sources."once-1.3.0" @@ -29865,7 +32707,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.2.0" + sources."csv-parse-1.2.1" sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -29900,19 +32742,18 @@ in }) ]; }) - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" - sources."verror-1.3.6" + sources."extsprintf-1.3.0" ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" @@ -29937,7 +32778,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.8" + sources."debug-3.0.1" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -29972,8 +32813,8 @@ in sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.2" - sources."coa-1.0.3" + sources."sax-1.2.4" + sources."coa-1.0.4" sources."js-yaml-3.7.0" sources."colors-1.1.2" sources."whet.extend-0.9.9" @@ -29985,7 +32826,7 @@ in sources."sprintf-js-1.0.3" sources."minimist-0.0.8" sources."clap-1.2.0" - sources."source-map-0.5.6" + sources."source-map-0.5.7" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -30016,19 +32857,19 @@ in sources."glob-7.1.2" sources."minimatch-3.0.4" sources."resolve-from-2.0.0" - sources."tapable-0.2.6" + sources."tapable-0.2.8" sources."memory-fs-0.3.0" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -30050,10 +32891,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.3.4"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz"; - sha1 = "3d38321828231e434f287514959c37a82b629f42"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; + sha1 = "f8395f85d459276067c988aa41837a8f82870844"; }; buildInputs = globalBuildInputs; meta = { @@ -30066,15 +32907,14 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.17"; + version = "3.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.17.tgz"; - sha1 = "d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz"; + sha1 = "96b8495f0272944787b5843a1679aa326640d5f7"; }; dependencies = [ - sources."commander-2.9.0" - sources."source-map-0.5.6" - sources."graceful-readlink-1.0.1" + sources."commander-2.11.0" + sources."source-map-0.5.7" ]; buildInputs = globalBuildInputs; meta = { @@ -30087,28 +32927,46 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.19"; + version = "1.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.19.tgz"; - sha1 = "83e0c9d79c808f7acb5f2da5a1ea77e3db571558"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.28.tgz"; + sha1 = "372d0d57bd8efc3570de6b2743a4da8aaa83eefb"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."bluebird-3.5.0" sources."blueimp-md5-2.7.0" sources."body-parser-1.17.2" - sources."color-1.0.3" + sources."color-2.0.0" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.3.0" - sources."express-4.15.3" - sources."express-session-1.15.3" + (sources."express-4.15.4" // { + dependencies = [ + sources."debug-2.6.8" + sources."qs-6.5.0" + ]; + }) + (sources."express-session-1.15.5" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.7" + sources."ignore-3.3.4" sources."just-detect-adblock-1.0.0" - sources."keen.io-0.1.3" + (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."form-data-0.1.3" + sources."async-0.9.2" + ]; + }) sources."knockout-3.4.2" sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { @@ -30122,8 +32980,17 @@ in dependencies = [ sources."nopt-4.0.1" sources."npm-registry-client-8.1.1" + sources."readable-stream-2.2.11" sources."request-2.81.0" + sources."isarray-1.0.0" + sources."safe-buffer-5.0.1" + (sources."string_decoder-1.0.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."combined-stream-1.0.5" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."hawk-3.1.3" @@ -30137,10 +33004,11 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-8.3.0" // { + (sources."npm-registry-client-8.4.0" // { dependencies = [ sources."request-2.81.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."hawk-3.1.3" @@ -30159,11 +33027,11 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.2.1" // { + (sources."raven-2.1.2" // { dependencies = [ sources."json-stringify-safe-5.0.1" - sources."uuid-3.0.0" sources."stack-trace-0.0.9" + sources."uuid-3.0.0" ]; }) (sources."rc-1.2.1" // { @@ -30173,28 +33041,22 @@ in }) sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."serve-static-1.12.3" + sources."serve-static-1.12.4" sources."signals-1.0.0" sources."snapsvg-0.5.1" - (sources."socket.io-1.7.4" // { + sources."socket.io-2.0.3" + (sources."superagent-3.5.2" // { dependencies = [ - sources."debug-2.3.3" - sources."object-assign-4.1.0" - sources."ms-0.7.2" - ]; - }) - (sources."superagent-0.21.0" // { - dependencies = [ - sources."qs-1.2.0" - sources."mime-1.2.11" - sources."component-emitter-1.1.2" - sources."methods-1.0.1" - sources."extend-1.2.1" - sources."form-data-0.1.3" - sources."readable-stream-1.0.27-1" - sources."async-0.9.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" + 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" // { @@ -30210,15 +33072,17 @@ in }) (sources."yargs-8.0.2" // { dependencies = [ - sources."string-width-2.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."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + 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.4.0" @@ -30231,16 +33095,16 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."color-convert-1.9.0" sources."color-string-1.5.2" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."simple-swizzle-0.2.2" sources."is-arrayish-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."diff-3.2.0" + sources."diff-3.3.0" (sources."hogan.js-3.0.2" // { dependencies = [ sources."mkdirp-0.3.0" @@ -30249,31 +33113,39 @@ in sources."whatwg-fetch-2.0.3" sources."nopt-1.0.10" sources."abbrev-1.1.0" - 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" sources."escape-html-1.0.3" sources."etag-1.8.0" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."crc-3.4.4" sources."on-headers-1.0.1" - sources."uid-safe-2.1.4" + sources."uid-safe-2.1.5" sources."random-bytes-1.0.0" (sources."broadway-0.2.10" // { dependencies = [ @@ -30287,7 +33159,7 @@ in ]; }) sources."minimatch-0.0.5" - sources."pkginfo-0.4.0" + sources."pkginfo-0.4.1" sources."ps-tree-0.0.3" sources."watch-0.5.1" (sources."utile-0.1.7" // { @@ -30353,6 +33225,15 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" + sources."formidable-1.0.14" + sources."component-emitter-1.1.2" + sources."cookiejar-2.0.1" + sources."reduce-component-1.0.1" + sources."extend-1.2.1" + sources."readable-stream-1.0.27-1" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."clone-2.1.1" sources."JSONStream-1.3.1" sources."ansi-regex-2.1.1" @@ -30360,7 +33241,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" @@ -30369,7 +33250,13 @@ in sources."dezalgo-1.0.3" sources."editor-1.0.0" sources."fs-vacuum-1.2.10" - sources."fs-write-stream-atomic-1.0.10" + (sources."fs-write-stream-atomic-1.0.10" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."fstream-1.0.11" sources."fstream-npm-1.2.1" (sources."glob-7.1.2" // { @@ -30412,20 +33299,23 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" - sources."readable-stream-2.2.11" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" - sources."sha-2.0.1" + (sources."sha-2.0.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."slide-1.1.6" sources."sorted-object-2.0.1" (sources."sorted-union-stream-2.1.3" // { dependencies = [ sources."from2-1.3.0" sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -30459,6 +33349,9 @@ in ]; }) sources."proto-list-1.2.4" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."util-deprecate-1.0.2" (sources."fstream-ignore-1.0.5" // { dependencies = [ sources."minimatch-3.0.4" @@ -30472,30 +33365,67 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."concat-stream-1.6.0" - (sources."duplexify-3.5.0" // { + (sources."concat-stream-1.6.0" // { dependencies = [ - sources."end-of-stream-1.0.0" - sources."once-1.3.3" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."duplexify-3.5.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."end-of-stream-1.4.0" - sources."flush-write-stream-1.0.2" - sources."from2-2.3.0" - sources."parallel-transform-1.1.0" + (sources."flush-write-stream-1.0.2" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" - sources."through2-2.0.3" + (sources."through2-2.0.3" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."typedarray-0.0.6" sources."stream-shift-1.0.0" sources."cyclist-0.2.2" sources."xtend-4.0.1" - sources."copy-concurrently-1.0.3" + sources."copy-concurrently-1.0.5" sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - sources."are-we-there-yet-1.1.4" + (sources."are-we-there-yet-1.1.4" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."console-control-strings-1.1.0" sources."gauge-2.7.4" sources."set-blocking-2.0.0" @@ -30510,18 +33440,11 @@ in sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" - sources."json-parse-helpfulerror-1.0.3" - sources."jju-1.3.0" - 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."string_decoder-1.0.2" - sources."util-deprecate-1.0.2" + sources."json-parse-better-errors-1.0.1" + sources."slash-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" - sources."extend-3.0.1" sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" @@ -30536,7 +33459,7 @@ in sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30546,9 +33469,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -30565,19 +33492,33 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."stream-iterate-1.2.0" - sources."block-stream-0.0.9" - sources."unique-slug-2.0.0" - (sources."boxen-1.1.0" // { + (sources."stream-iterate-1.2.0" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) - sources."chalk-1.1.3" - (sources."configstore-3.1.0" // { + sources."block-stream-0.0.9" + sources."unique-slug-2.0.0" + (sources."boxen-1.2.1" // { dependencies = [ - sources."write-file-atomic-2.1.0" + sources."chalk-2.1.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."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."configstore-3.1.1" // { + dependencies = [ + sources."write-file-atomic-2.3.0" ]; }) sources."is-npm-1.0.0" @@ -30587,31 +33528,38 @@ in sources."xdg-basedir-3.0.0" (sources."ansi-align-2.0.0" // { dependencies = [ - sources."string-width-2.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."camelcase-4.1.0" sources."cli-boxes-1.0.0" - sources."term-size-0.1.1" + sources."term-size-1.2.0" sources."widest-line-1.0.0" - sources."execa-0.4.0" - (sources."cross-spawn-async-2.2.5" // { + sources."ansi-styles-3.2.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.2.1" + sources."has-flag-2.0.0" + sources."execa-0.7.0" + (sources."cross-spawn-5.1.0" // { dependencies = [ sources."lru-cache-4.1.1" ]; }) + sources."get-stream-3.0.0" sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."make-dir-1.0.0" sources."unique-string-1.0.0" sources."is-obj-1.0.1" @@ -30623,7 +33571,6 @@ in sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" - sources."get-stream-3.0.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" @@ -30637,95 +33584,71 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - (sources."ssri-4.1.6" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."ssri-4.1.6" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."eve-0.5.4" - (sources."engine.io-1.8.4" // { + (sources."engine.io-3.1.0" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" + sources."accepts-1.3.3" ]; }) - (sources."has-binary-0.1.7" // { + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.0.3" // { dependencies = [ - sources."isarray-0.0.1" + sources."component-emitter-1.2.1" ]; }) - (sources."socket.io-adapter-0.5.0" // { + (sources."socket.io-parser-3.1.2" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - (sources."socket.io-client-1.7.4" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - (sources."socket.io-parser-2.3.1" // { - dependencies = [ - sources."debug-2.2.0" - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" - sources."ms-0.7.1" + sources."component-emitter-1.2.1" + sources."isarray-2.0.1" ]; }) sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.4" + sources."engine.io-parser-2.1.1" + (sources."ws-2.3.1" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) + sources."uws-0.14.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.0.2" - sources."backo2-1.0.2" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.4" // { + (sources."has-binary2-1.0.2" // { dependencies = [ - sources."debug-2.3.3" - sources."ws-1.1.2" - sources."ms-0.7.2" + sources."isarray-2.0.1" ]; }) + sources."ultron-1.1.0" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + (sources."engine.io-client-3.1.1" // { + dependencies = [ + sources."component-emitter-1.2.1" + ]; + }) + sources."has-cors-1.1.0" sources."indexof-0.0.1" 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."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."json3-3.3.2" - sources."formidable-1.0.14" - sources."cookiejar-2.0.1" - sources."reduce-component-1.0.1" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - (sources."os-locale-2.0.0" // { - dependencies = [ - sources."execa-0.5.1" - sources."get-stream-2.3.1" - sources."npm-run-path-2.0.2" - sources."path-key-2.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" @@ -30735,14 +33658,6 @@ in sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."mem-1.1.0" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) - sources."p-finally-1.0.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" sources."invert-kv-1.0.0" sources."mimic-fn-1.1.0" sources."find-up-2.1.0" @@ -30787,7 +33702,7 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.11" // { dependencies = [ @@ -30848,7 +33763,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -30862,11 +33777,11 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30876,9 +33791,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -30900,15 +33819,14 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" + sources."commander-2.11.0" + sources."is-my-json-valid-2.16.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."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -30930,27 +33848,28 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.6.1"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz"; - sha1 = "2e0457f0abb1ac5df3ab106c69c672f236785f07"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz"; + sha1 = "3226f09fc8b3e435ff781e7af34f82b68b26996c"; }; dependencies = [ - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" ]; }) - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."async-2.4.1" - sources."enhanced-resolve-3.1.0" + sources."ajv-5.2.2" + sources."ajv-keywords-2.1.0" + sources."async-2.5.0" + sources."enhanced-resolve-3.4.1" + sources."escope-3.6.0" sources."interpret-1.0.3" - sources."json-loader-0.5.4" + sources."json-loader-0.5.7" sources."json5-0.5.1" sources."loader-runner-2.3.0" - sources."loader-utils-0.2.17" + sources."loader-utils-1.1.0" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" (sources."node-libs-browser-2.0.0" // { @@ -30958,39 +33877,55 @@ in sources."string_decoder-0.10.31" ]; }) - sources."source-map-0.5.6" - sources."supports-color-3.2.3" - sources."tapable-0.2.6" - (sources."uglify-js-2.8.29" // { + sources."source-map-0.5.7" + sources."supports-color-4.2.1" + sources."tapable-0.2.8" + sources."uglifyjs-webpack-plugin-0.4.6" + sources."watchpack-1.4.0" + sources."webpack-sources-1.0.1" + (sources."yargs-8.0.2" // { dependencies = [ - sources."yargs-3.10.0" - ]; - }) - sources."watchpack-1.3.1" - sources."webpack-sources-0.2.3" - (sources."yargs-6.6.0" // { - dependencies = [ - sources."camelcase-3.0.0" - sources."cliui-3.2.0" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + 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."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."lodash-4.17.4" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" + sources."es6-map-0.1.5" + sources."es6-weak-map-2.0.2" + sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" + sources."d-1.0.0" + sources."es5-ext-0.10.30" + sources."es6-iterator-2.0.1" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."event-emitter-0.3.5" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."errno-0.1.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."assert-1.4.1" @@ -30998,7 +33933,7 @@ in sources."buffer-4.9.1" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."domain-browser-1.1.7" sources."events-1.1.1" sources."https-browserify-0.0.1" @@ -31009,7 +33944,7 @@ in sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" - sources."timers-browserify-2.0.2" + sources."timers-browserify-2.0.4" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { dependencies = [ @@ -31023,7 +33958,7 @@ in }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" @@ -31032,32 +33967,33 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" - (sources."randombytes-2.0.5" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" - sources."evp_bytestokey-1.0.0" + sources."evp_bytestokey-1.0.2" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + 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.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" - sources."ripemd160-2.0.1" + (sources."ripemd160-2.0.1" // { + dependencies = [ + sources."hash-base-2.0.2" + ]; + }) sources."sha.js-2.4.8" - sources."hash-base-2.0.2" sources."miller-rabin-4.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -31065,7 +34001,12 @@ in sources."setimmediate-1.0.5" sources."querystring-0.2.0" sources."indexof-0.0.1" - sources."has-flag-1.0.0" + sources."has-flag-2.0.0" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."yargs-3.10.0" + ]; + }) sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" sources."cliui-2.1.0" @@ -31081,7 +34022,7 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" sources."chokidar-1.7.0" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" @@ -31089,8 +34030,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" 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" @@ -31098,11 +34039,10 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" - sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -31120,7 +34060,6 @@ in ]; }) sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -31128,7 +34067,8 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.1.0" + sources."binary-extensions-1.10.0" sources."minimatch-3.0.4" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.8" @@ -31137,7 +34077,7 @@ in sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -31145,7 +34085,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -31177,13 +34117,17 @@ in sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" - sources."har-validator-4.2.1" + (sources."har-validator-4.2.1" // { + dependencies = [ + sources."ajv-4.11.8" + ]; + }) 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.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -31199,7 +34143,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31209,9 +34153,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31227,7 +34175,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -31239,37 +34187,54 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-2.0.0" - sources."source-list-map-1.1.2" + sources."source-list-map-2.0.0" 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."which-module-1.0.0" + sources."which-module-2.0.0" sources."y18n-3.2.1" - (sources."yargs-parser-4.2.1" // { + (sources."yargs-parser-7.0.0" // { dependencies = [ - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" ]; }) sources."wrap-ansi-2.1.0" + sources."execa-0.7.0" sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."path-key-2.0.1" sources."invert-kv-1.0.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" - sources."path-type-1.1.0" + sources."mimic-fn-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-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" + sources."normalize-package-data-2.4.0" + sources."path-type-2.0.0" sources."parse-json-2.2.0" sources."pify-2.3.0" - sources."strip-bom-2.0.0" + sources."strip-bom-3.0.0" sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" - sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -31304,47 +34269,56 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.24.5"; + version = "0.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.24.5.tgz"; - sha1 = "92c72adf4de8dacccaf6b4259eb4990f6c4f8e3b"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.27.5.tgz"; + sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1"; }; dependencies = [ - sources."babel-runtime-6.23.0" + sources."babel-runtime-6.26.0" sources."bytes-2.5.0" sources."camelcase-4.1.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."death-1.1.0" sources."debug-2.6.8" sources."detect-indent-5.0.0" - sources."gunzip-maybe-1.4.0" + sources."glob-7.1.2" + sources."gunzip-maybe-1.4.1" sources."ini-1.3.4" - sources."inquirer-3.1.0" + (sources."inquirer-3.2.2" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) sources."invariant-2.2.2" sources."is-builtin-module-1.0.0" sources."is-ci-1.0.10" sources."leven-2.1.0" sources."loud-rejection-1.6.0" - sources."minimatch-3.0.4" + sources."micromatch-2.3.11" sources."mkdirp-0.5.1" - sources."node-emoji-1.5.1" + sources."node-emoji-1.8.1" sources."object-path-0.11.4" sources."proper-lockfile-2.0.1" sources."read-1.0.7" sources."request-2.81.0" sources."request-capture-har-1.2.2" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."strip-bom-3.0.0" sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" sources."uuid-3.1.0" sources."v8-compile-cache-1.1.0" sources."validate-npm-package-license-3.0.1" - sources."core-js-2.4.1" - sources."regenerator-runtime-0.10.5" + sources."core-js-2.5.0" + sources."regenerator-runtime-0.11.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -31352,8 +34326,17 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" 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."browserify-zlib-0.1.4" sources."is-deflate-1.0.0" sources."is-gzip-1.0.0" @@ -31361,32 +34344,21 @@ in sources."pumpify-1.3.5" sources."through2-2.0.3" sources."pako-0.2.9" - sources."duplexify-3.5.0" - sources."end-of-stream-1.0.0" - sources."inherits-2.0.3" - sources."readable-stream-2.2.11" + sources."duplexify-3.5.1" + sources."end-of-stream-1.4.0" + sources."readable-stream-2.3.3" sources."stream-shift-1.0.0" - sources."once-1.3.3" - sources."wrappy-1.0.2" 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."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - (sources."pump-1.0.2" // { - dependencies = [ - (sources."end-of-stream-1.4.0" // { - dependencies = [ - sources."once-1.4.0" - ]; - }) - ]; - }) + sources."pump-1.0.2" sources."xtend-4.0.1" sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.1.0" + sources."cli-width-2.2.0" sources."external-editor-2.0.4" sources."figures-2.0.0" sources."lodash-4.17.4" @@ -31394,29 +34366,76 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."loose-envify-1.3.1" - sources."js-tokens-3.0.1" + sources."js-tokens-3.0.2" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" + 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."is-extglob-1.0.0" + sources."is-glob-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.3" + 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."kind-of-4.0.0" + ]; + }) + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.1.0" + 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."minimist-0.0.8" - sources."string.prototype.codepointat-0.2.0" + sources."lodash.toarray-4.4.0" sources."retry-0.10.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -31431,7 +34450,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -31450,7 +34469,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31460,9 +34479,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31478,12 +34501,8 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."path-is-absolute-1.0.1" sources."chownr-1.0.1" sources."bl-1.2.1" sources."spdx-correct-1.0.2" @@ -31507,16 +34526,24 @@ in sha1 = "0cd75211379ed87105f99510885759062147b517"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."chalk-1.1.3" sources."cli-list-0.2.0" - sources."configstore-3.1.0" + sources."configstore-3.1.1" sources."cross-spawn-5.1.0" sources."figures-2.0.0" sources."fullname-3.3.0" sources."got-6.7.1" sources."humanize-string-1.0.1" - sources."inquirer-3.1.0" + (sources."inquirer-3.2.2" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" @@ -31594,13 +34621,14 @@ in (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" - sources."yeoman-environment-2.0.0" - (sources."yosay-2.0.0" // { + sources."yeoman-environment-2.0.2" + (sources."yosay-2.0.1" // { dependencies = [ - sources."ansi-styles-3.1.0" + sources."ansi-styles-3.2.0" ]; }) sources."ansi-styles-2.2.1" @@ -31609,20 +34637,20 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."graceful-fs-4.1.11" sources."make-dir-1.0.0" sources."unique-string-1.0.0" - sources."write-file-atomic-2.1.0" + 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."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" - sources."slide-1.1.6" + sources."signal-exit-3.0.2" sources."lru-cache-4.1.1" sources."shebang-command-1.2.0" - sources."which-1.2.14" + sources."which-1.3.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" sources."shebang-regex-1.0.0" @@ -31644,14 +34672,13 @@ in sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" sources."p-finally-1.0.0" - sources."signal-exit-3.0.2" 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."aggregate-error-1.0.0" sources."clean-stack-1.3.0" - sources."indent-string-3.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" @@ -31663,7 +34690,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -31672,18 +34699,26 @@ in sources."decamelize-1.2.0" sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.1.0" + sources."cli-width-2.2.0" sources."external-editor-2.0.4" 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."string-width-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -31700,6 +34735,7 @@ in }) sources."osenv-0.1.4" sources."os-homedir-1.0.2" + sources."slide-1.1.6" (sources."readline2-1.0.1" // { dependencies = [ sources."is-fullwidth-code-point-1.0.0" @@ -31714,7 +34750,7 @@ in sources."lodash._getnative-3.9.1" sources."osx-release-1.1.0" sources."win-release-1.1.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -31728,7 +34764,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -31746,7 +34782,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31756,9 +34792,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31774,12 +34815,12 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."camelcase-keys-2.1.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" (sources."redent-1.0.0" // { dependencies = [ sources."indent-string-2.1.0" @@ -31789,7 +34830,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -31816,20 +34857,11 @@ in sources."duplexer2-0.1.4" sources."node-status-codes-1.0.0" sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) - sources."core-util-is-1.0.2" + sources."readable-stream-2.3.3" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."registry-auth-token-3.3.1" sources."execall-1.0.0" @@ -31865,9 +34897,12 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.1" // { dependencies = [ sources."camelcase-4.1.0" + sources."chalk-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" ]; }) sources."import-lazy-2.1.0" @@ -31880,11 +34915,9 @@ in sources."semver-diff-2.1.0" sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" - (sources."term-size-0.1.1" // { + (sources."term-size-1.2.0" // { dependencies = [ - sources."execa-0.4.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" + sources."execa-0.7.0" ]; }) (sources."widest-line-1.0.0" // { @@ -31893,7 +34926,6 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."has-flag-1.0.0" (sources."bin-version-check-2.1.0" // { dependencies = [ sources."semver-4.3.6" @@ -31919,7 +34951,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."diff-3.2.0" + sources."diff-3.3.0" sources."globby-6.1.0" sources."grouped-queue-0.3.3" sources."is-scoped-1.0.0" @@ -31949,8 +34981,6 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."color-convert-1.9.0" - sources."color-name-1.1.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 7edd0ddda5eb..ee25a47670ea 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = "https://forge.ocamlcore.org/projects/ansiterminal"; + homepage = https://forge.ocamlcore.org/projects/ansiterminal; description = "A module allowing to use the colors and cursor movements on ANSI terminals"; longDescription = '' ANSITerminal is a module allowing to use the colors and cursor diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index b3e657842f88..7c8dc08c4888 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: -let version = "2.6.0"; in +let version = "2.7.0"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672"; + sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index fa9b353f4d60..121f484ce419 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -47,7 +47,7 @@ EOF checkTarget = "tests"; meta = with stdenv.lib; { - homepage = "http://bolt.x9c.fr"; + homepage = http://bolt.x9c.fr; description = "A logging tool for the OCaml language"; longDescription = '' Bolt is a logging tool for the OCaml language. It is inspired by and diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 63daf21e4080..a7e591e049e6 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,5 +1,9 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: +if stdenv.lib.versionAtLeast ocaml.version "4.05" +then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "camomile-${version}"; version = "0.8.2"; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 950d7f7fc8f2..48517036dc6d 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation rec { name = "camomile-${version}"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; + })]; + buildInputs = [ocaml findlib camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index f44db6151751..84ac3ae61339 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,18 +6,18 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "1.2"; + version = "1.3"; in stdenv.mkDerivation { - name = "ocaml-containers-${version}"; + name = "ocaml${ocaml.version}-containers-${version}"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "0k1676bn12hhayjlpy8bxfc3sgq6wd7zkh0ca700zh8jxjrshjqk"; + sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 9ecd6dae2948..412146244278 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.11"; - url = http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz; - sha256 = "1c1vn15lf2b5a8nfa2v2brxm7bwby540nf6q0vkndgkq5qcw96j8"; + version = "1.13"; + url = https://github.com/xavierleroy/cryptokit/archive/release113.tar.gz; + sha256 = "1f4jjnp2a911nqw0hbijyv9vygkk6kw5zx75qs49hfm3by6ij8rq"; inherit zarith; } else { version = "1.10"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; meta = { - homepage = "http://pauillac.inria.fr/~xleroy/software.html"; + homepage = http://pauillac.inria.fr/~xleroy/software.html; description = "A library of cryptographic primitives for OCaml"; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 4bb8f8ace9c0..751d40ff706d 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,19 +1,35 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_lwt }: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.2" + then { + version = "1.7"; + url = https://math.umons.ac.be/anum/software/csv/csv-1.7.tar.gz; + sha256 = "1mmcjiiz0jppgipavpph5kn04xcpalw4scbjrw2z3drghvr3qqwf"; + lwtSupport = true; + } else { + version = "1.5"; + url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz; + sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; + lwtSupport = false; + }; +in stdenv.mkDerivation { - name = "ocaml-csv-1.5"; + name = "ocaml${ocaml.version}-csv-${param.version}"; src = fetchzip { - url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz; - sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; + inherit (param) url sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ] + ++ stdenv.lib.optional param.lwtSupport ocaml_lwt; createFindlibDestdir = true; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests" + + stdenv.lib.optionalString param.lwtSupport " --enable-lwt"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index aaddc7b08d5d..24a67a38f3c3 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "ctypes"; - version = "0.11.2"; + version = "0.11.5"; minimumSupportedOcamlVersion = "4"; src = fetchurl { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "1ml80i8j5lpg3qwc074fks2hgxjq5cfdm9r6cznv605s05ajr3kh"; + sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; }; buildInputs = [ ncurses pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 8bfab87fc397..c0c8eb51f71f 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -10,7 +10,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = "http://estring.forge.ocamlcore.org/"; + homepage = http://estring.forge.ocamlcore.org/; description = "Extension for string literals"; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 469f808947ab..0d6ab72fadee 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.2"; + name = "ocaml${ocaml.version}-fmt-0.8.4"; src = fetchurl { - url = http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz; - sha256 = "020qz74cm65bzrywf6kylm93gr5x1ayl6hfmxaql995f6whb388i"; + url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz; + sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 88f120033809..c5382ddd2656 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, astring }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fpath-0.7.1"; + name = "ocaml${ocaml.version}-fpath-0.7.2"; src = fetchurl { - url = http://erratique.ch/software/fpath/releases/fpath-0.7.1.tbz; - sha256 = "05134ij27xjl6gaqsc65yl19vfj6cjxq3mbm9bf4mija8grdpn6g"; + url = http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz; + sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 8ead12427fdb..a993a64a49ac 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { - name = "gapi-ocaml-0.3.1"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz"; - sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i"; + name = "gapi-ocaml-${version}"; + version = "0.3.4"; + src = fetchFromGitHub { + owner = "astrada"; + repo = "gapi-ocaml"; + rev = "v${version}"; + sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv"; }; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 6cbbd4adc1b5..d9a1fb4770f8 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.4"; in +let version = "0.4.0.1"; in stdenv.mkDerivation { - name = "ocaml-gen-${version}"; + name = "ocaml${ocaml.version}-gen-${version}"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; rev = "${version}"; - sha256 = "041dga300fh1y6fi8y0fkri2qda406lf2dmbrgllazw3rp07zkzj"; + sha256 = "0gg94f5l899rni3r7s7wq8plgazmbsaw498xckp25kkgpmkk61ml"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 13b85c0c570c..e3b4b4333e1a 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "1.11.0"; + version = "1.11.1"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw"; + sha256 = "04az2bpbhgdhh7y6pagqx4wf3jbmqrm8w20dgimpbj5h3hnak744"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 1e3a9713406b..e8d9267aa858 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library for syntax highlighting"; - homepage = "https://zoggy.github.io/higlo/"; + homepage = https://zoggy.github.io/higlo/; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix new file mode 100644 index 000000000000..e76c3aadc039 --- /dev/null +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-integers-0.2.2"; + + src = fetchurl { + url = https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz; + sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Various signed and unsigned integer types for OCaml"; + license = stdenv.lib.licenses.mit; + homepage = https://github.com/ocamllabs/ocaml-integers; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index d6acbaa71422..724bca187067 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -8,15 +8,15 @@ rec { sexplib = janePackage { name = "sexplib"; - version = "0.9.1"; - hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj"; + version = "0.9.2"; + hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl"; meta.description = "Automated S-expression conversion"; }; base = janePackage { name = "base"; - version = "0.9.1"; - hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm"; + version = "0.9.3"; + hash = "14v3zsr7za9h1gkxdmkk1yagnrfjk3y9snraywv9hsqbhv39ajvv"; propagatedBuildInputs = [ sexplib ]; meta.description = "Full standard library replacement for OCaml"; }; @@ -65,7 +65,8 @@ rec { ppx_driver = janePackage { name = "ppx_driver"; - hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj"; + version = "0.9.1"; + hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay"; buildInputs = [ ocamlbuild ]; propagatedBuildInputs = [ ppx_optcomp ]; meta.description = "Feature-full driver for OCaml AST transformers"; @@ -173,7 +174,8 @@ rec { bin_prot = janePackage { name = "bin_prot"; - hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1"; + version = "0.9.1"; + hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk"; propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; meta.description = "Binary protocol generator"; }; @@ -203,7 +205,8 @@ rec { ppx_inline_test = janePackage { name = "ppx_inline_test"; - hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33"; + version = "0.9.2"; + hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa"; propagatedBuildInputs = [ ppx_metaquot ]; meta.description = "Syntax extension for writing in-line tests in OCaml code"; }; @@ -289,7 +292,8 @@ rec { configurator = janePackage { name = "configurator"; - hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80"; + version = "0.9.1"; + hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; propagatedBuildInputs = [ ppx_base ]; meta.description = "Helper library for gathering system configuration"; }; @@ -315,7 +319,8 @@ rec { core = janePackage { name = "core"; - hash = "0x05ky8l75k2dnpsa02vmqcr7p7q0vvc6279psq3iybrwcvab9yi"; + version = "0.9.1"; + hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index b02015e6d567..2a101da74d55 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170418" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170418" then "0avxkighxfr9x3vh2dkc5r1k2w7q2dz005w7syyzr7qjybpavpii" + else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 5b902afcb6db..a4e4bf8674fe 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; meta = with stdenv.lib; { - homepage = "http://forge.ocamlcore.org/projects/cairo"; + homepage = http://forge.ocamlcore.org/projects/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/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 46cc922917e2..3610cded1c94 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "0.7"; + version = "1.0.4"; src = fetchFromGitHub { owner = "let-def"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "142svvixhz153argd3khk7sr38dhiy4w6sck4766f8b48p41pp3m"; + sha256 = "0xwjll827anqngnqy746m2pd44mkhsaaqaqbir6z91xcqix2isvy"; }; buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index d90fda954ba3..10d8484e3efa 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { - homepage = "http://ocaml-text.forge.ocamlcore.org/"; + homepage = http://ocaml-text.forge.ocamlcore.org/; description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 561d6ef0373b..de69ce472281 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = "http://sourceforge.net/projects/ocamlfuse"; + homepage = http://sourceforge.net/projects/ocamlfuse; license = stdenv.lib.licenses.gpl2; description = "ocaml binding for fuse"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index a7757d1eacd9..3b904a09dad7 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = "http://www.ocaml.info/home/ocaml_sources.html"; + homepage = http://www.ocaml.info/home/ocaml_sources.html; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 29ee65356244..9c4c2e21eddd 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { but up to 100 times faster. It is based on the optimizing native code compiler, the native runtime and an earlier prototype by Alain Frisch. It is build upon Just-In-Time techniques and currently - supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on + supports Unix-like systems (i.e. Linux, BSD or macOS) running on x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index fc7640cc0c94..51a30d7c91a2 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: +let version = "4.1.4"; in + stdenv.mkDerivation { - name = "ocamlnet-4.1.2"; + name = "ocaml${ocaml.version}-ocamlnet-${version}"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz; - sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; + url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; + sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; }; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 4da9fb45d332..6117d30665f0 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library to read and write configuration options in JSON syntax"; - homepage = "https://zoggy.github.io/ocf/"; + homepage = https://zoggy.github.io/ocf/; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 1d283e5e55ea..c8e60015d013 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, pgocaml +, camlzip, pgocaml }: let mkpath = p: n: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; configureFlags = "--root $(out) --prefix /"; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index d2e0e0aa7278..63696ad3e0c5 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -19,7 +19,7 @@ buildOcaml { configurePhase = "true"; # Skip configure phase meta = with stdenv.lib; { - homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; + homepage = https://bitbucket.org/mmottl/pcre-ocaml; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 4775b2fe12ec..9d5f4f4e669d 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { buildInputs = [ ppx_tools ]; meta = with stdenv.lib; { - homepage = "https://github.com/johnwhitington/ppx_blob"; + homepage = https://github.com/johnwhitington/ppx_blob; description = "OCaml ppx to include binary data from a file as a string"; license = licenses.unlicense; }; diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix new file mode 100644 index 000000000000..52c28efcb49a --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ppx_derivers is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_derivers-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "diml"; + repo = "ppx_derivers"; + rev = version; + sha256 = "049yy9706lv1li6a1bibkz1qq2ixxbdyhf4f5w9pv71jc3dlpfy8"; + }; + + buildInputs = [ ocaml findlib jbuilder ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "Shared [@@deriving] plugin registry"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index a1255b2dbc17..57a423a80373 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchzip +{ stdenv, buildOcaml, ocaml, fetchzip , cppo, ppx_tools, result, ounit }: @@ -25,5 +25,6 @@ buildOcaml rec { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; maintainers = [ maintainers.maurer ]; license = licenses.mit; + broken = versionAtLeast ocaml.version "4.05"; }; } diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix new file mode 100644 index 000000000000..92fb18378037 --- /dev/null +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-process-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dsheets"; + repo = "ocaml-process"; + rev = version; + sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Easy process control in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 403c39a465d8..7421e2fa0b1a 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = "http://github.com/chemoelectric/pycaml"; + homepage = https://github.com/chemoelectric/pycaml; description = "Bindings for python and ocaml"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 695a751c7a94..20100a9b2eb5 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -4,10 +4,10 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-qcheck-0.6"; + name = "ocaml${ocaml.version}-qcheck-0.7"; src = fetchzip { - url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz; - sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p"; + url = https://github.com/c-cube/qcheck/archive/0.7.tar.gz; + sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah"; }; buildInputs = [ ocaml findlib ocamlbuild ounit ]; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 4d3ab0ddb4f2..eb65384fc975 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }: if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "qtest is not available for OCaml ${ocaml.version}" else -let version = "2.2"; in +let version = "2.6"; in stdenv.mkDerivation { name = "ocaml-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; + sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k"; }; buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ounit ]; + propagatedBuildInputs = [ qcheck ounit ]; - createFindlibDestdir = true; installFlags = [ "BIN=$(out)/bin" ]; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 6fcdb5ec6fa4..1e3cb02b913a 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools }: +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "sedlex is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-sedlex-${version}"; - version = "1.99.3"; + version = "1.99.4"; src = fetchzip { url = "http://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz"; - sha256 = "1wghjy3qyj43ll1ikchlqy7fv2hxcn3ap9xgsscm2ch09d8dcv7y"; + sha256 = "1b7nqxyfcz8i7m4b8zil2rn6ygh2czy26f9v64xnxn8r0hy9sh1m"; }; - buildInputs = [ ocaml findlib ppx_tools ]; + buildInputs = [ ocaml findlib ppx_tools_versioned ]; propagatedBuildInputs = [ gen ]; diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix index f5f32e9bc030..d0363abbf2cf 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ]; meta = with stdenv.lib; { - homepage = "http://github.com/mfp/ocaml-sqlexpr"; + homepage = http://github.com/mfp/ocaml-sqlexpr; description = "Type-safe, convenient SQLite database access"; license = licenses.lgpl21; }; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index d47d5d3169b6..01fa5b7ba6ab 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,44 +1,40 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "tsdl is not available for OCaml ${ocaml.version}" +else let - inherit (stdenv.lib) getVersion; - pname = "tsdl"; - version = "0.9.0"; + version = "0.9.4"; webpage = "http://erratique.ch/software/${pname}"; - in stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm"; + sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; }; - buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result pkgconfig opam ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' + preConfigure = '' # The following is done to avoid an additional dependency (ncurses) # due to linking in the custom bytecode runtime. Instead, just # compile directly into a native binary, even if it's just a # temporary build product. substituteInPlace myocamlbuild.ml \ --replace ".byte" ".native" - - ocaml pkg/build.ml native=true native-dynlink=true ''; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = "${webpage}"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 5e6f5967d138..c54642afb41d 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/type-conv/"; + homepage = http://forge.ocamlcore.org/projects/type-conv/; description = "Support library for OCaml preprocessor type conversions"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index e65306d15018..f10884d72035 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = { - homepage = "https://github.com/janestreet/type_conv/"; + homepage = https://github.com/janestreet/type_conv/; description = "Support library for preprocessor type conversions"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix new file mode 100644 index 000000000000..03ea4a29330c --- /dev/null +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "wasm is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-wasm-${version}"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "spec"; + rev = "v${version}"; + sha256 = "0l67w1dmhgzrhmw3pw2w35h54imax0zdpa9yyqppzzbagxgn87kn"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + makeFlags = [ "-C" "interpreter" ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 82f635afb684..83e4451e668a 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { entirely written in OCaml, hence it does not require additional C library. ''; - homepage = "http://tech.motion-twin.com/xmllight.html"; + homepage = http://tech.motion-twin.com/xmllight.html; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 86c9974c9316..77569c44bec4 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Xml template library for OCaml"; - homepage = "https://zoggy.github.io/xtmpl/"; + homepage = https://zoggy.github.io/xtmpl/; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5cd197b9d3fd..a136e61e5547 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.071"; + name = "Compress-Raw-Zlib-2.074"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0dk7pcmhnl7n811q3p4rrz5ijdhz6jx367h6rypgvg1y39z4arfs"; + sha256 = "08bpx9v6i40n54rdcj6invlj294z20amrl8wvwf9b83aldwdwsd3"; }; preConfigure = '' @@ -18,9 +18,7 @@ buildPerlPackage rec { EOF ''; - # Try untested for now. Upstream bug: - # https://rt.cpan.org/Public/Bug/Display.html?id=119762 - doCheck = false && !stdenv.isDarwin; + doCheck = !stdenv.isDarwin; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 911680b1eb8d..9cec6e81ae62 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }: +{ stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }: stdenv.mkDerivation rec { - version = "0.2.9-2016.01.14"; + version = "2017.02.28"; name = "pharo-launcher-${version}"; src = fetchurl { - url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip"; - sha256 = "0lzdnaw7l1rrzbrq53xsy38aiz6id5x7s78ds1dhb31vqc241yy8"; + url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; + sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; }; executable-name = "pharo-launcher"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # because upstream tarball has no top-level directory. sourceRoot = "."; - buildInputs = [ bash pharo-vm unzip ]; + buildInputs = [ bash pharo unzip ]; installPhase = '' mkdir -p $prefix/share/pharo-launcher @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { cat > $prefix/bin/${executable-name} < $prefix/bin/pharo-cog < $prefix/bin/${binary-basename}-x < "$out/bin/${cmd}" < $prefix/bin/${binary-basename}-nox <= 4.9 produces a + # binary that crashes when forking a child process. See: + # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html + # + # (stack protection is disabled above for gcc 4.8 compatibility.) + buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; @@ -89,11 +122,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ ]; - # Pharo VM sources are packaged separately for darwin (OS X) - platforms = with stdenv.lib; - intersectLists - platforms.mesaPlatforms - (subtractLists platforms.darwin platforms.unix); + maintainers = [ stdenv.lib.maintainers.lukego ]; + platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index aca5c37d2656..e6269503a4c4 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,27 +1,15 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem } @args: +{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs: + +let + i686 = callPackage_i686 ./vms.nix {}; + native = callPackage ./vms.nix {}; +in rec { - pharo-vm-build = import ./build-vm.nix args; - - base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed; - - pharo-no-spur = pharo-vm-build rec { - version = "2016.02.18"; - name = "pharo-vm-i386-${version}"; - binary-basename = "pharo-vm"; - src = fetchurl { - url = "${base-url}/pharo-vm-${version}.tar.bz2"; - sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4"; - }; - }; - - pharo-spur = pharo-vm-build rec { - version = "2016.07.16"; - name = "pharo-vm-spur-i386-${version}"; - binary-basename = "pharo-spur-vm"; - src = fetchurl { - url = "${base-url}/pharo-vm-spur-${version}.tar.bz2"; - sha256 = "07nk4w5wh7gcf27cch5paqp9zdlshnknpv4y7imxlkjd76viac2b"; - }; - }; + cog32 = i686.cog; + spur32 = i686.spur; + spur64 = if stdenv.is64bit then native.spur else "none"; + multi-vm-wrapper = callPackage ../wrapper { inherit cog32 spur32 spur64; }; } + + diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index aba42e3981cb..54e686c82feb 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "0ykl1y0a4yy5qn8fwz0wkl8fcn4pqv9q0w0r2llhzdz3jdg1k69g"; }; + sources60Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV60.sources.zip; + sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a"; + }; + buildInputs = [ unzip ]; installPhase = '' @@ -43,6 +48,7 @@ stdenv.mkDerivation rec { unzip ${sources30Zip} -d $prefix/lib/ unzip ${sources40Zip} -d $prefix/lib/ unzip ${sources50Zip} -d $prefix/lib/ + unzip ${sources60Zip} -d $prefix/lib/ ''; meta = { diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix new file mode 100644 index 000000000000..5258f4f6e77b --- /dev/null +++ b/pkgs/development/pharo/vm/vms.nix @@ -0,0 +1,46 @@ +{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: + +let + pharo-vm-build = import ./build-vm.nix args; + pharo-vm-build-legacy = import ./build-vm-legacy.nix args; +in + +let suffix = if stdenv.is64bit then "64" else "32"; in + +rec { + # Build the latest VM + spur = pharo-vm-build rec { + name = "pharo-spur${suffix}"; + version = "git.${revision}"; + src = fetchFromGitHub { + owner = "pharo-project"; + repo = "pharo-vm"; + rev = revision; + sha256 = "0dkiy5fq1xn2n93cwf767xz24c01ic0wfw94jk9nvn7pmcfj7m62"; + }; + # This metadata will be compiled into the VM and introspectable + # from Smalltalk. This has been manually extracted from 'git log'. + # + # The build would usually generate this automatically using + # opensmalltalk-vm/.git_filters/RevDateURL.smudge but that script + # is too impure to run from nix. + revision = "6a63f68a3dd4deb7c17dd2c7ac6e4dd4b0b6d937"; + source-date = "Tue May 30 19:41:27 2017 -0700"; + source-url = "https://github.com/pharo-project/pharo-vm"; + }; + + # Build an old ("legacy") CogV3 VM for running pre-spur images. + # (Could be nicer to build the latest VM in CogV3 mode but this is + # not supported on the Pharo VM variant at the moment.) + cog = pharo-vm-build-legacy rec { + version = "2016.02.18"; + name = "pharo-cog${suffix}"; + base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed; + src = fetchurl { + url = "${base-url}/pharo-vm-${version}.tar.bz2"; + sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4"; + }; + }; + +} + diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix new file mode 100644 index 000000000000..f60b8a6d2038 --- /dev/null +++ b/pkgs/development/pharo/wrapper/default.nix @@ -0,0 +1,58 @@ +{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }: + +stdenv.mkDerivation rec { + name = "pharo"; + src = ./.; + inherit cog32 spur32 spur64 file; + magic = ./magic; + desktopItem = makeDesktopItem { + inherit name; + desktopName = "Pharo VM"; + genericName = "Pharo Virtual Machine"; + exec = "pharo %F"; + icon = "pharo"; + terminal = "false"; + type="Application"; + startupNotify = "false"; + categories = "Development;"; + mimeType = "application/x-pharo-image"; + }; + buildPhase = '' + substituteAllInPlace ./pharo-vm.sh + ''; + installPhase = '' + mkdir -p $out/bin + cp pharo-vm.sh $out/bin/pharo + chmod +x $out/bin/pharo + ''; + meta = { + description = "Pharo virtual machine (multiple variants)"; + + longDescription = '' + Pharo's goal is to deliver a clean, innovative, free open-source + Smalltalk-inspired environment. By providing a stable and small core + system, excellent dev tools, and maintained releases, Pharo is an + attractive platform to build and deploy mission critical applications. + + This package provides a front-end for starting the virtual + machine. The command 'pharo-vm' automatically detects the type + of image and executes a suitable virtual machine: CogV3, Spur, + or Spur64. This makes it easy to open Pharo images because you + do not have to worry about which virtual machine variant is + required. + + More about the Cog family of virtual machines: + http://www.mirandabanda.org/cogblog/about-cog/ + ''; + + homepage = http://pharo.org; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.lukego ]; + # Pharo VM sources are packaged separately for darwin (OS X) + platforms = with stdenv.lib; + intersectLists + platforms.mesaPlatforms + (subtractLists platforms.darwin platforms.unix); + }; +} + diff --git a/pkgs/development/pharo/wrapper/magic b/pkgs/development/pharo/wrapper/magic new file mode 100644 index 000000000000..3870ef2dd01c --- /dev/null +++ b/pkgs/development/pharo/wrapper/magic @@ -0,0 +1,37 @@ +# Smalltalk image file formats +0 lelong 6502 Smalltalk image V3 32b (%d) +!:mime application/squeak-image +0 belong 6502 Smalltalk image V3 32b (%d) +!:mime application/squeak-image +0 lelong 6504 Smalltalk image V3 32b +C (%d) +!:mime application/cog-image +0 belong 6504 Smalltalk image V3 32b +C (%d) +!:mime application/cog-image +0 lelong 68000 Smalltalk image V3 64b (%d) +!:mime application/squeak64-image +4 belong 68000 Smalltalk image V3 64b (%d) +!:mime application/squeak64-image +0 lelong 68002 Smalltalk image V3 64b +C (%d) +!:mime application/cog64-image +4 belong 68002 Smalltalk image V3 64b +C (%d) +!:mime application/cog64-image +0 lelong 6505 Smalltalk image V3 32b +C+NF (%d) +!:mime application/cog-image +0 belong 6505 Smalltalk image V3 32b +C+NF (%d) +!:mime application/cog-image +0 lelong 68003 Smalltalk image V3 64b +C+NF (%d) +!:mime application/cog64-image +4 belong 68003 Smalltalk image V3 64b +C+NF (%d) +!:mime application/cog64-image +0 lelong 6521 Smalltalk image Spur 32b +C+NF (%d) +!:mime application/spur-image +0 belong 6521 Smalltalk image Spur 32b +C+NF (%d) +!:mime application/spur-image +0 lelong 68019 Smalltalk image Spur 64b +C+NF (%d) +!:mime application/spur64-image +4 belong 68019 Smalltalk image Spur 64b +C+NF (%d) +!:mime application/spur64-image +0 lelong 68021 Smalltalk image Spur 64b +C+NF+Tag (%d) +!:mime application/spur64-image +4 belong 68021 Smalltalk image Spur 64b +C+NF+Tag (%d) +!:mime application/spur64-image diff --git a/pkgs/development/pharo/wrapper/pharo-vm.sh b/pkgs/development/pharo/wrapper/pharo-vm.sh new file mode 100644 index 000000000000..d5bd1a2d8018 --- /dev/null +++ b/pkgs/development/pharo/wrapper/pharo-vm.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# This is based on the script by David T. Lewis posted here: +# http://lists.squeakfoundation.org/pipermail/vm-dev/2017-April/024836.html +# +# VM run utility script +# usage: run +# +# Select a VM and run an image based on the image format number + +PATH=$PATH:@file@/bin + +# Search for the image filename in the command line arguments +for arg in $* $SQUEAK_IMAGE; do + case ${arg} in + -*) # ignore + ;; + *) # either an option argument or the image name + if test -e ${arg}; then + magic=$(file -L -b -m @magic@ "$arg") + case "$magic" in + "Smalltalk image V3 32b"*) + image=${arg} + vm=@cog32@/bin/pharo-cog + ;; + "Smalltalk image Spur 32b"*) + image=${arg} + vm=@spur32@/bin/pharo-spur + ;; + "Smalltalk image Spur 64b"*) + if [ "@spur64vm@" == "none" ]; then + echo "error: detected 64-bit image but 64-bit VM is not available" >&2 + exit 1 + fi + image=${arg} + vm=@spur64@/bin/pharo-spur64 + ;; + esac + fi + ;; + esac +done + +# Print a message to explain our DWIM'ery. +if [ -n "$image" ]; then + echo "using VM selected by image type." + echo " image: $image" + echo " type: $magic" + echo " vm: $vm" +else + echo "using default vm; image type not detected" + vm=@cog32@/bin/pharo-cog +fi + +# Run the VM +set -f +exec -- "${vm}" "$@" + diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix new file mode 100644 index 000000000000..9d09b93ed20b --- /dev/null +++ b/pkgs/development/python-modules/Cython/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, python +, glibcLocales +, pkgconfig +, gdb +, numpy +, ncurses +}: + +buildPythonPackage rec { + pname = "Cython"; + name = "${pname}-${version}"; + version = "0.25.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; + }; + + # With Python 2.x on i686-linux or 32-bit ARM this test fails because the + # result is "3L" instead of "3", so let's fix it in-place. + # + # Upstream issue: https://github.com/cython/cython/issues/1548 + postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' + sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ + tests/run/cpdef_enums.pyx + ''; + + buildInputs = [ glibcLocales pkgconfig gdb ]; + # For testing + nativeBuildInputs = [ numpy ncurses ]; + + LC_ALL = "en_US.UTF-8"; + + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + checkPhase = '' + export HOME="$NIX_BUILD_TOP" + ${python.interpreter} runtests.py \ + ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} + ''; + + # Disable tests temporarily + # https://github.com/cython/cython/issues/1676 + doCheck = false; + + meta = { + description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; + homepage = http://cython.org; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix new file mode 100644 index 000000000000..2f72f7c16a7a --- /dev/null +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }: + +buildPythonPackage rec { + pname = "FormEncode"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md"; + }; + + buildInputs = [ dns pycountry nose ]; + + patchPhase = '' + # dnspython3 has been superseded, see its PyPI page + substituteInPlace setup.py --replace dnspython3 dnspython + ''; + + preCheck = '' + # two tests require dns resolving + sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py + sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py + ''; + + meta = with stdenv.lib; { + description = "FormEncode validates and converts nested structures"; + homepage = http://formencode.org; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 520a9c3a30b0..fe8597f4d488 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { }; meta = { - homepage = "https://getnikola.com/"; + homepage = https://getnikola.com/; description = "A modular, fast, simple, static website and blog generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index 893caa88d676..f9ce1fa026fe 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = "http://pmw.sourceforge.net/"; + homepage = http://pmw.sourceforge.net/; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index e4edaf83a25c..61964eb7b060 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the JSON-LD API"; - homepage = "https://github.com/digitalbazaar/pyld"; + homepage = https://github.com/digitalbazaar/pyld; license = licenses.bsd3; maintainers = with maintainers; [ apeschar ]; }; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix new file mode 100644 index 000000000000..1084eca762be --- /dev/null +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi, pillow }: + +buildPythonPackage rec { + pname = "aafigure"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091"; + }; + + propagatedBuildInputs = [ pillow ]; + + # error: invalid command 'test' + doCheck = false; + + # Fix impurity. TODO: Do the font lookup using fontconfig instead of this + # manual method. Until that is fixed, we get this whenever we run aafigure: + # WARNING: font not found, using PIL default font + patchPhase = '' + sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py + ''; + + meta = with stdenv.lib; { + description = "ASCII art to image converter"; + homepage = https://launchpad.net/aafigure/; + license = licenses.bsd2; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix new file mode 100644 index 000000000000..9558febec735 --- /dev/null +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, python, openssl }: + +buildPythonPackage rec { + pname = "acme-tiny"; + version = "2016-03-26"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; + rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971"; + repo = "acme-tiny"; + owner = "diafygi"; + }; + + # source doesn't have any python "packaging" as such + configurePhase = " "; + buildPhase = " "; + # the tests are... complex + doCheck = false; + + patchPhase = '' + substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl" + ''; + + installPhase = '' + mkdir -p $out/${python.sitePackages}/ + cp acme_tiny.py $out/${python.sitePackages}/ + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny + chmod +x $out/bin/acme_tiny + ''; + + meta = with stdenv.lib; { + description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; + homepage = https://github.com/diafygi/acme-tiny; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix new file mode 100644 index 000000000000..71357e5bef23 --- /dev/null +++ b/pkgs/development/python-modules/acme/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi +, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339 +, pytz, requests, six, werkzeug, mock, ndg-httpsclient }: + +buildPythonPackage rec { + inherit (certbot) src version; + + pname = "acme"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = [ nose ]; + + postUnpack = "sourceRoot=\${sourceRoot}/acme"; +} diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix new file mode 100644 index 000000000000..d1cb1180358f --- /dev/null +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, cython, pytest, numpy, scipy, matplotlib, pandas, tabulate }: + +buildPythonPackage rec { + pname = "acoustics"; + version = "0.1.2"; + name = "${pname}-${version}"; + + buildInputs = [ cython pytest ]; + propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + + src = fetchPypi { + inherit pname version; + sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7"; + }; + + # Tests not distributed + doCheck = false; + + meta = with stdenv.lib; { + description = "A package for acousticians"; + maintainer = with maintainers; [ fridh ]; + license = with licenses; [ bsd3 ]; + homepage = https://github.com/python-acoustics/python-acoustics; + }; +} diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix new file mode 100644 index 000000000000..36d49ad29af9 --- /dev/null +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, nose, unittest2, docutils, blockdiag }: + +buildPythonPackage rec { + pname = "actdiag"; + version = "0.5.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # One test fails: + # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix new file mode 100644 index 000000000000..982e63882ad3 --- /dev/null +++ b/pkgs/development/python-modules/adal/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, pyjwt }: + +buildPythonPackage rec { + pname = "adal"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09"; + }; + + propagatedBuildInputs = [ requests pyjwt ]; + + meta = with stdenv.lib; { + description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; + homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python; + license = licenses.mit; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix new file mode 100644 index 000000000000..4a2d4a0f7224 --- /dev/null +++ b/pkgs/development/python-modules/afew/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, isPy3k , dbacl, notmuch, chardet, subprocess32 }: + +buildPythonPackage rec { + pname = "afew"; + version = "git-2017-02-08"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; + }; + + buildInputs = [ dbacl ]; + + propagatedBuildInputs = [ + notmuch + chardet + ] ++ stdenv.lib.optional (!isPy3k) subprocess32; + + doCheck = false; + + preConfigure = '' + substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'" + ''; + + postInstall = '' + wrapProgram $out/bin/afew \ + --prefix LD_LIBRARY_PATH : ${notmuch}/lib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/teythoon/afew; + description = "An initial tagging script for notmuch mail"; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix new file mode 100644 index 000000000000..4265a7488f66 --- /dev/null +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }: + +buildPythonPackage rec { + pname = "aiodns"; + version = "1.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d"; + }; + + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional isPy33 asyncio + ++ optional (isPy26 || isPy27 || isPyPy) trollius; + + checkPhase = '' + ${python.interpreter} tests.py + ''; + + # 'Could not contact DNS servers' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/saghul/aiodns; + license = licenses.mit; + description = "Simple DNS resolver for asyncio"; + }; +} diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix new file mode 100644 index 000000000000..fcd9a0978005 --- /dev/null +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pygments }: + +buildPythonPackage rec { + pname = "alabaster"; + version = "0.7.10"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0"; + }; + + propagatedBuildInputs = [ pygments ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bitprophet/alabaster; + description = "A Sphinx theme"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 0538e7cf416d..d1262d8fab45 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2"; + sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix new file mode 100644 index 000000000000..a0504de4fb81 --- /dev/null +++ b/pkgs/development/python-modules/altair/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, vega, pandas, ipython, traitlets }: + +buildPythonPackage rec { + pname = "altair"; + version = "1.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + export LANG=en_US.UTF-8 + py.test altair --doctest-modules + ''; + + propagatedBuildInputs = [ vega pandas ipython traitlets ]; + + meta = with stdenv.lib; { + description = "A declarative statistical visualization library for Python."; + homepage = https://github.com/altair-viz/altair; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix new file mode 100644 index 000000000000..1f539ef6d395 --- /dev/null +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + pname = "amqplib"; + version = "0.6.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz; + sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/py-amqplib/; + description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix new file mode 100644 index 000000000000..95eda37d3f28 --- /dev/null +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, dateutil }: + +buildPythonPackage rec { + pname = "aniso8601"; + version = "1.2.1"; + name = "${pname}-${version}"; + + meta = with stdenv.lib; { + description = "Parses ISO 8601 strings."; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = licenses.bsd3; + }; + + propagatedBuildInputs = [ dateutil ]; + + src = fetchPypi { + inherit pname version; + sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c"; + }; +} diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix index 077bfa198aaf..6c7f20905238 100644 --- a/pkgs/development/python-modules/ansible/2.1.nix +++ b/pkgs/development/python-modules/ansible/2.1.nix @@ -49,7 +49,7 @@ in buildPythonPackage rec { boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; meta = { - homepage = "http://www.ansible.com"; + homepage = http://www.ansible.com; description = "A simple automation tool"; license = with lib.licenses; [ gpl3] ; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix index d62c1e74822d..48e3be966959 100644 --- a/pkgs/development/python-modules/ansible/2.2.nix +++ b/pkgs/development/python-modules/ansible/2.2.nix @@ -50,7 +50,7 @@ in buildPythonPackage rec { boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; meta = { - homepage = "http://www.ansible.com"; + homepage = http://www.ansible.com; description = "A simple automation tool"; license = with lib.licenses; [ gpl3] ; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/development/python-modules/ansible/2.3.nix index e5152029f8ff..36fb44498b5d 100644 --- a/pkgs/development/python-modules/ansible/2.3.nix +++ b/pkgs/development/python-modules/ansible/2.3.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; meta = { - homepage = "http://www.ansible.com"; + homepage = http://www.ansible.com; description = "A simple automation tool"; license = with lib.licenses; [ gpl3] ; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix new file mode 100644 index 000000000000..ca29b631f471 --- /dev/null +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansicolor"; + version = "0.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/numerodix/ansicolor/; + description = "A library to produce ansi color output and colored highlighting and diffing"; + license = licenses.asl20; + maintainers = with maintainers; [ andsild ]; + }; +} diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix new file mode 100644 index 000000000000..9192186cd717 --- /dev/null +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansicolors"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/verigak/colors/; + description = "ANSI colors for Python"; + license = licenses.isc; + maintainers = with maintainers; [ copumpkin ]; + }; +} diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix new file mode 100644 index 000000000000..adefb06303ca --- /dev/null +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest }: + +buildPythonPackage rec { + pname = "apipkg"; + version = "1.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Namespace control and lazy-import mechanism"; + homepage = http://bitbucket.org/hpk42/apipkg; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix new file mode 100644 index 000000000000..3e7e970da6c0 --- /dev/null +++ b/pkgs/development/python-modules/apsw/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchurl +, sqlite, isPyPy }: + +buildPythonPackage rec { + pname = "apsw"; + version = "3.7.6.2-r1"; + name = "${pname}-${version}"; + + disabled = isPyPy; + + src = fetchurl { + url = "http://apsw.googlecode.com/files/${name}.zip"; + sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb"; + }; + + buildInputs = [ sqlite ]; + + # python: double free or corruption (fasttop): 0x0000000002fd4660 *** + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python wrapper for the SQLite embedded relational database engine"; + homepage = http://code.google.com/p/apsw/; + }; +} diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix new file mode 100644 index 000000000000..1f0b95d87853 --- /dev/null +++ b/pkgs/development/python-modules/area53/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi +, boto }: + +buildPythonPackage rec { + pname = "Area53"; + version = "0.94"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ boto ]; +} diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index cd0cc47d9e7b..228ffa7e5217 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bash tab completion for argparse"; - homepage = "https://argcomplete.readthedocs.io"; + homepage = https://argcomplete.readthedocs.io; maintainers = [ maintainers.womfoo ]; license = [ licenses.asl20 ]; }; diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix new file mode 100644 index 000000000000..cf7dea6cca75 --- /dev/null +++ b/pkgs/development/python-modules/args/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "args"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814"; + }; + + meta = with stdenv.lib; { + description = "Command Arguments for Humans"; + homepage = https://github.com/kennethreitz/args; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix new file mode 100644 index 000000000000..a85987a95b16 --- /dev/null +++ b/pkgs/development/python-modules/arrow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, chai, simplejson +, dateutil }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "arrow"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + }; + + checkPhase = '' + nosetests --cover-package=arrow + ''; + + buildInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil ]; + + meta = with stdenv.lib; { + description = "Python library for date manipulation"; + license = "apache"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix new file mode 100644 index 000000000000..ce07c2376245 --- /dev/null +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, pyparsing }: + +buildPythonPackage rec { + pname = "asn1ate"; + date = "20160810"; + name = "${pname}-unstable-${date}"; + + src = fetchFromGitHub { + sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w"; + rev = "c56104e8912400135509b584d84423ee05a5af6b"; + owner = "kimgr"; + repo = pname; + }; + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Python library for translating ASN.1 into other forms"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix new file mode 100644 index 000000000000..965bf37d5200 --- /dev/null +++ b/pkgs/development/python-modules/astor/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "astor"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + }; + + meta = with stdenv.lib; { + description = "Library for reading, writing and rewriting python AST"; + homepage = https://github.com/berkerpeksag/astor; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 6e3e66167f1d..836ce3addea0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Astronomy/Astrophysics library for Python"; - homepage = "http://www.astropy.org"; + homepage = http://www.astropy.org; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kentjames ]; diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix new file mode 100644 index 000000000000..bf71cf8cfbdd --- /dev/null +++ b/pkgs/development/python-modules/audioread/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "audioread"; + name = "${pname}-${version}"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e"; + }; + + # No tests, need to disable or py3k breaks + doCheck = false; + + meta = { + description = "Cross-platform audio decoding"; + homepage = "https://github.com/sampsyo/audioread"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix new file mode 100644 index 000000000000..8934e1b81a81 --- /dev/null +++ b/pkgs/development/python-modules/augeas/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: +buildPythonPackage rec { + name = "augeas-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "hercules-team"; + repo = "python-augeas"; + rev = "v${version}"; + sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh"; + }; + + # TODO: not very nice! + postPatch = + let libname = if stdenv.isDarwin then "libaugeas.dylib" else "libaugeas.so"; + in + '' + substituteInPlace augeas/ffi.py \ + --replace 'ffi.dlopen("augeas")' \ + 'ffi.dlopen("${lib.makeLibraryPath [augeas]}/${libname}")' + ''; + + propagatedBuildInputs = [ cffi augeas ]; + + doCheck = false; + + meta = with lib; { + description = "Pure python bindings for augeas"; + homepage = https://github.com/hercules-team/python-augeas; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3f43318f08a6..9ff3b2adfd92 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://github.com/dursk/bitcoin-price-api"; + homepage = http://github.com/dursk/bitcoin-price-api; description = "Price APIs for bitcoin exchanges"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix new file mode 100644 index 000000000000..017b85cacc7c --- /dev/null +++ b/pkgs/development/python-modules/blaze/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchurl +, pytest +, contextlib2 +, cytoolz +, dask +, datashape +, flask +, flask-cors +, h5py +, multipledispatch +, numba +, numpy +, odo +, pandas +, psutil +, pymongo +, pyyaml +, requests +, sqlalchemy +, tables +, toolz +}: + +buildPythonPackage rec { + pname = "blaze"; + version = "0.11.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/blaze/blaze/archive/${version}.tar.gz"; + sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + contextlib2 + cytoolz + dask + datashape + flask + flask-cors + h5py + multipledispatch + numba + numpy + odo + pandas + psutil + pymongo + pyyaml + requests + sqlalchemy + tables + toolz + ]; + + # Failing test + # ERROR collecting blaze/tests/test_interactive.py + # E networkx.exception.NetworkXNoPath: node not + # reachable from + doCheck = false; + + checkPhase = '' + py.test blaze/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/blaze; + description = "Allows Python users a familiar interface to query data living in other data storage systems"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 19acf7b49ef7..b73bcfe8185d 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -40,7 +40,7 @@ in buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "https://fedoraproject.org/wiki/Blivet"; + homepage = https://fedoraproject.org/wiki/Blivet; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix new file mode 100644 index 000000000000..2c1850b86abc --- /dev/null +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, python +}: + +buildPythonPackage rec { + pname = "Bottleneck"; + name = "Bottleneck-${version}"; + version = "1.2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy ]; + checkPhase = '' + nosetests -v $out/${python.sitePackages} + ''; + postPatch = '' + substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" + ''; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 08d66e539ad0..9f4d89da90c0 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils six sphinx ]; - disabled = isPy3k; + doCheck = !isPy3k; meta = { homepage = https://github.com/michaeljones/breathe; diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index 67dd0c8c9d73..cd419039f339 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "A library for interacting with Browsermob Proxy"; - homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py"; + homepage = http://oss.theautomatedtester.co.uk/browsermob-proxy-py; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 7cb10d96f905..8af103cb999d 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -5,7 +5,8 @@ buildPythonPackage rec { version = "4.4.1"; name = "${pname}-${version}"; - propagatedBuildInputs = [ persistent zope_interface transaction ]; + buildInputs = [ transaction ]; + propagatedBuildInputs = [ persistent zope_interface ]; src = fetchPypi { inherit pname version; @@ -15,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; - license = licenses.zpt21; + license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 788c42ebf15b..fcb46f4bac14 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,11 +1,13 @@ { fetchurl, stdenv, buildPythonPackage }: -buildPythonPackage { - name = "zc.buildout-nix-2.5.3"; +buildPythonPackage rec { + pname = "zc.buildout"; + version = "2.9.4"; + name = "${pname}-nix-${version}"; src = fetchurl { - url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz"; - sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053"; }; patches = [ ./nix.patch ]; @@ -13,9 +15,9 @@ buildPythonPackage { postInstall = "mv $out/bin/buildout{,-nix}"; meta = { - homepage = "http://www.buildout.org"; + homepage = http://www.buildout.org; description = "A software build and configuration system"; - license = stdenv.lib.licenses.zpt21; + license = stdenv.lib.licenses.zpl21; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch index f358544d36a7..49f3c6d90f0a 100644 --- a/pkgs/development/python-modules/buildout-nix/nix.patch +++ b/pkgs/development/python-modules/buildout-nix/nix.patch @@ -1,6 +1,19 @@ ---- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200 -+++ b/src/zc/buildout/easy_install.py 2013-10-07 00:29:31.077413935 +0200 -@@ -227,6 +227,12 @@ +--- a/src/zc/buildout/buildout.py 2017-08-18 10:06:24.946428977 +0300 ++++ b/src/zc/buildout/buildout.py 2017-08-18 10:08:49.115613364 +0300 +@@ -382,6 +382,10 @@ + if k not in versions + )) + ++ # Override versions with available (nix) system packages ++ for dist in pkg_resources.working_set: ++ versions[dist.project_name] = SectionKey(dist.version, dist.location) ++ + # Absolutize some particular directory, handling also the ~/foo form, + # and considering the location of the configuration file that generated + # the setting as the base path, falling back to the main configuration +--- a/src/zc/buildout/easy_install.py 2017-08-18 10:06:24.948428980 +0300 ++++ b/src/zc/buildout/easy_install.py 2017-08-18 10:07:37.462521740 +0300 +@@ -321,6 +321,12 @@ def _satisfied(self, req, source=None): dists = [dist for dist in self._env[req.project_name] if dist in req] diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch new file mode 100644 index 000000000000..27caa80dd4ca --- /dev/null +++ b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch @@ -0,0 +1,18 @@ +Description: Fix endless loop in logger_isa (Python 3.6) +Author: George Psarakis +Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad +Forwarded: not-needed +Reviewed-By: Nishanth Aravamudan +Last-Update: 2017-06-12 + +--- celery-4.0.2.orig/celery/utils/log.py ++++ celery-4.0.2/celery/utils/log.py +@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): + else: + if this in seen: + raise RuntimeError( +- 'Logger {0!r} parents recursive'.format(l), ++ 'Logger {0!r} parents recursive'.format(l.name), + ) + seen.add(this) + this = this.parent diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix new file mode 100644 index 000000000000..f5440004ebdb --- /dev/null +++ b/pkgs/development/python-modules/chai/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "chai"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl"; + }; + + meta = with stdenv.lib; { + description = "Mocking, stubbing and spying framework for python"; + }; +} diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix new file mode 100644 index 000000000000..017088d2e330 --- /dev/null +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "chainmap"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + }; + + # Requires tox + doCheck = false; + + meta = with stdenv.lib; { + description = "Backport/clone of ChainMap"; + homepage = https://bitbucket.org/jeunice/chainmap; + license = licenses.psfl; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index bd5d8b7dca64..d26008231b08 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Confluent's Apache Kafka client for Python"; - homepage = "https://github.com/confluentinc/confluent-kafka-python"; + homepage = https://github.com/confluentinc/confluent-kafka-python; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix new file mode 100644 index 000000000000..e182f55cdc00 --- /dev/null +++ b/pkgs/development/python-modules/cycler/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, nose +, six +, python +}: + +buildPythonPackage rec { + pname = "cycler"; + name = "${pname}-${version}"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"; + }; + + checkInputs = [ coverage nose ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + ${python.interpreter} run_tests.py + ''; + + # Tests were not included in release. + # https://github.com/matplotlib/cycler/issues/31 + doCheck = false; + + meta = { + description = "Composable style cycles"; + homepage = http://github.com/matplotlib/cycler; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix new file mode 100644 index 000000000000..f2c6c649a837 --- /dev/null +++ b/pkgs/development/python-modules/cymem/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: +buildPythonPackage rec { + name = "cymem-${version}"; + version = "1.31.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "cymem"; + rev = "1.31.2"; + sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k"; + }; + + propagatedBuildInputs = [ + cython + ]; + + checkPhase = '' + cd cymem/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython memory pool for RAII-style memory management"; + homepage = https://github.com/explosion/cymem; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 562b29cf0625..c90fb61ce03a 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, asgiref, autobahn, twisted, hypothesis }: buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchurl { - url = "mirror://pypi/d/daphne/${name}.tar.gz"; - sha256 = "084216isw7rwy693i62rbd8kvpqx418jvf1q72cplv833wz3in7l"; + src = fetchPypi { + inherit pname version; + sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i"; }; buildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 6d5388a443ca..32d925f36485 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.14.3"; + version = "0.15.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211"; + sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34"; }; checkInputs = [ pytest ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Minimal task scheduling abstraction"; - homepage = "http://github.com/ContinuumIO/dask/"; + homepage = http://github.com/ContinuumIO/dask/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix new file mode 100644 index 000000000000..d237f366fdf5 --- /dev/null +++ b/pkgs/development/python-modules/discid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, libdiscid, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "discid"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9"; + }; + + patchPhase = '' + substituteInPlace discid/libdiscid.py \ + --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')" + ''; + + meta = with stdenv.lib; { + description = "Python binding of libdiscid"; + homepage = "https://python-discid.readthedocs.org/"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix new file mode 100644 index 000000000000..db781af2a5de --- /dev/null +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + pname = "distorm3"; + version = "3.3.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/${pname}/${name}.zip"; + sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4"; + }; + + # no tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Powerful Disassembler Library For x86/AMD64"; + homepage = https://github.com/gdabah/distorm; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix new file mode 100644 index 000000000000..13f35d110c7a --- /dev/null +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid +, django, six +}: + +buildPythonPackage rec { + pname = "django-extensions"; + version = "1.8.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "${pname}"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h"; + }; + + buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ]; + + propagatedBuildInputs = [ django six ]; + + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 2d06b41d2db3..83e8f1c4d586 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; meta = { - homepage = "https://github.com/django-polymorphic/django-polymorphic"; + homepage = https://github.com/django-polymorphic/django-polymorphic; description = "Improved Django model inheritance with automatic downcasting"; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 2332229100c5..fbdc7282c1b6 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -3,13 +3,13 @@ pyparsing, django, celery }: buildPythonPackage rec { - version = "0.4"; + version = "0.5"; pname = "django-raster"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f"; + sha256 = "0v1jldb13s4dqq1vaq8ghfv3743jpi9a9n05bqgjm8szlkq8s7ah"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix deleted file mode 100644 index 52b62e8d8b8b..000000000000 --- a/pkgs/development/python-modules/django/1_10.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - pythonOlder, - geos, gdal -}: -buildPythonPackage rec { - pname = "Django"; - name = "${pname}-${version}"; - version = "1.10.7"; - disabled = pythonOlder "2.7"; - - src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar"; - }; - - patches = [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - }) - ]; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - # too complicated to setup - doCheck = false; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; -} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index f0035095b04e..cbdbb57181a2 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.2"; + version = "1.11.4"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "05q6bgm3vkdqg72i1m1z8bp2jdrm9n1c37aka1brwkyzh820fnrw"; + sha256 = "1ckvq2sdlgpy2sqy6fwl84ms9dggvdbys9x76qapm2d9vmknxs5b"; }; patches = [ diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix new file mode 100644 index 000000000000..77fc708a50b4 --- /dev/null +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "django-appconf"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "A helper class for handling configuration defaults of packaged apps gracefully"; + homepage = http://django-appconf.readthedocs.org/; + license = licenses.bsd2; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix new file mode 100644 index 000000000000..5d8626ec5760 --- /dev/null +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, + rcssmin, rjsmin, django_appconf }: +buildPythonPackage rec { + pname = "django_compressor"; + version = "2.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j"; + }; + + # Need to setup django testing + doCheck = false; + + propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + + meta = with stdenv.lib; { + description = "Compresses linked and inline JavaScript or CSS into single cached files"; + homepage = http://django-compressor.readthedocs.org/en/latest/; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix new file mode 100644 index 000000000000..6207408e0123 --- /dev/null +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, django }: + +buildPythonPackage rec { + pname = "django-tagging"; + version = "0.4.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = { + description = "A generic tagging application for Django projects"; + homepage = https://github.com/Fantomas42/django-tagging; + }; +} diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index df768f5d1222..30baed39bd6f 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -5,19 +5,24 @@ buildPythonApplication rec { name = "${pname}-${majorversion}.${minorversion}"; pname = "dkimpy"; majorversion = "0.6"; - minorversion = "1"; + minorversion = "2"; src = fetchurl { url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; - sha256 = "0zmvyw18ww1jqrbqws636w3xki59fyqva553r6s74q5c4jvy36v2"; + sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl"; }; buildInputs = [ pytest ]; propagatedBuildInputs = [ openssl dns ]; - patchPhase = ''substituteInPlace dknewkey.py --replace \ - /usr/bin/openssl ${openssl}/bin/openssl - ''; + patchPhase = '' + substituteInPlace dknewkey.py --replace \ + /usr/bin/openssl ${openssl}/bin/openssl + ''; + + checkPhase = '' + python ./test.py + ''; postInstall = '' mkdir -p $out/bin $out/libexec @@ -27,17 +32,18 @@ buildPythonApplication rec { makeWrapper "$out/libexec/arcverify.py" $out/bin/arcverify makeWrapper "$out/libexec/arcsign.py" $out/bin/arcsign makeWrapper "$out/libexec/dknewkey.py" $out/bin/dknewkey - ''; + ''; meta = with stdenv.lib; { description = "DKIM + ARC email signing/verification tools + Python module"; - longDescription = ''Python module that implements DKIM (DomainKeys Identified Mail) - email signing and verification. It also provides a number of convєnient tools - for command line signing and verification, as well as generating new DKIM records. - This version also supports the experimental Authenticated Received Chain (ARC) - protocol. + longDescription = '' + Python module that implements DKIM (DomainKeys Identified Mail) email + signing and verification. It also provides a number of convєnient tools + for command line signing and verification, as well as generating new DKIM + records. This version also supports the experimental Authenticated + Received Chain (ARC) protocol. ''; - homepage = "https://launchpad.net/dkimpy"; + homepage = https://launchpad.net/dkimpy; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dns/default.nix new file mode 100644 index 000000000000..0548c5a1098e --- /dev/null +++ b/pkgs/development/python-modules/dns/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "dnspython"; + version = "1.15.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0"; + }; + + # needs networking for some tests + doCheck = false; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = http://www.dnspython.org; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = lib.licenses.free; + }; +} diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix index 58c7da4cbe56..7364c5faed49 100644 --- a/pkgs/development/python-modules/docker.nix +++ b/pkgs/development/python-modules/docker.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.4.2"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c"; + sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix index 25435c396d76..18d68e4ea5d8 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose.nix @@ -6,13 +6,13 @@ , enum34, functools32 }: buildPythonApplication rec { - version = "1.13.0"; + version = "1.15.0"; pname = "docker-compose"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c"; + sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; }; # lots of networking and other fails @@ -38,7 +38,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = "https://docs.docker.com/compose/"; + homepage = https://docs.docker.com/compose/; description = "Multi-container orchestration for Docker"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix index ba40b0b3f858..d2de9f9f15bc 100644 --- a/pkgs/development/python-modules/ds4drv.nix +++ b/pkgs/development/python-modules/ds4drv.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Userspace driver for the DualShock 4 controller"; - homepage = "https://github.com/chrippa/ds4drv"; + homepage = https://github.com/chrippa/ds4drv; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix new file mode 100644 index 000000000000..12e0f6934d9a --- /dev/null +++ b/pkgs/development/python-modules/easydict/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "easydict"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xpnwjdw4x5kficjgcajqcal6bxcb0ax8l6hdkww9fp6lrh28x8v"; + }; + + docheck = false; # No tests in archive + + meta = { + homepage = https://github.com/makinacorpus/easydict; + license = with stdenv.lib; licenses.lgpl3; + description = "Access dict values as attributes (works recursively)"; + }; +} diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 57549792d218..6fd445a89f5a 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Pyhton Elliptic Curve Library"; - homepage = "https://github.com/ubinity/ECPy"; + homepage = https://github.com/ubinity/ECPy; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 1cdf85385e8b..9cb09e8f7208 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ed25519 public-key signatures"; - homepage = "https://github.com/warner/python-ed25519"; + homepage = https://github.com/warner/python-ed25519; license = licenses.mit; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix new file mode 100644 index 000000000000..4fc78d8bd1e1 --- /dev/null +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }: + +buildPythonPackage rec { + pname = "email_validator"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ja9149l9ck5n45a72h3is7v476hjny5ybxbcamx1nw6iplsm7k6"; + }; + + doCheck = false; + + propagatedBuildInputs = [ + dns + idna + ] ++ (if isPy3k then [ ] else [ ipaddress ]); + + meta = with lib; { + description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; + homepage = https://github.com/JoshData/python-email-validator; + license = licenses.cc0; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix new file mode 100644 index 000000000000..3e95859fc0f8 --- /dev/null +++ b/pkgs/development/python-modules/emcee/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, numpy }: + +buildPythonPackage rec { + pname = "emcee"; + version = "2.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + description = "Kick ass affine-invariant ensemble MCMC sampling"; + homepage = http://dan.iel.fm/emcee; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix new file mode 100644 index 000000000000..3a2a0a64ce6f --- /dev/null +++ b/pkgs/development/python-modules/faker/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, + # Build inputs + dateutil, six, ipaddress ? null, + # Test inputs + email_validator, nose, mock, ukpostcodeparser }: + +assert pythonOlder "3.3" -> ipaddress != null; + +buildPythonPackage rec { + pname = "Faker"; + version = "0.7.18"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429"; + }; + + checkInputs = [ + email_validator + nose + mock + ukpostcodeparser + ]; + + propagatedBuildInputs = [ + dateutil + six + ] ++ lib.optional (pythonOlder "3.3") ipaddress; + + meta = with lib; { + description = "A Python library for generating fake user data"; + homepage = http://faker.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix new file mode 100644 index 000000000000..9ad28e52baac --- /dev/null +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: + +buildPythonPackage rec { + pname = "feedgen"; + version = "0.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787"; + }; + + propagatedBuildInputs = [ dateutil lxml ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; + downloadPage = https://github.com/lkiesow/python-feedgen/releases; + homepage = https://github.com/lkiesow/python-feedgen; + license = with licenses; [ bsd2 lgpl3 ]; + maintainers = with maintainers; [ casey ]; + }; +} diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix index a463964b312d..3c7731c30a8b 100644 --- a/pkgs/development/python-modules/flask-login.nix +++ b/pkgs/development/python-modules/flask-login.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.3"; meta = with stdenv.lib; { - homepage = "https://github.com/maxcountryman/flask-login"; + homepage = https://github.com/maxcountryman/flask-login; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix index bd586aeb32fd..2c415ec47e38 100644 --- a/pkgs/development/python-modules/flask-restplus/0.8.nix +++ b/pkgs/development/python-modules/flask-restplus/0.8.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = { - homepage = "https://github.com/noirbizarre/flask-restplus"; + homepage = https://github.com/noirbizarre/flask-restplus; description = "Fast, easy and documented API development with Flask"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index f14c9982b6d2..a89f9979003b 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = { - homepage = "https://github.com/noirbizarre/flask-restplus"; + homepage = https://github.com/noirbizarre/flask-restplus; description = "Fast, easy and documented API development with Flask"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 602fa50d00c3..fbe837334041 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; meta = { - homepage = "https://github.com/fonttools/fonttools"; + homepage = https://github.com/fonttools/fonttools; description = "A library to manipulate font files from Python"; }; } diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix new file mode 100644 index 000000000000..c0aea9877812 --- /dev/null +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, html5lib +, wcwidth +, nose +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ftfy"; + version = "4.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + }; + + propagatedBuildInputs = [ html5lib wcwidth]; + + buildInputs = [ + nose + ]; + + checkPhase = '' + nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Given Unicode text, make its representation consistent and possibly less broken."; + homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix new file mode 100644 index 000000000000..5c188dc5a9fd --- /dev/null +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, unittest2 }: + +buildPythonPackage rec { + pname = "funcsigs"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"; + }; + + buildInputs = [ unittest2 ]; + + meta = with stdenv.lib; { + description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; + homepage = https://github.com/aliles/funcsigs; + maintainers = with maintainers; [ garbas ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 51794059b8e1..3892ee105c40 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Topic-modelling library"; - homepage = "https://radimrehurek.com/gensim/"; + homepage = https://radimrehurek.com/gensim/; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ jpbernardy ]; }; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 8ad1dd628696..a3de4d3f7bc1 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "grammalecte"; - version = "0.5.17"; + version = "0.5.18"; name = "${pname}-${version}"; src = fetchurl { - url = "http://www.dicollecte.org/grammalecte/oxt/Grammalecte-fr-v${version}.zip"; - sha256 = "0ccvj8p8bwvrj8bp370dzjs16pwm755a7364lvk8bp4505n7g0b6"; + url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; + sha256 = "0izfsqsj8w4awhmwmn4x8wwpqsmqbnfvfafzk93i6yj0l3fn3i97"; }; propagatedBuildInputs = [ bottle ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Grammalecte is an open source grammar checker for the French language"; - homepage = "https://dicollecte.org/grammalecte/"; + homepage = https://dicollecte.org/grammalecte/; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ apeyroux ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/python-modules/gst-python/default.nix similarity index 71% rename from pkgs/development/libraries/gstreamer/python/default.nix rename to pkgs/development/python-modules/gst-python/default.nix index 4c3cdd901276..9a4a19d59611 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,12 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, pythonPackages -, gst-plugins-base -, ncurses +{ fetchurl, stdenv, pkgconfig, python, pygobject3 +, gst-plugins-base, ncurses }: -let - inherit (pythonPackages) python pygobject3; -in stdenv.mkDerivation rec { - name = "gst-python-1.10.4"; +stdenv.mkDerivation rec { + pname = "gst-python"; + version = "1.10.4"; + name = "${pname}-${version}"; src = fetchurl { urls = [ @@ -26,11 +25,14 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preConfigure = '' - export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" + export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides" ''; propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; + # Needed for python.buildEnv + passthru.pythonPath = []; + meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch similarity index 100% rename from pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch rename to pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 7b517df09222..0bc8b969f5ae 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -38,7 +38,7 @@ in buildPythonPackage rec { meta = { description = "Pythonic interface to the HDF5 binary data format"; - homepage = "http://www.h5py.org/"; + homepage = http://www.h5py.org/; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix new file mode 100644 index 000000000000..eeb042452155 --- /dev/null +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildPythonPackage, numpy }: + +buildPythonPackage rec { + name = "hmmlearn-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; + sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9"; + }; + + propagatedBuildInputs = [ numpy ]; + + doCheck = false; + + meta = with lib; { + description = "Hidden Markov Models in Python with scikit-learn like API"; + homepage = "https://github.com/hmmlearn/hmmlearn"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix new file mode 100644 index 000000000000..549dcb89bf7f --- /dev/null +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: + +buildPythonPackage rec { + pname = "html5-parser"; + version = "0.4.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; + + doCheck = false; # No such file or directory: 'run_tests.py' + + meta = with stdenv.lib; { + description = "Fast C based HTML 5 parsing for python"; + homepage = https://html5-parser.readthedocs.io; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix new file mode 100644 index 000000000000..ca09c271ddac --- /dev/null +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl, pytest }: +buildPythonPackage rec { + name = "hyperlink-${version}"; + version = "17.3.0"; + + src = fetchurl { + url = "mirror://pypi/h/hyperlink/${name}.tar.gz"; + sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test $out + ''; + + meta = with stdenv.lib; { + description = "A featureful, correct URL for Python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ apeschar ]; + }; +} diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix new file mode 100644 index 000000000000..69b35df29738 --- /dev/null +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchPypi +, python, pytest, sortedcontainers }: + +buildPythonPackage rec { + version = "2.1.0"; + pname = "intervaltree"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ sortedcontainers ]; + + checkPhase = '' + runHook preCheck + # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails + mv nix_run_setup.py run_setup + rm build -rf + ${python.interpreter} run_setup test + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Editable interval tree data structure for Python 2 and 3"; + homepage = https://github.com/chaimleib/intervaltree; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix new file mode 100644 index 000000000000..ca9549b677bb --- /dev/null +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, mock }: + +buildPythonPackage rec { + pname = "jsonref"; + version = "0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n"; + }; + + buildInputs = [ pytest mock ]; + + checkPhase = '' + py.test tests.py + ''; + + meta = with stdenv.lib; { + description = "An implementation of JSON Reference for Python"; + homepage = "http://github.com/gazpachoking/jsonref"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 43e576b1b312..b15b2d0817a1 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.5"; + version = "2.0.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff"; + sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb"; }; checkInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Deep Learning library for Theano and TensorFlow"; - homepage = "https://keras.io"; + homepage = https://keras.io; license = licenses.mit; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 033f08f9587c..c2c2235836f7 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { postPatch = '' sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index b583a2ae2d82..34a179f501b9 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.39"; + version = "2.4.41"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3"; + sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"; }; # Needed by tests to setup a mockup ldap server. diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index e7c67819ed70..f6b12cae001c 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = "http://leather.rtfd.io"; + homepage = http://leather.rtfd.io; description = "Python charting library"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 9ed18190a8e3..f8faab3fbb81 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to communicate with Ledger Blue/Nano S"; - homepage = "https://github.com/LedgerHQ/blue-loader-python"; + homepage = https://github.com/LedgerHQ/blue-loader-python; license = licenses.asl20; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5192abf8200f..5318142fe706 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi{ inherit pname version; - sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc"; + sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f"; }; buildInputs = [ @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using hardware wallets as SSH/GPG agent"; - homepage = "https://github.com/romanz/trezor-agent"; + homepage = https://github.com/romanz/trezor-agent; license = licenses.gpl3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index bfe3b7bbb667..47110ffe3ba4 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h"; + sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c"; }; propagatedBuildInputs = [ sip protobuf ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = "https://github.com/Ultimaker/libArcus"; + homepage = https://github.com/Ultimaker/libArcus; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 7a96530912b6..f70c9a57e5fa 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libnacl"; - version = "1.5.1"; + version = "1.5.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb"; + sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2"; }; buildInputs = [ pytest ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = "https://pypi.python.org/pypi/libnacl"; + homepage = https://pypi.python.org/pypi/libnacl; license = licenses.asl20; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix new file mode 100644 index 000000000000..45c33f94b28a --- /dev/null +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -0,0 +1,38 @@ +{ stdenv, + buildPythonPackage, + fetchPypi, + isPy3k, + pythonOlder, + lib, + requests, + future, + enum34 }: + +buildPythonPackage rec { + pname = "linode-api"; + version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions. + name = "${pname}-${version}"; + + disabled = (pythonOlder "2.7"); + + propagatedBuildInputs = [ requests future ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + + postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") '' + sed -i -e '/"enum34",/d' setup.py + ''); + + doCheck = false; # This library does not have any tests at this point. + + src = fetchPypi { + inherit pname version; + sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4"; + }; + + meta = { + homepage = "https://github.com/linode/python-linode-api"; + description = "The official python library for the Linode API v4 in python."; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ glenns ]; + }; +} diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index c08d05c0341a..fa9c6ac18f3a 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = "http://llvmlite.pydata.org/"; + homepage = http://llvmlite.pydata.org/; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 74cc87d5d897..b79307a8084e 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527"; + sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index a777094aea16..d4a356eaec44 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Securely transfer data between computers"; - homepage = "https://github.com/warner/magic-wormhole"; + homepage = https://github.com/warner/magic-wormhole; license = licenses.mit; maintainers = with maintainers; [ asymmetric ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 8e8af34fcdc6..5b81d3da8ec6 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette protocol test automation harness"; - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette"; + homepage = https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 9a3fe07680d9..9e418af8a71b 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test manifest handling"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index ea72c0d0d18d..27c4d1bcb618 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette driver"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Marionette; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index d47cdd83976b..0e404f69caa5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Minidump stack trace extractor"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 2dc0e9b860aa..00329aa1d3f0 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored device management"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index eb627dcf243c..d32733036918 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "File utilities for Mozilla testing"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 32580d7f7726..ca489929d3a1 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Webserver for Mozilla testing"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 556706930948..d22e92876bf2 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "System information utilities for Mozilla testing"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 34a1fbf3aa0b..7382425f240d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Mozilla logging library"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 6a42ad0d872d..45fba9761e5d 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Network utilities for Mozilla testing"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index db3c713acad4..b6bea84aa238 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored process handling"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 3639d63e5484..5e939d4f3331 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application profile handling library"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 20942955c4c7..b0c3f6d8bcfa 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application start/stop helpers"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index 0ac697ce35f1..ad2be9b1923b 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test result storage and output"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 7d01767490cb..62605a1d21d3 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Application version information library"; - homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix new file mode 100644 index 000000000000..20af252f58f6 --- /dev/null +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, tox, pytest, flake8, responses +}: + +buildPythonPackage rec { + pname = "matrix-client"; + version = "0.0.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq"; + }; + + checkInputs = [ tox pytest flake8 responses ]; + + propagatedBuildInputs = [ requests ]; + + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "Matrix Client-Server SDK"; + homepage = https://github.com/matrix-org/matrix-python-sdk; + license = licenses.asl20; + maintainers = with maintainers; [ olejorgenb ]; + }; +} diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 472bba26eb65..63625b3e3b4a 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "McCabe checker, plugin for flake8"; - homepage = "https://github.com/flintwork/mccabe"; + homepage = https://github.com/flintwork/mccabe; license = licenses.mit; maintainers = with maintainers; [ garbas ]; }; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index a9ffe37a4638..068162dd6922 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the Message Passing Interface standard"; - homepage = "http://code.google.com/p/mpi4py/"; + homepage = http://code.google.com/p/mpi4py/; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix new file mode 100644 index 000000000000..aa5e3358866d --- /dev/null +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: + +buildPythonPackage rec { + name = "murmurhash-${version}"; + version = "0.26.4"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "murmurhash"; + rev = "0.26.4"; + sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv"; + }; + + buildInputs = [ + cython + ]; + + checkPhase = '' + cd murmurhash/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython bindings for MurmurHash2"; + homepage = https://github.com/explosion/murmurhash; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 143c57321b61..81340923fde6 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; - homepage = "http://jupyter.org/"; + homepage = http://jupyter.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d427a33f80f4..19d135fc0e1d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.12.1"; + version = "1.13.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numpy/numpy-${version}.zip"; - sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542"; + sha256 = "c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb"; }; disabled = isPyPy; @@ -21,6 +21,7 @@ buildPythonPackage rec { preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; preBuild = '' @@ -32,6 +33,8 @@ buildPythonPackage rec { EOF ''; + enableParallelBuilding = true; + checkPhase = '' runHook preCheck pushd dist @@ -55,7 +58,7 @@ buildPythonPackage rec { meta = { description = "Scientific tools for Python"; - homepage = "http://numpy.scipy.org/"; + homepage = http://numpy.scipy.org/; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix new file mode 100644 index 000000000000..5cf51b841329 --- /dev/null +++ b/pkgs/development/python-modules/olefile/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "olefile"; + version = "0.44"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1"; + }; + + meta = with stdenv.lib; { + description = "Python package to parse, read and write Microsoft OLE2 files"; + homepage = https://www.decalage.info/python/olefileio; + # BSD like + reference to Pillow + license = "http://olefile.readthedocs.io/en/latest/License.html"; + }; +} diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 7cdfb9061fb2..a76937278c48 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix new file mode 100644 index 000000000000..4ba93bb57f20 --- /dev/null +++ b/pkgs/development/python-modules/packaging/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyparsing, six, pytest, pretend }: + +buildPythonPackage rec { + pname = "packaging"; + version = "16.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + }; + + propagatedBuildInputs = [ pyparsing six ]; + + buildInputs = [ pytest pretend ]; + + meta = with stdenv.lib; { + description = "Core utilities for Python packages"; + homepage = https://github.com/pypa/packaging; + license = [ licenses.bsd2 licenses.asl20 ]; + maintainers = with maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ee75d211ad80..ca3f20d7ca3e 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.20.2"; + version = "0.20.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6"; + sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66"; }; LC_ALL = "en_US.UTF-8"; @@ -85,7 +85,7 @@ in buildPythonPackage rec { # https://github.com/pandas-dev/pandas/issues/14866 # pandas devs are no longer testing i686 so safer to assume it's broken broken = stdenv.isi686; - homepage = "http://pandas.pydata.org/"; + homepage = http://pandas.pydata.org/; description = "Python Data Analysis Library"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ]; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix new file mode 100644 index 000000000000..5137485a58fd --- /dev/null +++ b/pkgs/development/python-modules/paramz/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }: + +buildPythonPackage rec { + pname = "paramz"; + version = "0.7.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn"; + }; + + propagatedBuildInputs = [ numpy scipy six decorator ]; + + meta = with stdenv.lib; { + description = "Parameterization framework for parameterized model creation and handling"; + homepage = https://github.com/sods/paramz; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 68a2ef484c5b..2fa6c2b39300 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://docs.openstack.org/developer/pbr/"; + homepage = http://docs.openstack.org/developer/pbr/; license = stdenv.lib.licenses.asl20; description = "Python Build Reasonableness"; }; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix new file mode 100644 index 000000000000..b6e022640cbd --- /dev/null +++ b/pkgs/development/python-modules/pecan/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +# Python deps +, singledispatch +, logutils +, webtest +, Mako +, genshi +, Kajiki +, sqlalchemy +, gunicorn +, jinja2 +, virtualenv +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pecan"; + version = "1.2.1"; + + patches = [ + ./python36_test_fix.patch + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd"; + }; + + propagatedBuildInputs = [ singledispatch logutils ]; + buildInputs = [ + webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv + ]; + + meta = with stdenv.lib; { + description = "Pecan"; + homepage = "http://github.com/pecan/pecan"; + }; +} diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch new file mode 100644 index 000000000000..65e0733ab06e --- /dev/null +++ b/pkgs/development/python-modules/pecan/python36_test_fix.patch @@ -0,0 +1,13 @@ +diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py +index 0573d84..7c98e16 100644 +--- a/pecan/tests/test_conf.py ++++ b/pecan/tests/test_conf.py +@@ -157,7 +157,7 @@ class TestConf(PecanTestCase): + + try: + configuration.conf_from_file(f.name) +- except (ValueError, SystemError) as e: ++ except (ValueError, SystemError, ImportError) as e: + assert 'relative import' in str(e) + else: + raise AssertionError( diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index b54bcc0ed1d5..ea582afd96f6 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool to generate a static blog from reStructuredText or Markdown input files"; - homepage = "http://getpelican.com/"; + homepage = http://getpelican.com/; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi garbas ]; }; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix new file mode 100644 index 000000000000..4940a8b2e046 --- /dev/null +++ b/pkgs/development/python-modules/persistent/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, fetchPypi +, zope_interface +, pkgs +}: + +buildPythonPackage rec { + pname = "persistent"; + version = "4.2.4.2"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ zope_interface ]; + + src = fetchPypi { + inherit pname version; + sha256 = "cf264cd55866c7ffbcbe1328f8d8b28fd042a5dd0c03a03f68c0887df3aa1964"; + }; + + meta = { + description = "Automatic persistence for Python objects"; + homepage = http://www.zope.org/Products/ZODB; + }; +} diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index aba0631a5367..b527df297929 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "phonenumbers"; - version = "8.5.1"; + version = "8.8.0"; name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq"; + }; + meta = { description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; homepage = "https://github.com/daviddrysdale/python-phonenumbers"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ fadenb ]; }; - - src = fetchurl { - url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; - sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67"; - }; } diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 93933c435230..219ae4d70079 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pika ]; meta = with stdenv.lib; { - homepage = "https://github.com/bninja/pika-pool"; + homepage = https://github.com/bninja/pika-pool; license = licenses.bsdOriginal; description = "Pools for pikas."; }; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix new file mode 100644 index 000000000000..9161e8a43b6d --- /dev/null +++ b/pkgs/development/python-modules/pillow/default.nix @@ -0,0 +1,62 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, + nose, olefile, + freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}: +buildPythonPackage rec { + pname = "Pillow"; + version = "4.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967"; + }; + + doCheck = !stdenv.isDarwin && !isPyPy; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + propagatedBuildInputs = [ olefile ]; + + buildInputs = [ + freetype libjpeg zlib libtiff libwebp tcl nose lcms2 ] + ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;' + export LDFLAGS="-L${libwebp}/lib" + export CFLAGS="-I${libwebp}/include" + '' + # Remove impurities + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; + + meta = with stdenv.lib; { + homepage = https://python-pillow.github.io/; + description = "Fork of The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ goibhniu prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix new file mode 100644 index 000000000000..4ca6d0e08d10 --- /dev/null +++ b/pkgs/development/python-modules/plac/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "plac"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs"; + }; + + checkPhase = '' + cd doc + ${python.interpreter} -m unittest discover -p "*test_plac*" + ''; + + meta = with stdenv.lib; { + description = "Parsing the Command Line the Easy Way"; + homepage = https://github.com/micheles/plac; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 383dbd1e08f7..ed62a0912818 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.0.10"; + version = "2.0.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81"; + sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix new file mode 100644 index 000000000000..d82408e620ea --- /dev/null +++ b/pkgs/development/python-modules/preshed/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, cython +, cymem +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "preshed"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6"; + }; + + propagatedBuildInputs = [ + cython + cymem + ]; + buildInputs = [ + pytest + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "Cython hash tables that assume keys are pre-hashed"; + homepage = https://github.com/explosion/preshed; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 75fb75f93185..45887bdc748d 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ python-jose ]; meta = with stdenv.lib; { - homepage = "https://github.com/PyGithub/PyGithub"; + homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix new file mode 100644 index 000000000000..440a1aa7785e --- /dev/null +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }: + +buildPythonPackage rec { + name = "PyChromecast-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; + sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6"; + }; + + propagatedBuildInputs = [ requests six zeroconf protobuf ]; + + meta = with lib; { + description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; + homepage = "https://github.com/balloob/pychromecast"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix new file mode 100644 index 000000000000..e6c7a85aaf28 --- /dev/null +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pycodestyle"; + version = "2.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8"; + }; + + meta = with lib; { + description = "Python style guide checker (formerly called pep8)"; + homepage = https://pycodestyle.readthedocs.io; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index e3bd8e2b3711..4669c05a7d56 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://www.pycrypto.org/"; + homepage = http://www.pycrypto.org/; description = "Python Cryptography Toolkit"; platforms = pycryptodome.meta.platforms; }; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 71b90d242f06..148225787614 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = { - homepage = "https://www.pycryptodome.org/"; + homepage = https://www.pycryptodome.org/; description = "Python Cryptography Toolkit"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 563a3217e8c8..55aaa59d6b2e 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python extensions."; - homepage = "https://github.com/kirbyfan64/PyExt"; + homepage = https://github.com/kirbyfan64/PyExt; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a10c858c2336..a33eefa48ec4 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for games"; - homepage = "http://www.pygame.org/"; + homepage = http://www.pygame.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix index 3140f93aeb40..97f7b8b6c993 100644 --- a/pkgs/development/python-modules/pygame/git.nix +++ b/pkgs/development/python-modules/pygame/git.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for games"; - homepage = "http://www.pygame.org/"; + homepage = http://www.pygame.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; broken = true; diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix new file mode 100644 index 000000000000..6f6163bb35e8 --- /dev/null +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub +, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: + +buildPythonPackage rec { + pname = "pygame_sdl2"; + version = "6.99.10.1227"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "renpy"; + repo = "${pname}"; + rev = "renpy-${version}"; + sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1"; + }; + + buildInputs = [ + SDL2 SDL2_image SDL2_ttf SDL2_mixer + cython libjpeg libpng + ]; + + postInstall = '' + ( cd "$out"/include/python*/ ; + ln -s pygame-sdl2 pygame_sdl2 || true ; ) + ''; + + meta = with stdenv.lib; { + description = "A reimplementation of parts of pygame API using SDL2"; + homepage = "https://github.com/renpy/pygame_sdl2"; + # Some parts are also available under Zlib License + license = licenses.lgpl2; + maintainers = with maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index aa0d1d5f575d..c2c6ee211c90 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "https://github.com/pylast/pylast"; + homepage = https://github.com/pylast/pylast; description = "A python interface to last.fm (and compatibles)"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 12871bd8f6c2..8c82cb52910a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; + sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix new file mode 100644 index 000000000000..cb7b9ed43fe0 --- /dev/null +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pip, pandoc, glibcLocales, haskellPackages, texlive }: + +buildPythonPackage rec { + pname = "pypandoc"; + version = "1.3.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6"; + }; + + # Fix tests: first requires network access, second is a bug (reported upstream) + preConfigure = '' + substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" + substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'

title

'" + ''; + + LC_ALL="en_US.UTF-8"; + + propagatedBuildInputs = [ pip ]; + + buildInputs = [ pandoc texlive.combined.scheme-small haskellPackages.pandoc-citeproc glibcLocales ]; + + meta = with stdenv.lib; { + description = "Thin wrapper for pandoc"; + homepage = https://github.com/bebraw/pypandoc; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix new file mode 100644 index 000000000000..f751a8bfbb2d --- /dev/null +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "pyparsing"; + name = "${pname}-${version}"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8"; + }; + + # Not everything necessary to run the tests is included in the distribution + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pyparsing.wikispaces.com/; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index a5ae0aaa137d..cf1e17d3141b 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -19,7 +19,7 @@ in buildPythonPackage { export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages ${stdenv.lib.optionalString stdenv.isDarwin '' - export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \ + export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \ ''} substituteInPlace configure.py \ diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix index 7857f46e2422..1337b3c32ada 100644 --- a/pkgs/development/python-modules/pyrax.nix +++ b/pkgs/development/python-modules/pyrax.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = { - homepage = "https://github.com/rackspace/pyrax"; + 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/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index de1651ec2b0b..2e60f6812e95 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.16"; + version = "0.4.18"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9"; + sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 796bc88430a6..c3d271caa328 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ swig ]; meta = { - homepage = "https://pyscard.sourceforge.io/"; + homepage = https://pyscard.sourceforge.io/; description = "Smartcard library for python"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ layus ]; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index e02f32f223df..62ff439afbbf 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; license = stdenv.lib.licenses.gpl2; - homepage = "http://www.pyside.org/docs/apiextractor/"; + homepage = http://www.pyside.org/docs/apiextractor/; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 9d7f11b939dd..226108ad5a5b 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; - homepage = "http://www.pyside.org"; + homepage = http://www.pyside.org; maintainers = [ lib.maintainers.chaoflow ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/gcc6.patch b/pkgs/development/python-modules/pyside/gcc6.patch new file mode 100644 index 000000000000..440e94508c57 --- /dev/null +++ b/pkgs/development/python-modules/pyside/gcc6.patch @@ -0,0 +1,18 @@ +--- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100 ++++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100 +@@ -90,13 +90,13 @@ + SimpleFile::exists() const + { + std::ifstream ifile(p->m_filename); +- return ifile; ++ return (bool)ifile; + } + + bool + SimpleFile::exists(const char* filename) + { + std::ifstream ifile(filename); +- return ifile; ++ return (bool)ifile; + } + diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 8ecf2734832a..a6e0ce47f112 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; license = stdenv.lib.licenses.gpl2; - homepage = "http://www.pyside.org/docs/generatorrunner/"; + homepage = http://www.pyside.org/docs/generatorrunner/; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index cef78c215500..c588bac69ccf 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: +{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 @@ -14,6 +14,7 @@ buildPythonPackage rec { sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; }; + enableParallelBuilding = true; buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; @@ -23,14 +24,16 @@ buildPythonPackage rec { substituteInPlace generator/CMakeLists.txt --replace \ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; - patches = if isPy35 then [ ./shiboken_py35.patch ] else null; + + # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 + patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch); cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = lib.licenses.gpl2; - homepage = "http://www.pyside.org/docs/shiboken/"; + homepage = http://www.pyside.org/docs/shiboken/; maintainers = [ lib.maintainers.chaoflow ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/pkgs/development/python-modules/pyside/shiboken_py35.patch index 5642ddc594d1..32088144ed78 100644 --- a/pkgs/development/python-modules/pyside/shiboken_py35.patch +++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch @@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0) ++FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE() diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 9d02a016e723..5acd33d07d2d 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.gpl2; - homepage = "http://www.pyside.org"; + homepage = http://www.pyside.org; maintainers = [ lib.maintainers.chaoflow ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix new file mode 100644 index 000000000000..3a563e5d183d --- /dev/null +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: + +buildPythonPackage rec { + name = "pyslurm"; + + src = fetchFromGitHub { + repo = "pyslurm"; + owner = "PySlurm"; + rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d"; + sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28"; + }; + + patches = [ ./pyslurm-dlfcn.patch ]; + + buildInputs = [ cython slurm ]; + setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + + meta = with lib; { + homepage = https://github.com/PySlurm/pyslurm; + description = "Python bindings to Slurm"; + license = licenses.gpl2; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch new file mode 100644 index 000000000000..2b3798a30706 --- /dev/null +++ b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch @@ -0,0 +1,18 @@ +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/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b3577908cf9c..600c98925af4 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.16.0"; + version = "1.18.2"; src = fetchPypi { inherit pname version; - sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2"; + sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix new file mode 100644 index 000000000000..bd429a67f245 --- /dev/null +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.4"; + pname = "python-editor"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4"; + }; + + meta = with stdenv.lib; { + description = "A library that provides the `editor` module for programmatically"; + homepage = https://github.com/fmoo/python-editor; + }; +} diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix new file mode 100644 index 000000000000..28870d3db853 --- /dev/null +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-gnupg"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + }; + + propagatedBuildInputs = [ gnupg1 ]; + + # Let's make the library default to our gpg binary + patchPhase = '' + substituteInPlace gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'" + substituteInPlace test_gnupg.py \ + --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" + ''; + + meta = with stdenv.lib; { + description = "A wrapper for the Gnu Privacy Guard"; + homepage = https://pypi.python.org/pypi/python-gnupg; + license = licenses.bsd3; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index c1472bc66a8e..8c78cfeacbd4 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ future six ecdsa pycryptodome ]; meta = with stdenv.lib; { - homepage = "https://github.com/mpdavis/python-jose"; + homepage = https://github.com/mpdavis/python-jose; description = "A JOSE implementation in Python"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 337577141c2a..8e8fa61e9bc8 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655"; }; meta = { - homepage = "http://arthurdejong.org/python-stdnum/"; + homepage = http://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix new file mode 100644 index 000000000000..326151a4843f --- /dev/null +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, udev }: + +buildPythonPackage rec { + pname = "python-uinput"; + version = "0.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; + }; + + buildInputs = [ udev ]; + + NIX_CFLAGS_LINK = [ "-ludev" ]; + + meta = with stdenv.lib; { + description = "Pythonic API to Linux uinput kernel module"; + homepage = http://tjjr.fi/sw/python-uinput/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix new file mode 100644 index 000000000000..55479e76dafd --- /dev/null +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchgit +, python }: + +buildPythonPackage rec { + pname = "pytoml"; + version = "0.1.11"; + name = "${pname}-${version}"; + + 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"; + }; + + meta = with stdenv.lib; { + description = "A TOML parser/writer for Python"; + homepage = https://github.com/avakar/pytoml; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix new file mode 100644 index 000000000000..64175ea6d6db --- /dev/null +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake, + git, stdenv }: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "pytorch"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "pytorch"; + rev = "v${version}"; + sha256 = "112mp3r70d8f15dhxm6k7912b5i6c2q8hv9462s808y84grr2jdm"; + }; + + checkPhase = '' + ${stdenv.shell} test/run_test.sh + ''; + + buildInputs = [ + cmake + git + numpy.blas + ]; + + propagatedBuildInputs = [ + cffi + numpy + pyyaml + ]; + + preConfigure = '' + export NO_CUDA=1 + ''; + + meta = { + description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; + homepage = http://pytorch.org/; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix index 70950e4e9273..046424af608e 100644 --- a/pkgs/development/python-modules/pyudev.nix +++ b/pkgs/development/python-modules/pyudev.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://pyudev.readthedocs.org/"; + homepage = http://pyudev.readthedocs.org/; description = "Pure Python libudev binding"; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix new file mode 100644 index 000000000000..b728d4f6b943 --- /dev/null +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2 +, m2crypto, ply, pyyaml, six +, httpretty, lxml, mock, pytest, requests +}: + +buildPythonPackage rec { + name = "pywbem-${version}"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "pywbem"; + repo = "pywbem"; + rev = "v${version}"; + sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym"; + }; + + propagatedBuildInputs = [ m2crypto ply pyyaml six ]; + + checkInputs = [ httpretty lxml mock pytest requests ]; + + # 1 test fails because it doesn't like running in our sandbox. Deleting the + # whole file is admittedly a little heavy-handed but at least the vast + # majority of tests are run. + checkPhase = '' + rm testsuite/testclient/networkerror.yaml + + substituteInPlace makefile \ + --replace "PYTHONPATH=." "" \ + --replace '--cov $(package_name) --cov-config coveragerc' "" + + for f in testsuite/test_cim_xml.py testsuite/validate.py ; do + substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint" + done + + make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test + ''; + + meta = with stdenv.lib; { + description = "Support for the WBEM standard for systems management."; + homepage = http://pywbem.github.io/pywbem/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index b2b5ba208016..f471c8b8730b 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Windows Remote Management"; - homepage = "http://github.com/diyan/pywinrm/"; + homepage = http://github.com/diyan/pywinrm/; license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 5777a6137ae4..d22ba51fc3b8 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://pyzufall.readthedocs.io/de/latest/"; + homepage = https://pyzufall.readthedocs.io/de/latest/; description = "Library for generating random data and sentences in german language"; license = licenses.gpl3Plus; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix new file mode 100644 index 000000000000..9347cd55cf38 --- /dev/null +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rcssmin"; + version = "1.0.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rcssmin/; + license = licenses.asl20; + description = "CSS minifier written in pure python"; + }; +} diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 3dec364b292d..cf15d8dbc1fc 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six regex ]; meta = with stdenv.lib; { - homepage = "https://github.com/Toilal/rebulk/"; + homepage = https://github.com/Toilal/rebulk/; license = licenses.mit; description = "Advanced string matching from simple patterns"; }; diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix index 0162d6f6eb5e..03b9586d67fa 100644 --- a/pkgs/development/python-modules/requests-oauthlib.nix +++ b/pkgs/development/python-modules/requests-oauthlib.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchurl { url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz"; - sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468"; + sha256 = "18gg9dwral153c10f8bwhz2dy4nw7c6mws5a2g7gidk3z5xhqy4n"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index a8848fcac338..6ebcb7416857 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://rfc3986.readthedocs.org"; + homepage = https://rfc3986.readthedocs.org; license = licenses.asl20; description = "Validating URI References per RFC 3986"; }; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix new file mode 100644 index 000000000000..24adf830699c --- /dev/null +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rjsmin"; + version = "1.0.12"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rjsmin/; + license = licenses.asl20; + description = "Javascript minifier written in python"; + }; +} diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 37369b8f0bde..f7ef16b02bbd 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -14,13 +14,15 @@ buildPythonApplication rec { inherit pname version; sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; }; + # 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]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { - homepage = "https://scoding.de/ropper/"; + homepage = https://scoding.de/ropper/; license = licenses.gpl2; description = "Show information about files in different file formats"; maintainers = with maintainers; [ bennofs ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 6ac787bc82b2..eb669adff457 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -6,23 +6,15 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.18.1"; + version = "0.19.0"; name = "${pname}-${version}"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c"; + sha256 = "07q261l9145c9xr8b4pcsa08ih1ifhclp05i4xwg43cyamkwpx94"; }; - patches = [ - # python 3.6 test fixes (will be part of 0.18.2) - (fetchpatch { - url = https://github.com/scikit-learn/scikit-learn/pull/8123/commits/b77f28a7163cb4909da1b310f1fb741bee3cabfe.patch; - sha256 = "1rp6kr6hiabb6s0vh7mkgr10qwrqlq3z1fhpi0s011hg434ckh19"; - }) - ]; - buildInputs = [ nose pillow gfortran glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index a7428f134a7a..f4e4518ef168 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "scipy"; - version = "0.19.0"; + version = "0.19.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.zip"; - sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122"; + url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; + sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6"; }; buildInputs = [ gfortran nose numpy.blas ]; @@ -20,6 +20,7 @@ buildPythonPackage rec { preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; preBuild = '' @@ -31,6 +32,8 @@ buildPythonPackage rec { EOF ''; + enableParallelBuilding = true; + checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 2fcc06593848..5b40c74a1819 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = "http://scrapy.org/"; + homepage = http://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 285da5460717..a34b2d2ccfa9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://github.com/k-bx/python-semver"; + homepage = https://github.com/k-bx/python-semver; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 59fe5f148399..fa2b810964f9 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - license = with licenses; [ psfl zpt20 ]; + license = with licenses; [ psfl zpl20 ]; platforms = platforms.all; priority = 10; }; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 78dc82bc7704..8e637a673b1f 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3"; }; meta = { - homepage = "https://github.com/danthedeckie/simpleeval"; + homepage = https://github.com/danthedeckie/simpleeval; description = "A simple, safe single expression evaluator library"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 6754089ffce8..64c683147536 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Browser based viewer for profiling data"; - homepage = "https://jiffyclub.github.io/snakeviz"; + homepage = https://jiffyclub.github.io/snakeviz; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix new file mode 100644 index 000000000000..0413366c5501 --- /dev/null +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, numpy +, portaudio +}: + +buildPythonPackage rec { + pname = "sounddevice"; + name = "${pname}-${version}"; + version = "0.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc"; + }; + + propagatedBuildInputs = [ cffi numpy portaudio ]; + + # No tests included nor upstream available. + doCheck = false; + + prePatch = '' + substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'" + ''; + + meta = { + description = "Play and Record Sound with Python"; + homepage = http://python-sounddevice.rtfd.org/; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix new file mode 100644 index 000000000000..452f3f1d9234 --- /dev/null +++ b/pkgs/development/python-modules/spacy/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, pkgs +, buildPythonPackage +, python +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, pathlib2 +, numpy +, murmurhash +, plac +, six +, ujson +, dill +, requests +, ftfy +, thinc +, pip +}: +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 { + name = "spacy-${version}"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "spaCy"; + rev = "v${version}"; + sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648"; + }; + + propagatedBuildInputs = [ + cython + cymem + pathlib2 + preshed + numpy + murmurhash + plac + six + ujson + dill + requests + regexLocked + ftfy + thinc + pytest + pip + ]; + + doCheck = false; + # checkPhase = '' + # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # ''; + + meta = with stdenv.lib; { + description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; + homepage = https://github.com/explosion/spaCy; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix new file mode 100644 index 000000000000..8c2351c981e9 --- /dev/null +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildPythonPackage, numpy }: + +buildPythonPackage rec { + name = "sphfile-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://pypi/s/sphfile/${name}.tar.gz"; + sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd"; + }; + + propagatedBuildInputs = [ numpy ]; + + doCheck = false; + + meta = with lib; { + description = "Numpy-based NIST SPH audio-file reader"; + homepage = "https://github.com/mcfletch/sphfile"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix new file mode 100644 index 000000000000..ae08db31b2a8 --- /dev/null +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, simplejson +, mock +, glibcLocales +, html5lib +, pythonOlder +, enum34 +, python +, docutils +, jinja2 +, pygments +, alabaster +, Babel +, snowballstemmer +, six +, sqlalchemy +, whoosh +, imagesize +, requests +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Sphinx"; + version = "1.5.2"; + src = fetchPypi { + inherit pname version; + sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; + }; + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; + # Disable two tests that require network access. + checkPhase = '' + cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' + ''; + propagatedBuildInputs = [ + docutils + jinja2 + pygments + alabaster + Babel + snowballstemmer + six + sqlalchemy + whoosh + imagesize + requests + ]; + + # https://github.com/NixOS/nixpkgs/issues/22501 + # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. + postPatch = '' + substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" + ''; + + meta = { + description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; + homepage = http://sphinx.pocoo.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nand0p ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 326975e71558..ec73485193a5 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; meta = with stdenv.lib; { - homepage = "http://spotipy.readthedocs.org/"; + homepage = http://spotipy.readthedocs.org/; description = "A light weight Python library for the Spotify Web API"; license = licenses.mit; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 4cd522fe1953..36b04692a9e5 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.11"; + version = "1.1.12"; src = fetchPypi { inherit pname version; - sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211"; + sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9"; }; checkInputs = [ pytest mock pytest_xdist ] diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 60e35d2ade43..2ef294d8d9f9 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Statistical computations and models for use with SciPy"; - homepage = "https://www.github.com/statsmodels/statsmodels"; + homepage = https://www.github.com/statsmodels/statsmodels; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index c6ce6c0d922e..1478de78bba5 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; - homepage = "https://pypi.python.org/pypi/stevedore"; + homepage = https://pypi.python.org/pypi/stevedore; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index cd7bb2b9507b..1d3438032af7 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://www.stringtemplate.org/"; + homepage = http://www.stringtemplate.org/; description = "Text Templating Library"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix new file mode 100644 index 000000000000..fc16d77b4810 --- /dev/null +++ b/pkgs/development/python-modules/stripe/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, unittest2, mock, requests }: + +buildPythonPackage rec { + pname = "stripe"; + version = "1.41.1"; + name = "${pname}-${version}"; + + # Tests require network connectivity and there's no easy way to disable + # them. ~ C. + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5"; + }; + + buildInputs = [ unittest2 mock ]; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "Stripe Python bindings"; + homepage = https://github.com/stripe/stripe-python; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index f80dcdf74fd5..2ae41832569e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; - homepage = "http://www.pytables.org/"; + homepage = http://www.pytables.org/; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch deleted file mode 100644 index 337ad49f9715..000000000000 --- a/pkgs/development/python-modules/tarsnapper-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py -index 737ac8d..52cc775 100644 ---- a/src/tarsnapper/script.py -+++ b/src/tarsnapper/script.py -@@ -48,7 +48,7 @@ class TarsnapBackend(object): - """ - ``arguments`` is a single list of strings. - """ -- call_with = ['tarsnap'] -+ call_with = ['@NIXTARSNAPPATH@'] - for option in self.options: - key = option[0] - pre = "-" if len(key) == 1 else "--" -@@ -499,4 +499,4 @@ def run(): - - - if __name__ == '__main__': -- run() -\ No newline at end of file -+ run() diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix new file mode 100644 index 000000000000..817ea6388f95 --- /dev/null +++ b/pkgs/development/python-modules/thinc/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, pkgs +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, numpy +, python +, murmurhash +, hypothesis +, tqdm +, cytoolz +, plac +, six +, mock +, termcolor +, wrapt +, dill +}: + +let + enableDebugging = true; + + pathlibLocked = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pathlib"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; + }; + + doCheck = false; # fails to import support from test + }; +in buildPythonPackage rec { + name = "thinc-${version}"; + version = "6.5.1"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "thinc"; + rev = "v${version}"; + sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws"; + }; + + propagatedBuildInputs = [ + cython + cymem + preshed + numpy + murmurhash + pytest + hypothesis + tqdm + cytoolz + plac + six + mock + termcolor + wrapt + dill + pathlibLocked + ]; + + doCheck = false; + + # fails to import some modules + # checkPhase = '' + # ${python.interpreter} -m pytest thinc/tests + # # cd thinc/tests + # # ${python.interpreter} -m unittest discover -p "*test*" + # ''; + + meta = with stdenv.lib; { + description = "Practical Machine Learning for NLP in Python"; + homepage = https://github.com/explosion/thinc; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix new file mode 100644 index 000000000000..86dfe5d7f893 --- /dev/null +++ b/pkgs/development/python-modules/todoist/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, requests }: + +buildPythonPackage rec { + pname = "todoist-python"; + version = "7.0.17"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "0gs4vlvvmkz627ybswj0l6m3c8dyrqgfqjlawbc8d9rkx88srkr2"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "The official Todoist Python API library"; + homepage = http://todoist-python.readthedocs.io/en/latest/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix new file mode 100644 index 000000000000..ebda3a92fc45 --- /dev/null +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchPypi +, six +, numpy +, pillow +, pytorch +, lib }: + +buildPythonPackage rec { + version = "0.1.9"; + pname = "torchvision"; + name = "${pname}-${version}"; + + format = "wheel"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; + sha256 = "016rjfh9w1x4xpw15ryxsvq3j2li17nd3a7qslnf3241hc6vdcwf"; + }; + + propagatedBuildInputs = [ six numpy pillow pytorch ]; + + meta = { + description = "PyTorch vision library"; + homepage = http://pytorch.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ericsagnes ]; + }; +} diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix new file mode 100644 index 000000000000..11078eb85623 --- /dev/null +++ b/pkgs/development/python-modules/tornado/default.nix @@ -0,0 +1,28 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "4.5.1"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + }; +} diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix new file mode 100644 index 000000000000..31f69971e521 --- /dev/null +++ b/pkgs/development/python-modules/transaction/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, zope_interface +, mock +}: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "transaction"; + version = "2.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r"; + }; + + propagatedBuildInputs = [ zope_interface mock ]; + + meta = with stdenv.lib; { + description = "Transaction management"; + homepage = http://pypi.python.org/pypi/transaction; + license = licenses.zpl20; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 6a3f9c638908..72d73022cabb 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.7.15"; + version = "0.7.16"; src = fetchPypi { inherit pname version; - sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618"; + sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; }; propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 6898863e8afc..66a6022802fb 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchurl, python, - zope_interface, incremental, automat, constantly + zope_interface, incremental, automat, constantly, hyperlink }: buildPythonPackage rec { pname = "Twisted"; name = "${pname}-${version}"; - version = "17.1.0"; + version = "17.5.0"; src = fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv"; + sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 45aea2de1a42..481ff67dd97e 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; meta = { - homepage = "https://pypi.python.org/pypi/typed-ast"; + homepage = https://pypi.python.org/pypi/typed-ast; description = "a fork of Python 2 and 3 ast modules with type comment support"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index c099aba5b7af..b441ad8052c0 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This library provides run-time type checking for functions defined with argument type annotations"; - homepage = "https://github.com/agronholm/typeguard"; + homepage = https://github.com/agronholm/typeguard; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix new file mode 100644 index 000000000000..d7d56bed8819 --- /dev/null +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "UkPostcodeParser"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b"; + }; + + doCheck = false; + + meta = with lib; { + description = "UK Postcode parser"; + homepage = https://github.com/hamstah/ukpostcodeparser; + license = licenses.publicDomain; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix new file mode 100644 index 000000000000..4d09fda83da4 --- /dev/null +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchurl }: + +buildPythonPackage rec { + name = "umemcache-${version}"; + version = "1.6.3"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/u/umemcache/${name}.zip"; + sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; + }; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; + homepage = https://github.com/esnme/ultramemcache; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index a0aa14789448..5151ee638482 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://pythonhosted.org/uncertainties/"; + homepage = http://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainer = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix new file mode 100644 index 000000000000..89496e00e568 --- /dev/null +++ b/pkgs/development/python-modules/unifi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage +, fetchPypi, urllib3 }: + +buildPythonPackage rec { + pname = "unifi"; + version = "1.2.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8"; + }; + + propagatedBuildInputs = [ urllib3 ]; + + # upstream has no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "An API towards the Ubiquity Networks UniFi controller"; + homepage = https://pypi.python.org/pypi/unifi/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 066230d0a1fc..36b8711d7c1a 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }: +{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }: if lib.versionOlder python.version "3.5.0" then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.6.1"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il"; + sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq"; }; - buildInputs = [ python ]; + buildInputs = [ python gettext ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake doxygen ]; postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; + homepage = https://github.com/Ultimaker/Uranium; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix new file mode 100644 index 000000000000..efdce1e6dba3 --- /dev/null +++ b/pkgs/development/python-modules/vega/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage , fetchPypi +, pytest, jupyter_core, pandas }: + +buildPythonPackage rec { + pname = "vega"; + version = "0.4.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ jupyter_core pandas ]; + + meta = with stdenv.lib; { + description = "An IPython/Jupyter widget for Vega and Vega-Lite"; + longDescription = '' + To use this you have to enter a nix-shell with vega. Then run: + + jupyter nbextension install --user --py vega + jupyter nbextension enable --user vega + ''; + homepage = https://github.com/vega/ipyvega; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix new file mode 100644 index 000000000000..bf5a09a24187 --- /dev/null +++ b/pkgs/development/python-modules/vine/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, case, pytest, pythonOlder }: + +buildPythonPackage rec { + pname = "vine"; + version = "1.1.4"; + name = "${pname}-${version}"; + + disable = pythonOlder "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72"; + }; + + buildInputs = [ case pytest ]; + + meta = with stdenv.lib; { + description = "Python promises"; + homepage = https://github.com/celery/vine; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 1d454fc4a628..44f3480aec67 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "A webserver intended for web browser testing"; - homepage = " http://wptserve.readthedocs.org/"; + homepage = http://wptserve.readthedocs.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 33adac52c903..944118870b67 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "XMPP python library"; - homepage = "http://xmpppy.sourceforge.net/"; + homepage = http://xmpppy.sourceforge.net/; license = licenses.gpl3; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix new file mode 100644 index 000000000000..1d4672312a20 --- /dev/null +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, pyyaml }: + +buildPythonPackage rec { + pname = "yamllint"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; + }; + + buildInputs = [ nose ]; + + propagatedBuildInputs = [ pyyaml ]; + + meta = with stdenv.lib; { + description = "A linter for YAML files"; + homepage = https://github.com/adrienverge/yamllint; + license = licenses.gpl3; + maintainers = with maintainers; [ mikefaille ]; + }; +} diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix new file mode 100644 index 000000000000..86ef792a437c --- /dev/null +++ b/pkgs/development/python-modules/yapf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "yapf"; + version = "0.16.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2"; + }; + + meta = with stdenv.lib; { + description = "A formatter for Python code."; + homepage = "https://github.com/google/yapf"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthist ]; + }; + +} diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index f6bbb8f4b86c..5e8c412ce520 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; - homepage = "https://github.com/cakebread/yolk"; + homepage = https://github.com/cakebread/yolk; maintainer = with maintainers; [ profpatsch ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix new file mode 100644 index 000000000000..4ffd0e94c611 --- /dev/null +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, mock +, zope_testing +, stdenv +}: + +buildPythonPackage rec { + pname = "zc.lockfile"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ zope_testing ]; + + meta = with stdenv.lib; { + description = "Inter-process locks"; + homepage = http://www.python.org/pypi/zc.lockfile; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix new file mode 100644 index 000000000000..fa6a7a613322 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, zope_testrunner +, manuel +, docutils +}: + +buildPythonPackage rec { + pname = "ZConfig"; + version = "3.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; + }; + + patches = [ ./skip-broken-test.patch ]; + + buildInputs = [ manuel docutils ]; + propagatedBuildInputs = [ zope_testrunner ]; + + meta = with stdenv.lib; { + description = "Structured Configuration Library"; + homepage = http://pypi.python.org/pypi/ZConfig; + license = licenses.zpl20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch new file mode 100644 index 000000000000..ee3fcff49036 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/skip-broken-test.patch @@ -0,0 +1,12 @@ +diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py +index 838cf7c..52daf4e 100644 +--- a/ZConfig/tests/test_schema2html.py ++++ b/ZConfig/tests/test_schema2html.py +@@ -74,6 +74,7 @@ else: + + class TestSchema2HTML(unittest.TestCase): + ++ @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)') + def test_no_schema(self): + self.assertRaises(SystemExit, + run_transform) diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 41418a99c8d1..8d6670aa8507 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -83,7 +83,7 @@ in buildPythonPackage { ''; meta = with lib; { - homepage = "http://docs.python-zeep.org"; + homepage = http://docs.python-zeep.org; license = licenses.mit; description = "A modern/fast Python SOAP client based on lxml / requests"; maintainers = with maintainers; [ rvl ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix new file mode 100644 index 000000000000..5502a8236dae --- /dev/null +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, netifaces, six, enum-compat }: + +buildPythonPackage rec { + pname = "zeroconf"; + version = "0.19.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3"; + }; + + propagatedBuildInputs = [ netifaces six enum-compat ]; + + meta = with stdenv.lib; { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = https://github.com/jstasiak/python-zeroconf; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix new file mode 100644 index 000000000000..a4855c23865c --- /dev/null +++ b/pkgs/development/python-modules/zodb/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, isPy3k +, zope_testrunner +, transaction +, six +, wheel +, zope_interface +, zodbpickle +, zconfig +, persistent +, zc_lockfile +, BTrees +, manuel +}: + +buildPythonPackage rec { + pname = "ZODB"; + version = "5.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc"; + }; + + propagatedBuildInputs = [ + manuel + transaction + zope_testrunner + six + wheel + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; + + meta = with stdenv.lib; { + description = "Zope Object Database: object database and persistence"; + homepage = http://pypi.python.org/pypi/ZODB; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix new file mode 100644 index 000000000000..f51b30ab51e3 --- /dev/null +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, isPyPy +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zodbpickle"; + version = "0.6.0"; + name = "${pname}-${version}"; + disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 + + src = fetchPypi { + inherit pname version; + sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + }; + + # fails.. + doCheck = false; + + meta = { + homepage = http://pypi.python.org/pypi/zodbpickle; + }; +} diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix new file mode 100644 index 000000000000..7af2d11e25c5 --- /dev/null +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_event +}: + +buildPythonPackage rec { + pname = "zope.interface"; + version = "4.4.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0"; + }; + + propagatedBuildInputs = [ zope_event ]; + + meta = with stdenv.lib; { + description = "Zope.Interface"; + homepage = http://zope.org/Products/ZopeInterface; + license = licenses.zpl20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix new file mode 100644 index 000000000000..7f2af64d9159 --- /dev/null +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, zope_interface +, zope_exceptions +, zope_testing +, six +}: + + +buildPythonPackage rec { + pname = "zope.testrunner"; + version = "4.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0"; + extension = "zip"; + }; + + propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; + + meta = with stdenv.lib; { + description = "A flexible test runner with layer support"; + homepage = http://pypi.python.org/pypi/zope.testrunner; + license = licenses.zpl20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index f3d8e746c22d..a40a34052ca2 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; + homepage = https://wiki.qt.io/Category:Tools::QtCreator; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; platforms = platforms.all; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7354f5e5715d..3de25dd1478d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -281,6 +281,7 @@ let pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; + pbdZMQ = [ pkgs.which ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; PopGenome = [ pkgs.zlib.dev ]; diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 0caa8b226f08..4ac62da7f4a3 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,8 +1,8 @@ -{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix, +{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, nix-prefetch-git }: buildRubyGem rec { - inherit ruby; + inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; @@ -36,7 +36,7 @@ buildRubyGem rec { The output is then usable by the bundlerEnv derivation to list all the dependencies of a ruby package. ''; - homepage = "https://github.com/manveru/bundix"; + homepage = https://github.com/manveru/bundix; license = "MIT"; maintainers = with lib.maintainers; [ manveru zimbatm ]; platforms = lib.platforms.all; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix new file mode 100644 index 000000000000..64a88d8f7b83 --- /dev/null +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -0,0 +1,155 @@ +{ stdenv, runCommand, ruby, lib +, defaultGemConfig, buildRubyGem, buildEnv +, makeWrapper +, bundler +}@defs: + +{ + name ? null +, pname ? null +, mainGemName ? null +, gemdir ? null +, gemfile ? null +, lockfile ? null +, gemset ? null +, ruby ? defs.ruby +, gemConfig ? defaultGemConfig +, postBuild ? null +, document ? [] +, meta ? {} +, groups ? ["default"] +, ignoreCollisions ? false +, ... +}@args: + +assert name == null -> pname != null; + +with import ./functions.nix { inherit lib gemConfig; }; + +let + gemFiles = bundlerFiles args; + + importedGemset = import gemFiles.gemset; + + filteredGemset = filterGemset { inherit ruby groups; } importedGemset; + + configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs: + applyGemConfigs (attrs // { inherit ruby; gemName = name; }) + ); + + hasBundler = builtins.hasAttr "bundler" filteredGemset; + + bundler = + if hasBundler then gems.bundler + else defs.bundler.override (attrs: { inherit ruby; }); + + gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs); + + name' = if name != null then + name + else + let + gem = gems."${pname}"; + version = gem.version; + in + "${pname}-${version}"; + + pname' = if pname != null then + pname + else + name; + + copyIfBundledByPath = { bundledByPath ? false, ...}@main: + (if bundledByPath then + assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ + else "" + ); + + maybeCopyAll = pkgname: if pkgname == null then "" else + let + mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found"); + in + copyIfBundledByPath mainGem; + + # We have to normalize the Gemfile.lock, otherwise bundler tries to be + # helpful by doing so at run time, causing executables to immediately bail + # out. Yes, I'm serious. + confFiles = runCommand "gemfile-and-lockfile" {} '' + mkdir -p $out + ${maybeCopyAll mainGemName} + cp ${gemFiles.gemfile} $out/Gemfile || ls -l $out/Gemfile + cp ${gemFiles.lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock + ''; + + buildGem = name: attrs: ( + let + gemAttrs = composeGemAttrs ruby gems name attrs; + in + if gemAttrs.type == "path" then + pathDerivation gemAttrs + else + buildRubyGem gemAttrs + ); + + envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler; + + basicEnv = buildEnv { + inherit ignoreCollisions; + + name = name'; + + paths = envPaths; + pathsToLink = [ "/lib" ]; + + postBuild = genStubsScript (defs // args // { + inherit confFiles bundler groups; + binPaths = envPaths; + }) + lib.optionalString (postBuild != null) postBuild; + + meta = { platforms = ruby.meta.platforms; } // meta; + + passthru = rec { + inherit ruby bundler gems confFiles envPaths; + + wrappedRuby = stdenv.mkDerivation { + name = "wrapped-ruby-${pname'}"; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + for i in ${ruby}/bin/*; do + makeWrapper "$i" $out/bin/$(basename "$i") \ + --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ + --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \ + --set BUNDLE_FROZEN 1 \ + --set GEM_HOME ${basicEnv}/${ruby.gemPath} \ + --set GEM_PATH ${basicEnv}/${ruby.gemPath} + done + ''; + }; + + env = let + irbrc = builtins.toFile "irbrc" '' + if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?) + require ENV["OLD_IRBRC"] + end + require 'rubygems' + require 'bundler/setup' + ''; + in stdenv.mkDerivation { + name = "${pname'}-interactive-environment"; + nativeBuildInputs = [ wrappedRuby basicEnv ]; + shellHook = '' + export OLD_IRBRC=$IRBRC + export IRBRC=${irbrc} + ''; + buildCommand = '' + echo >&2 "" + echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; + }; +in + basicEnv diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix new file mode 100644 index 000000000000..b17a4639e779 --- /dev/null +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -0,0 +1,75 @@ +{ lib, gemConfig, ... }: +rec { + bundlerFiles = { + gemfile ? null + , lockfile ? null + , gemset ? null + , gemdir ? null + , ... + }: { + inherit gemdir; + + gemfile = + if gemfile == null then assert gemdir != null; gemdir + "/Gemfile" + else gemfile; + + lockfile = + if lockfile == null then assert gemdir != null; gemdir + "/Gemfile.lock" + else lockfile; + + gemset = + if gemset == null then assert gemdir != null; gemdir + "/gemset.nix" + else gemset; + }; + + filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + + platformMatches = {rubyEngine, version, ...}@ruby: attrs: ( + !(attrs ? "platforms") || + builtins.length attrs.platforms == 0 || + builtins.any (platform: + platform.engine == rubyEngine && + (!(platform ? "version") || platform.version == version.majMin) + ) attrs.platforms + ); + + groupMatches = groups: attrs: ( + !(attrs ? "groups") || + builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups + ); + + applyGemConfigs = attrs: + (if gemConfig ? "${attrs.gemName}" + then attrs // gemConfig."${attrs.gemName}" attrs + else attrs); + + genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: '' + ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \ + "${ruby}/bin/ruby" \ + "${confFiles}/Gemfile" \ + "$out/${ruby.gemPath}" \ + "${bundler}/${ruby.gemPath}" \ + ${lib.escapeShellArg binPaths} \ + ${lib.escapeShellArg groups} + ''; + + pathDerivation = { gemName, version, path, ... }: + let + res = { + type = "derivation"; + bundledByPath = true; + name = gemName; + version = version; + outPath = path; + outputs = [ "out" ]; + out = res; + outputName = "out"; + }; + in res; + + composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // { + inherit ruby; + gemName = name; + gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); + }); +} diff --git a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb similarity index 100% rename from pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb rename to pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix new file mode 100644 index 000000000000..ee3754595f39 --- /dev/null +++ b/pkgs/development/ruby-modules/bundled-common/test.nix @@ -0,0 +1,50 @@ +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs: +let + testConfigs = { + inherit lib; + gemConfig = defaultGemConfig; + }; + functions = (import ./functions.nix testConfigs); +in + builtins.concatLists [ + ( test.run "All set, no gemdir" (functions.bundlerFiles { + gemfile = test/Gemfile; + lockfile = test/Gemfile.lock; + gemset = test/gemset.nix; + }) { + gemfile = should.equal test/Gemfile; + lockfile = should.equal test/Gemfile.lock; + gemset = should.equal test/gemset.nix; + }) + + ( test.run "Just gemdir" (functions.bundlerFiles { + gemdir = test/.; + }) { + gemfile = should.equal test/Gemfile; + lockfile = should.equal test/Gemfile.lock; + gemset = should.equal test/gemset.nix; + }) + + ( test.run "Gemset and dir" (functions.bundlerFiles { + gemdir = test/.; + gemset = test/extraGemset.nix; + }) { + gemfile = should.equal test/Gemfile; + lockfile = should.equal test/Gemfile.lock; + gemset = should.equal test/extraGemset.nix; + }) + + ( test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {})) + ( let gemSet = { test = { groups = ["x" "y"]; }; }; + in + test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet)) + ( let gemSet = { test = { platforms = []; }; }; + in + test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet)) + ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; }; + in + test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet)) + ( let gemSet = { test = { groups = ["x" "y"]; }; }; + in + test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {})) + ] diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix new file mode 100644 index 000000000000..99d1dd64dc4f --- /dev/null +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, callPackage, runCommand, ruby }@defs: + +# Use for simple installation of Ruby tools shipped in a Gem. +# Start with a Gemfile that includes `gem ` +# > nix-shell -p bundler bundix +# (shell)> bundle lock +# (shell)> bundix +# Then use rubyTool in the default.nix: + +# rubyTool { pname = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; } +# The 'exes' parameter ensures that a copy of e.g. rake doesn't polute the system. +{ + # use the name of the name in question; its version will be picked up from the gemset + pname + # gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./. +, gemdir + # Exes is the list of executables provided by the gems in the Gemfile +, exes ? [] + # Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails) +, scripts ? [] +, ruby ? defs.ruby +, gemfile ? null +, lockfile ? null +, gemset ? null +, preferLocalBuild ? false +, allowSubstitutes ? false +, meta ? {} +, postBuild ? "" +}@args: + +let + basicEnv = (callPackage ../bundled-common {}) args; + + cmdArgs = removeAttrs args [ "pname" "postBuild" ] + // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults +in + runCommand basicEnv.name cmdArgs '' + mkdir -p $out/bin; + ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} + ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ + "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--set BUNDLE_FROZEN 1 "+ + "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ + "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ + "--run \"cd $srcdir\";\n") scripts)} + ${postBuild} + '' diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 57ca23d41436..2e2653621a76 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,9 +1,6 @@ { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib , callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv -, git -, makeWrapper -, bundler -, tree +, linkFarm, git, makeWrapper, bundler, tree }@defs: { name ? null @@ -12,143 +9,54 @@ , gemfile ? null , lockfile ? null , gemset ? null +, groups ? ["default"] , ruby ? defs.ruby , gemConfig ? defaultGemConfig , postBuild ? null , document ? [] , meta ? {} -, groups ? ["default"] , ignoreCollisions ? false , ... }@args: let - drvName = - if name != null then name - else if pname != null then "${toString pname}-${mainGem.version}" - else throw "bundlerEnv: either pname or name must be set"; + inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript; - mainGem = - if pname == null then null - else gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found"); + basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; }); - gemfile' = - if gemfile == null then gemdir + "/Gemfile" - else gemfile; + inherit (basicEnv) envPaths; + # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" - + # either specific executables or the bin/ for certain gem(s), but + # incorporates the basicEnv as a requirement so that its $out is in our path. - lockfile' = - if lockfile == null then gemdir + "/Gemfile.lock" - else lockfile; + # When stubbing the bins for a gem, we should use the gem expression + # directly, which means that basicEnv should somehow make it available. - gemset' = - if gemset == null then gemdir + "/gemset.nix" - else gemset; + # Different use cases should use different variations on this file, rather + # than the expression trying to deduce a use case. - importedGemset = import gemset'; - - filteredGemset = (lib.filterAttrs (name: attrs: - if (builtins.hasAttr "groups" attrs) - then (builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups) - else true - ) importedGemset); - - applyGemConfigs = attrs: - (if gemConfig ? "${attrs.gemName}" - then attrs // gemConfig."${attrs.gemName}" attrs - else attrs); - - configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs: - applyGemConfigs (attrs // { inherit ruby; gemName = name; }) - ); - - hasBundler = builtins.hasAttr "bundler" filteredGemset; - - bundler = - if hasBundler then gems.bundler - else defs.bundler.override (attrs: { inherit ruby; }); - - gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: - buildRubyGem ((removeAttrs attrs ["source"]) // attrs.source // { - inherit ruby; - gemName = name; - gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); - })); - - # We have to normalize the Gemfile.lock, otherwise bundler tries to be - # helpful by doing so at run time, causing executables to immediately bail - # out. Yes, I'm serious. - confFiles = runCommand "gemfile-and-lockfile" {} '' - mkdir -p $out - cp ${gemfile'} $out/Gemfile - cp ${lockfile'} $out/Gemfile.lock - ''; - - envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler; - - binPaths = if mainGem != null then [ mainGem ] else envPaths; - - bundlerEnv = buildEnv { - inherit ignoreCollisions; - - name = drvName; - - paths = envPaths; - pathsToLink = [ "/lib" ]; - - postBuild = '' - ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \ - "${ruby}/bin/ruby" \ - "${confFiles}/Gemfile" \ - "$out/${ruby.gemPath}" \ - "${bundler}/${ruby.gemPath}" \ - ${lib.escapeShellArg binPaths} \ - ${lib.escapeShellArg groups} - '' + lib.optionalString (postBuild != null) postBuild; - - meta = { platforms = ruby.meta.platforms; } // meta; - - passthru = rec { - inherit ruby bundler gems; - - wrappedRuby = stdenv.mkDerivation { - name = "wrapped-ruby-${drvName}"; - nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p $out/bin - for i in ${ruby}/bin/*; do - makeWrapper "$i" $out/bin/$(basename "$i") \ - --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ - --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \ - --set BUNDLE_FROZEN 1 \ - --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \ - --set GEM_PATH ${bundlerEnv}/${ruby.gemPath} - done - ''; - }; - - env = let - irbrc = builtins.toFile "irbrc" '' - if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?) - require ENV["OLD_IRBRC"] - end - require 'rubygems' - require 'bundler/setup' - ''; - in stdenv.mkDerivation { - name = "interactive-${drvName}-environment"; - nativeBuildInputs = [ wrappedRuby bundlerEnv ]; - shellHook = '' - export OLD_IRBRC="$IRBRC" - export IRBRC=${irbrc} - ''; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; - }; - }; - }; + # The basicEnv should be put into passthru so that e.g. nix-shell can use it. in - bundlerEnv + if pname == null then + basicEnv // { inherit name basicEnv; } + else + (buildEnv { + inherit ignoreCollisions; + + name = basicEnv.name; + + paths = envPaths; + pathsToLink = [ "/lib" ]; + + postBuild = genStubsScript { + inherit lib ruby bundler groups; + confFiles = basicEnv.confFiles; + binPaths = [ basicEnv.gems."${pname}" ]; + } + lib.optionalString (postBuild != null) postBuild; + + meta = { platforms = ruby.meta.platforms; } // meta; + passthru = basicEnv.passthru // { + inherit basicEnv; + inherit (basicEnv) env; + }; + }) diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix new file mode 100644 index 000000000000..63da7044c0cf --- /dev/null +++ b/pkgs/development/ruby-modules/bundler-env/test.nix @@ -0,0 +1,33 @@ +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs: +let + bundlerEnv = callPackage ./default.nix stubs // { + basicEnv = callPackage ../bundled-common stubs; + }; + + justName = bundlerEnv { + name = "test-0.1.2"; + gemset = ./test/gemset.nix; + }; + + pnamed = bundlerEnv { + pname = "test"; + gemdir = ./test; + gemset = ./test/gemset.nix; + gemfile = ./test/Gemfile; + lockfile = ./test/Gemfile.lock; + }; +in + builtins.concatLists [ + (test.run "bundlerEnv { name }" justName { + name = should.equal "test-0.1.2"; + }) + (test.run "bundlerEnv { pname }" pnamed + [ + (should.haveKeys [ "name" "env" "postBuild" ]) + { + name = should.equal "test-0.1.2"; + env = should.beASet; + postBuild = should.havePrefix "/nix/store"; + } + ]) + ] diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile b/pkgs/development/ruby-modules/bundler-env/test/Gemfile new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock b/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkgs/development/ruby-modules/bundler-env/test/gemset.nix b/pkgs/development/ruby-modules/bundler-env/test/gemset.nix new file mode 100644 index 000000000000..53f15f96bc6d --- /dev/null +++ b/pkgs/development/ruby-modules/bundler-env/test/gemset.nix @@ -0,0 +1,10 @@ +{ + test = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + type = "gem"; + }; + version = "0.1.2"; + }; +} diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 53e47630fbb7..8331440ab998 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.15.1"; - sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps"; + version = "1.15.3"; + sha256 = "125amldnpzzrfw76mmr7mlx002k1k6xdyrqf5bdnzl5hajvn0s5f"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 204c74436008..90e72b168025 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -242,7 +242,7 @@ in substituteInPlace lib/sup/crypto.rb \ --replace 'which gpg2' \ - '${which}/bin/which gpg2' + '${which}/bin/which gpg' ''; }; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index ade6659c400b..62a9d60686f3 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation (attrs // { ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; + #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; name = attrs.name or "${namePrefix}${gemName}-${version}"; inherit src; diff --git a/pkgs/development/ruby-modules/runtests.sh b/pkgs/development/ruby-modules/runtests.sh new file mode 100755 index 000000000000..8bb8c8a5462c --- /dev/null +++ b/pkgs/development/ruby-modules/runtests.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -o xtrace +cd $(dirname $0) +find . -name text.nix +testfiles=$(find . -name test.nix) +nix-build -E "with import {}; callPackage testing/driver.nix { testFiles = [ $testfiles ]; }" --show-trace && cat result diff --git a/pkgs/development/ruby-modules/testing/assertions.nix b/pkgs/development/ruby-modules/testing/assertions.nix new file mode 100644 index 000000000000..f28cfcd508d4 --- /dev/null +++ b/pkgs/development/ruby-modules/testing/assertions.nix @@ -0,0 +1,28 @@ +{ test, lib, ...}: +{ + equal = expected: actual: + if actual == expected then + (test.passed "= ${toString expected}") else + (test.failed ( + "expected '${toString expected}'(${builtins.typeOf expected})" + + " != "+ + "actual '${toString actual}'(${builtins.typeOf actual})" + )); + + beASet = actual: + if builtins.isAttrs actual then + (test.passed "is a set") else + (test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}"); + + haveKeys = expected: actual: + if builtins.all + (ex: builtins.any (ac: ex == ac) (builtins.attrNames actual)) + expected then + (test.passed "has expected keys") else + (test.failed "keys differ: expected: [${lib.concatStringsSep ";" expected}] actual: [${lib.concatStringsSep ";" (builtins.attrNames actual)}]"); + + havePrefix = expected: actual: + if lib.hasPrefix expected actual then + (test.passed "has prefix '${expected}'") else + (test.failed "prefix '${expected}' not found in '${actual}'"); +} diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/pkgs/development/ruby-modules/testing/driver.nix new file mode 100644 index 000000000000..65e7c8d4416d --- /dev/null +++ b/pkgs/development/ruby-modules/testing/driver.nix @@ -0,0 +1,20 @@ +/* +Run with: +nix-build -E 'with import { }; callPackage ./test.nix {}' --show-trace; and cat result + +Confusingly, the ideal result ends with something like: +error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed +*/ +{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs: +let + testTools = rec { + test = import ./testing.nix; + stubs = import ./stubs.nix defs; + should = import ./assertions.nix { inherit test lib; }; + }; + + tap = import ./tap-support.nix; + + results = builtins.concatLists (map (file: callPackage file testTools) testFiles); +in + writeText "test-results.tap" (tap.output results) diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix new file mode 100644 index 000000000000..3585681478c8 --- /dev/null +++ b/pkgs/development/ruby-modules/testing/stubs.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, ruby, callPackage, ... }: +let + real = { + inherit (stdenv) mkDerivation; + }; + mkDerivation = {name, ...}@argSet: + derivation { + inherit name; + text = (builtins.toJSON (lib.filterAttrs ( n: v: builtins.any (x: x == n) ["name" "system"]) argSet)); + builder = stdenv.shell; + args = [ "-c" "echo $(<$textPath) > $out"]; + system = stdenv.system; + passAsFile = ["text"]; + }; + fetchurl = {url?"", urls ? [],...}: "fetchurl:${if urls == [] then url else builtins.head urls}"; + + stdenv' = stdenv // { + inherit mkDerivation; + stubbed = true; + }; + ruby' = ruby // { + stdenv = stdenv'; + stubbed = true; + }; +in + { + ruby = ruby'; + buildRubyGem = callPackage ../gem { + inherit fetchurl; + ruby = ruby'; + }; + stdenv = stdenv'; + } diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix new file mode 100644 index 000000000000..74fcceebaa04 --- /dev/null +++ b/pkgs/development/ruby-modules/testing/tap-support.nix @@ -0,0 +1,21 @@ +with builtins; +let + withIndexes = list: genList (idx: (elemAt list idx) // {index = idx;}) (length list); + + testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report; + + # These are part of the TAP spec, not yet implemented. + #c.f. https://github.com/NixOS/nixpkgs/issues/27071 + testDirective = report: ""; + testYaml = report: ""; + + okStr = { result, ...}: if result == "pass" then "ok" else "not ok"; +in + { + output = reports: '' + TAP version 13 + 1..${toString (length reports)}'' + (foldl' (l: r: l + "\n" + r) "" (map testLine (withIndexes reports))) + '' + + # Finished at ${toString currentTime} + ''; + } diff --git a/pkgs/development/ruby-modules/testing/testing.nix b/pkgs/development/ruby-modules/testing/testing.nix new file mode 100644 index 000000000000..43d10fca0444 --- /dev/null +++ b/pkgs/development/ruby-modules/testing/testing.nix @@ -0,0 +1,62 @@ +with builtins; +let + /* + underTest = { + x = { + a = 1; + b = "2"; + }; + }; + + tests = [ + (root: false) + { + x = [ + (set: true) + { + a = (a: a > 1); + b = (b: b == "3"); + } + ]; + } + ]; + + results = run "Examples" underTest tests; + */ + + passed = desc: { + result = "pass"; + description = desc; + }; + + failed = desc: { + result = "failed"; + description = desc; + }; + + prefixName = name: res: { + inherit (res) result; + description = "${name}: ${res.description}"; + }; + + run = name: under: tests: if isList tests then + (concatLists (map (run name under) tests)) + else if isAttrs tests then + (concatLists (map ( + subName: run (name + "." + subName) (if hasAttr subName under then getAttr subName under else "") (getAttr subName tests) + ) (attrNames tests))) + else if isFunction tests then + let + res = tests under; + in + if isBool res then + [ + (prefixName name (if tests under then passed "passed" else failed "failed")) + ] + else + [ (prefixName name res) ] + else [ + failed (name ": not a function, list or set") + ]; +in + { inherit run passed failed; } diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index feb6865566f0..46a213f219df 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.0"; + version = "1.0.2"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c"; + sha256 = "11xn84q947qrf0p2p37pyx9nphl6542jbdan3mjcmdi4p29qgds8"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index 374331f3ac87..a46d7f9d9536 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = "http://cccc.sourceforge.net/"; + homepage = http://cccc.sourceforge.net/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.linquize ]; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index ee36a9be43b2..1ce0ca161536 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, why3 }: +, ltl2ba, coq, alt-ergo, why3, autoconf +}: let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; @@ -8,12 +9,12 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20161101"; - slang = "Silicon"; + version = "20170501"; + slang = "Phosphorus"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh"; + sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; }; why2 = fetchurl { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoconf makeWrapper ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff index 7ab2b32de1e7..737cad0cda4f 100644 --- a/pkgs/development/tools/analysis/frama-c/dynamic.diff +++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff @@ -1,12 +1,12 @@ --- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200 -@@ -287,7 +287,8 @@ - (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ; - let pkgs = ref [] in - List.iter (scan_directory pkgs) !load_path ; -- let findlib_path = String.concat ":" !load_path in -+ let findlib_path = String.concat ":" (!load_path @ -+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in - Klog.debug ~dkey "setting findlib path to %s" findlib_path; - Findlib.init ~env_ocamlpath:findlib_path (); - load_packages (List.rev !pkgs) ; +@@ -270,7 +270,8 @@ + load_path := + List.fold_right (add_dir ~user:true) path + (List.fold_right (add_dir ~user:false) Config.plugin_dir []); +- let findlib_path = String.concat ":" !load_path in ++ let findlib_path = String.concat ":" (!load_path @ ++ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in + Klog.debug ~dkey "setting findlib path to %s" findlib_path; + Findlib.init ~env_ocamlpath:findlib_path () + diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index c290aefe31b7..07e3a579d345 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; - homepage = "https://github.com/GarCoSim"; + homepage = https://github.com/GarCoSim; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 7a6f3481d53f..557fa8384746 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques."; - homepage = "https://github.com/GarCoSim"; + homepage = https://github.com/GarCoSim; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index ee9fbb111969..6544046b16d2 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { It takes a perf.data file, parses and evaluates its contents and then displays the result in a graphical way. ''; - homepage = "https://github.com/KDAB/hotspot"; + homepage = https://github.com/KDAB/hotspot; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ nh2 ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 0d4b55bb472a..1572fff40b9a 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, +{stdenv, fetchFromGitHub, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, @@ -10,17 +10,35 @@ assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; let - optional = stdenv.lib.optional; + inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.6.0"; name = "radare2-${version}"; - src = fetchurl { - url = "http://cloud.radare.org/get/${version}/${name}.tar.gz"; - sha256 = "bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e"; + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = version; + sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd"; }; + postPatch = let + cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile + capstone = fetchurl { + url = "https://github.com/aquynh/capstone/archive/${cs_ver}.tar.gz"; + sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; + }; + in '' + if ! grep -F "CS_VER=${cs_ver}" shlr/Makefile; then echo "CS_VER mismatch"; exit 1; fi + substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 + cp ${capstone} shlr/capstone-${cs_ver}.tar.gz + + # make compiler happy (fixed in upstream 2017-08-11) + substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \ + '(*info->fprintf_func) (info->stream, errmsg);' \ + '(*info->fprintf_func) (info->stream, "%s", errmsg);' + ''; buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] @@ -28,6 +46,13 @@ 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/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index e2cb2c85b625..f5c5c616979c 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; - homepage = "http://smatch.sourceforge.net/"; + homepage = http://smatch.sourceforge.net/; license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 91d4155d093d..a67d9b8d42e8 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = "http://spinroot.com/"; + homepage = http://spinroot.com/; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 4f87bcd1589e..555cb313a629 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"; - sha256 = "1a94jw0ml08xdwls1q9v5p1zak5qrbw2zyychnm5vch8znyws411"; + sha256 = "0l9jxa393a52iiawh93v31vr1y6z2bwg6dqhpivqd6y0vip1h7qz"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 1e84a05cc85b..6b9dd6393cb6 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://boomerang.sourceforge.net/"; + homepage = http://boomerang.sourceforge.net/; license = stdenv.lib.licenses.bsd3; description = "A general, open source, retargetable decompiler"; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index dcdc55f0aef3..989d8bc70031 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.5"; meta = with stdenv.lib; { - homepage = http://github.com/bazelbuild/bazel/; + homepage = https://github.com/bazelbuild/bazel/; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = [ maintainers.philandstuff ]; diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index 61f6a402cab7..200ec6429a79 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -23,7 +23,7 @@ in python3Packages.buildPythonApplication { checkPhase = "py.test"; meta = { - homepage = "http://pydoit.org/"; + homepage = http://pydoit.org/; description = "A task management & automation tool"; license = stdenv.lib.licenses.mit; longDescription = '' diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix deleted file mode 100644 index ad855df73534..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "gnumake-3.80"; - - src = fetchurl { - url = http://tarballs.nixos.org/make-3.80.tar.bz2; - sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; - }; - - patches = [./log.patch]; - - hardeningDisable = [ "format" ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch deleted file mode 100644 index fa90acfe8de5..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc make-3.80-orig/job.c make-3.80/job.c -*** make-3.80-orig/job.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/job.c 2004-04-02 17:38:04.000000000 +0200 -*************** -*** 987,993 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 987,993 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "\e[3s\e[a%s\e[b" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc make-3.80-orig/main.c make-3.80/main.c -*** make-3.80-orig/main.c 2002-08-10 03:27:17.000000000 +0200 ---- make-3.80/main.c 2004-04-02 17:42:50.000000000 +0200 -*************** -*** 254,259 **** ---- 254,263 ---- - they appear out of date or not. */ - - int always_make_flag = 0; -+ -+ int logNestingStdout = 0; -+ int logNestingStderr = 0; -+ - - /* The usage output. We write it this way to make life easier for the - translators, especially those trying to translate to right-to-left -*************** -*** 827,832 **** ---- 831,845 ---- - } - - -+ static void closeNesting() -+ { -+ while (logNestingStdout--) -+ printf("\e[q"); -+ while (logNestingStderr--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifndef _AMIGA - int - main (argc, argv, envp) -*************** -*** 854,859 **** ---- 867,874 ---- - no_default_sh_exe = 1; - #endif - -+ atexit(closeNesting); -+ - default_goal_file = 0; - reading_file = 0; - -*************** -*** 2782,2787 **** ---- 2797,2808 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering) -+ { -+ printf("\e[p"); -+ logNestingStdout++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 2810,2813 **** ---- 2831,2840 ---- - else - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); -+ -+ if (!entering) -+ { -+ printf("\e[q"); -+ logNestingStdout--; -+ } - } -diff -rc make-3.80-orig/make.h make-3.80/make.h -*** make-3.80-orig/make.h 2002-09-11 18:55:44.000000000 +0200 ---- make-3.80/make.h 2004-04-02 17:42:15.000000000 +0200 -*************** -*** 559,562 **** ---- 559,567 ---- - extern int atomic_stat PARAMS ((const char *file, struct stat *buf)); - extern struct dirent *atomic_readdir PARAMS ((DIR *dir)); - -+ - #endif -+ -+ -+ extern int logNestingStdout; -+ extern int logNestingStderr; -diff -rc make-3.80-orig/remake.c make-3.80/remake.c -*** make-3.80-orig/remake.c 2002-08-08 02:11:19.000000000 +0200 ---- make-3.80/remake.c 2004-04-04 23:10:19.000000000 +0200 -*************** -*** 1049,1055 **** ---- 1049,1059 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ logNestingStderr++; - execute_file_commands (file); -+ fprintf(stderr, "\e[q"); -+ logNestingStderr--; - return; - } - diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index ce5eff878ead..87897017f86a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation { patches = [ - # Provide nested log output for subsequent pretty-printing by - # nix-log2xml. - ./log.patch - # Purity: don't look for library dependencies (of the form # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. # Likewise, when searching for included Makefiles, don't look in diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch deleted file mode 100644 index e6197fd8e78f..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -rc job.c job.c -*** job.c 2006-03-20 04:03:04.000000000 +0100 ---- job.c 2009-01-19 19:37:28.000000000 +0100 -*************** -*** 1083,1089 **** - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? "%s" : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in ---- 1083,1089 ---- - appear. */ - - message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag)) -! ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p); - - /* Tell update_goal_chain that a command has been started on behalf of - this target. It is important that this happens here and not in -diff -rc main.c main.c -*** main.c 2006-03-20 03:36:37.000000000 +0100 ---- main.c 2009-01-19 19:41:41.000000000 +0100 -*************** -*** 886,891 **** ---- 886,900 ---- - } - - -+ static void close_nesting() -+ { -+ while (stdout_nesting_level--) -+ printf("\e[q"); -+ while (stderr_nesting_level--) -+ fprintf(stderr, "\e[q"); -+ } -+ -+ - #ifdef _AMIGA - int - main (int argc, char **argv) -*************** -*** 931,936 **** ---- 940,950 ---- - atexit (close_stdout); - #endif - -+ atexit(close_nesting); -+ -+ if (getenv("NIX_INDENT_MAKE")) -+ enable_nested_output = 1; -+ - /* Needed for OS/2 */ - initialize_main(&argc, &argv); - -*************** -*** 3095,3100 **** ---- 3109,3120 ---- - - /* Use entire sentences to give the translators a fighting chance. */ - -+ if (entering && enable_nested_output) -+ { -+ printf("\e[p"); -+ stdout_nesting_level++; -+ } -+ - if (makelevel == 0) - if (starting_directory == 0) - if (entering) -*************** -*** 3124,3129 **** ---- 3144,3159 ---- - printf (_("%s[%u]: Leaving directory `%s'\n"), - program, makelevel, starting_directory); - -+ if (!entering && enable_nested_output) -+ { -+ printf("\e[q"); -+ stdout_nesting_level--; -+ } -+ - /* Flush stdout to be sure this comes before any stderr output. */ - fflush (stdout); - } -+ -+ int enable_nested_output = 0; -+ int stdout_nesting_level = 0; -+ int stderr_nesting_level = 0; -diff -rc make.h -*** make.h 2006-02-16 00:54:43.000000000 +0100 ---- make.h 2009-01-19 19:32:03.000000000 +0100 -*************** -*** 609,611 **** ---- 609,614 ---- - - #define ENULLLOOP(_v,_c) do { errno = 0; (_v) = _c; } \ - while((_v)==0 && errno==EINTR) -+ extern int enable_nested_output; -+ extern int stdout_nesting_level; -+ extern int stderr_nesting_level; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2009-01-19 19:39:40.000000000 +0100 -*************** -*** 1120,1126 **** ---- 1120,1137 ---- - /* The normal case: start some commands. */ - if (!touch_flag || file->cmds->any_recurse) - { -+ if (enable_nested_output) -+ { -+ log_working_directory (1); -+ fprintf(stderr, "\e[pbuilding %s\n", file->name); -+ stderr_nesting_level++; -+ } - execute_file_commands (file); -+ if (enable_nested_output) -+ { -+ fprintf(stderr, "\e[q"); -+ stderr_nesting_level--; -+ } - return; - } - diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch deleted file mode 100644 index de7e4f615212..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixed default libpatttern on Darwin, imported from prefix overlay. -Got merged upstream: -https://savannah.gnu.org/bugs/?37197 ---- default.c.orig 2009-05-02 12:25:24 +0200 -+++ default.c 2009-05-02 12:25:58 +0200 -@@ -509,7 +509,11 @@ - #ifdef __MSDOS__ - ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", - #else -+#ifdef __APPLE__ -+ ".LIBPATTERNS", "lib%.dylib lib%.a", -+#else - ".LIBPATTERNS", "lib%.so lib%.a", -+#endif - #endif - #endif - diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix deleted file mode 100644 index a4128ac854c7..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{stdenv, fetchurl}: - -let version = "4.0"; in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"; - }; - - /* On Darwin, there are 3 test failures that haven't been investigated - yet. */ - doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; - - patches = - [ - # Purity: don't look for library dependencies (of the form - # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. - # Likewise, when searching for included Makefiles, don't look in - # /usr/include and friends. - ./impure-dirs.patch - - # a bunch of patches from Gentoo, mostly should be from upstream (unreleased) - ./darwin-library_search-dylib.patch - ]; - patchFlags = "-p0"; - - meta = { - description = "GNU Make, a program controlling the generation of non-source files from sources"; - - longDescription = - '' Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - homepage = http://www.gnu.org/software/make/; - - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix deleted file mode 100644 index 7c45a6c8e674..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl }: - -let - version = "4.1"; -in -stdenv.mkDerivation { - name = "gnumake-${version}"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"; - }; - - patchFlags = "-p0"; - patches = [ - # Purity: don't look for library dependencies (of the form `-lfoo') in /lib - # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for - # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs.patch - - # Don't segfault if we can't get a tty name. - ./no-tty-name.patch - ]; - - outputs = [ "out" "doc" ]; - - meta = { - homepage = http://www.gnu.org/software/make/; - description = "A tool to control the generation of non-source files from sources"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch deleted file mode 100644 index a84d7ab49d04..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Mon, 20 Oct 2014 05:54:56 +0000 -Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). - ---- -diff --git main.c main.c -index b2d169c..0cdb8a8 100644 ---- main.c -+++ main.c -@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) - #ifdef HAVE_ISATTY - if (isatty (fileno (stdout))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) -- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), -- o_default, 0)->export = v_export; -- -+ { -+ const char *tty = TTYNAME (fileno (stdout)); -+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - if (isatty (fileno (stderr))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) -- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), -- o_default, 0)->export = v_export; -+ { -+ const char *tty = TTYNAME (fileno (stderr)); -+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - #endif - - /* Reset in case the switches changed our minds. */ -diff --git makeint.h makeint.h -index 6223936..2009f41 100644 ---- makeint.h -+++ makeint.h -@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; - /* The number of bytes needed to represent the largest integer as a string. */ - #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") - -+#define DEFAULT_TTYNAME "true" - #ifdef HAVE_TTYNAME - # define TTYNAME(_f) ttyname (_f) - #else --# define TTYNAME(_f) "true" -+# define TTYNAME(_f) DEFAULT_TTYNAME - #endif - - --- -cgit v0.9.0.2 diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 323f33d7d6cc..56d4b831460a 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optional guileSupport "--with-guile"; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "info" ]; meta = with stdenv.lib; { homepage = http://www.gnu.org/software/make/; diff --git a/pkgs/development/tools/build-managers/gradle/2.5.nix b/pkgs/development/tools/build-managers/gradle/2.5.nix deleted file mode 100644 index b140a07609e4..000000000000 --- a/pkgs/development/tools/build-managers/gradle/2.5.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, unzip, jdk, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gradle-2.5"; - - src = fetchurl { - url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0mc5lf6phkncx77r0papzmfvyiqm0y26x50ipvmzkcsbn463x59z"; - }; - - installPhase = '' - mkdir -pv $out/gradle - cp -rv lib $out/gradle - - gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar) - test -f $gradle_launcher_jar - makeWrapper ${jdk}/bin/java $out/bin/gradle \ - --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" - ''; - - phases = "unpackPhase installPhase"; - - buildInputs = [ unzip jdk makeWrapper ]; - - meta = { - description = "Enterprise-grade build system"; - longDescription = '' - Gradle is a build system which offers you ease, power and freedom. - You can choose the balance for yourself. It has powerful multi-project - build support. It has a layer on top of Ivy that provides a - build-by-convention integration for Ivy. It gives you always the choice - between the flexibility of Ant and the convenience of a - build-by-convention behavior. - ''; - homepage = http://www.gradle.org/; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 24897232fbc8..45a4d8a8358b 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.0.1"; + name = "gradle-4.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp"; + sha256 = "0hzdz5cy5dmyqz73qy80q74aiy87jl5vnxcy3imahgaszffglpfm"; }; }; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index c0d152ee7a2f..7314643530e8 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc ]; + preConfigure = '' + unset AR + ''; + buildPhase = '' make jam0 ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 7b5dc2b79374..8a72847be772 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An experimental GNU make clone"; - homepage = "https://github.com/google/kati"; + homepage = https://github.com/google/kati; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 1e5fb8458e51..05bf8e76db73 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://leiningen.org/; + homepage = https://leiningen.org/; description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index d4dbc6b46d27..1855985f09f2 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.40.0"; + version = "0.41.2"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw"; + sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd"; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 1e37a3f85e24..8ce495557e7f 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,138 +4,37 @@ with stdenv.lib; with pythonPackages; let - # Get rid of this when pants 1.3.0 is released and make 0.5 the default - pathspec_0_3_4 = buildPythonApplication rec { - pname = "pathspec"; - version = "0.3.4"; - name = "${pname}-${version}"; + version = "1.3.0"; +in buildPythonApplication rec { + inherit version; + pname = "pantsbuild.pants"; + name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; - }; - - meta = { - description = "Utility library for gitignore-style pattern matching of file paths"; - homepage = "https://github.com/cpburnz/python-path-specification"; - license = licenses.mpl20; - maintainers = with maintainers; [ copumpkin ]; - }; + src = fetchPypi { + inherit pname version; + sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp"; }; - pants13-version = "1.3.0rc4"; - - # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use - # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have - # this downloader figure out the URL on the fly and then produce the deterministic result, so we - # can still be a fixed-output derivation. - pants13-native-engine-info = { - "x86_64-darwin" = { prefix = "mac/10.11"; hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; }; - "x86_64-linux" = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; }; - "i686-linux" = { prefix = "linux/i386"; hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; }; - }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!"); - - pants13-native-engine = runCommand "pants-native-${pants13-version}" { - buildInputs = [ curl ]; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = pants13-native-engine-info.hash; - } '' - native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version) - curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/native_engine.so" - - # Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now... - mkdir -p $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/ - - # These should behave the same way in Nix land and we try not to differentiate between OS revisions... - mkdir -p $out/bin/native-engine/mac/ - ln -s 10.11 $out/bin/native-engine/mac/10.10 - ln -s 10.11 $out/bin/native-engine/mac/10.12 - - cp native_engine.so $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/ + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py ''; -in { - pants = - pythonPackages.buildPythonPackage rec { - pname = "pantsbuild.pants"; - version = "1.2.1"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; - }; + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py - ''; + propagatedBuildInputs = [ + twitter-common-collections setproctitle setuptools six ansicolors + packaging pathspec scandir twitter-common-dirutil psutil requests + pystache pex docutils markdown pygments twitter-common-confluence + fasteners coverage pywatchman futures cffi + ]; - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = [ - ansicolors beautifulsoup4 cffi coverage docutils fasteners futures - isort lmdb markdown mock packaging pathspec_0_3_4 pep8 pex psutil pyflakes - pygments pystache pytestcov pytest pywatchman requests scandir - setproctitle setuptools six thrift wheel twitter-common-dirutil - twitter-common-confluence twitter-common-collections - ]; - - meta = { - description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; - }; - }; - - pants13-pre = buildPythonApplication rec { - pname = "pantsbuild.pants"; - version = pants13-version; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g"; - }; - - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - - substituteInPlace src/pants/option/global_options.py \ - --replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'" - ''; - - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = [ - twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec scandir twitter-common-dirutil psutil requests - pystache pex docutils markdown pygments twitter-common-confluence - fasteners coverage pywatchman futures cffi - ]; - - # Teach pants about where its native engine lives. - # TODO: there's probably a better way to teach it this without having it "download" - # from a local file: URL to its cache, but I don't know how and this seems to work. - postFixup = '' - mkdir -p $out/etc - cat >$out/etc/pantsrc < 1.10) + caliph (~> 0.3) + mattock (~> 0.9) + paint (~> 0.8) + rspec (>= 2.0, < 4) + simplecov (>= 0.5) + simplecov-json (~> 0.2) + diff-lcs (1.3) + docile (1.1.5) + json (2.1.0) + mattock (0.10.1) + calibrate (~> 0.0.1) + caliph (~> 0.3) + rake (~> 10.0) + tilt (> 0) + valise (~> 1.1) + paint (0.9.0) + rake (10.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.1) + simplecov-json (0.2) + json + simplecov + tilt (2.0.7) + valise (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + corundum (= 0.6.2) + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix new file mode 100644 index 000000000000..22d7b236ffa4 --- /dev/null +++ b/pkgs/development/tools/corundum/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "corundum"; + gemdir = ./.; + exes = [ "corundum-skel" ]; + + meta = with lib; { + description = "Tool and libraries for maintaining Ruby gems."; + homepage = https://github.com/nyarly/corundum; + license = licenses.mit; + maintainers = [ maintainers.nyarly ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/development/tools/corundum/gemset.nix new file mode 100644 index 000000000000..e395e098e6d1 --- /dev/null +++ b/pkgs/development/tools/corundum/gemset.nix @@ -0,0 +1,154 @@ +{ + calibrate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17kmlss7db70pjwdbbhag7mnixh8wasdq6n1v8663x50z9c7n2ng"; + type = "gem"; + }; + version = "0.0.1"; + }; + caliph = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d07n4m4yh1h9icq6n9dkw4jwgdmgd638f15mxr2pvqp4wycsnr"; + type = "gem"; + }; + version = "0.3.1"; + }; + corundum = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y6shjrqaqyh14a1r4ic660g6jnq4abdrx9imglyalzyrlrwbsxq"; + type = "gem"; + }; + version = "0.6.2"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + mattock = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02d6igwr4sfj4jnky8d5h0rm2cc665k1bqz7sj4khzvr18nk3ai6"; + type = "gem"; + }; + version = "0.10.1"; + }; + paint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fcn7cfrhbl4nl95fmcd67q33h7bl3iafsafs6w9yj4nqzagz1yc"; + type = "gem"; + }; + version = "0.9.0"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + type = "gem"; + }; + version = "10.5.0"; + }; + rspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-expectations = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-mocks = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb"; + type = "gem"; + }; + version = "3.6.0"; + }; + simplecov = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + type = "gem"; + }; + version = "0.14.1"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f3psphismgp6jp1fxxz09zbswh7m2xxxr6gqlzdh7sgv415clvm"; + type = "gem"; + }; + version = "0.10.1"; + }; + simplecov-json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x9hr08pkj5d14nfzsn5h8b7ayl6q0xir45dcx5rv2a7g10kzlpp"; + type = "gem"; + }; + version = "0.2"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + type = "gem"; + }; + version = "2.0.7"; + }; + valise = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5"; + type = "gem"; + }; + version = "1.2.1"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/cucumber/Gemfile b/pkgs/development/tools/cucumber/Gemfile new file mode 100644 index 000000000000..f738129eca4f --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cucumber' diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock new file mode 100644 index 000000000000..10c1235ae258 --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + builder (3.2.3) + cucumber (2.4.0) + builder (>= 2.1.2) + cucumber-core (~> 1.5.0) + cucumber-wire (~> 0.0.1) + diff-lcs (>= 1.1.3) + gherkin (~> 4.0) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) + cucumber-core (1.5.0) + gherkin (~> 4.0) + cucumber-wire (0.0.1) + diff-lcs (1.3) + gherkin (4.1.3) + multi_json (1.12.1) + multi_test (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + cucumber + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix new file mode 100644 index 000000000000..d4ca66c70d7a --- /dev/null +++ b/pkgs/development/tools/cucumber/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "cucumber-${version}"; + + version = (import gemset).cucumber.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A tool for executable specifications"; + homepage = https://cucumber.io/; + license = with licenses; mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix new file mode 100644 index 000000000000..07a80592ddaf --- /dev/null +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -0,0 +1,66 @@ +{ + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + cucumber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih"; + type = "gem"; + }; + version = "2.4.0"; + }; + cucumber-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr"; + type = "gem"; + }; + version = "1.5.0"; + }; + cucumber-wire = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f"; + type = "gem"; + }; + version = "0.0.1"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + gherkin = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79"; + type = "gem"; + }; + version = "4.1.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multi_test = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd"; + type = "gem"; + }; + version = "0.1.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index b49719ae0b96..11932965af49 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -35,6 +35,15 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib,sdk} mv ./* $out/ + # Clean up documentation. + mkdir -p $out/share/doc/${name} + mv $out/LICENSE.txt \ + $out/README.txt \ + $out/share/doc/${name} + + # Remove silly files. + rm $out/liquibase.bat $out/liquibase.spec + # we provide our own script rm $out/liquibase @@ -54,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Version Control for your database"; - homepage = "http://www.liquibase.org/"; + homepage = http://www.liquibase.org/; license = licenses.asl20; maintainers = with maintainers; [ nequissimus profpatsch ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 7057d87a6bdb..9f321ee33097 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { a reports interface, a complete data modeling solution, and a migration platform for moving your 3rd party databases to Oracle. ''; - homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; license = licenses.unfree; maintainers = [ maintainers.ardumont ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index a43d3928980e..6c40cd789106 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "DB Browser for SQLite"; - homepage = "http://sqlitebrowser.org/"; + homepage = http://sqlitebrowser.org/; license = licenses.gpl3; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; # can only test on linux diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 439e224c4550..95f992e490f4 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; - homepage = http://github.com/foo86/dcadec; + homepage = https://github.com/foo86/dcadec; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9fe9c46816af..06b6a0993bec 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "debugger for the Go programming language"; - homepage = "https://github.com/derekparker/delve"; + homepage = https://github.com/derekparker/delve; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 37517f306e82..a28e4a32168d 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = { description = "A command line tool for DigitalOcean services"; - homepage = "https://github.com/digitalocean/doctl"; + homepage = https://github.com/digitalocean/doctl; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.siddharthist ]; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index bf9fb4f30352..c803de9e0247 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = "http://doxygen.org/"; + homepage = http://doxygen.org/; description = "Source code documentation generator tool"; longDescription = '' diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b46b0be748ad..506684088343 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.gtk.org/gtk-doc; + homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix new file mode 100644 index 000000000000..28d0c57f2e3b --- /dev/null +++ b/pkgs/development/tools/dtools/default.nix @@ -0,0 +1,54 @@ +{stdenv, lib, fetchFromGitHub, dmd, curl}: + +stdenv.mkDerivation rec { + name = "dtools-${version}"; + version = "2.075.1"; + + src = fetchFromGitHub { + owner = "dlang"; + repo = "tools"; + rev = "v${version}"; + sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d"; + }; + + postPatch = '' + substituteInPlace posix.mak \ + --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd + + substituteInPlace posix.mak \ + --replace gcc $CC + ''; + + nativeBuildInputs = [ dmd ]; + buildInputs = [ curl ]; + + buildPhase = '' + make -f posix.mak DMD=${dmd.out}/bin/dmd INSTALL_DIR=$out + ''; + + 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 + ''; + + 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 \\;" + } + ''; + + meta = { + description = "Ancillary tools for the D programming language compiler"; + homepage = https://github.com/dlang/tools; + license = lib.licenses.boost; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index fc2651b91574..74884e6f5a8a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.6.6"; + version = "1.7.5"; name = "electron-${version}"; meta = with stdenv.lib; { @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102"; + sha256 = "1z1dzk6d2mfyms8lj8g6jn76m52izbd1d7c05k8h88m1syfsgav5"; name = "${name}.zip"; }; @@ -45,7 +45,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64"; + sha256 = "1d3c3y5j99wbyxlzk1nkry0m1xgxy3mi4a6irvlgyxl729dnwi97"; name = "${name}.zip"; }; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index b9682bead7d1..fb84bbbf1df3 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A concolic testing tool for the Erlang functional programming language"; license = stdenv.lib.licenses.gpl3; - homepage = "https://github.com/aggelgian/cuter"; + homepage = https://github.com/aggelgian/cuter; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index 8b2bee8ad4fc..7d505b20a05f 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -31,7 +31,7 @@ meta = { description = "Executable command for Relx"; license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erlware/relx"; + homepage = https://github.com/erlware/relx; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 51bdf772adbb..a351c325ea24 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "FlameGraph-2017-05-11"; + name = "FlameGraph-2017-07-01"; src = fetchFromGitHub { owner = "brendangregg"; repo = "FlameGraph"; - rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247"; - sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2"; + rev = "a93d905911c07c96a73b35ddbcb5ddb2f39da4b6"; + sha256 = "07z2ffnab41dz833wwgr875vjccqyh0238357g7ml1yg5445x2jy"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix new file mode 100644 index 000000000000..6233b9c6bdb4 --- /dev/null +++ b/pkgs/development/tools/flyway/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, jre_headless, makeWrapper }: + let + version = "4.2.0"; + in + stdenv.mkDerivation { + name = "flyway-${version}"; + src = fetchurl { + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz"; + sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661"; + }; + buildInputs = [ makeWrapper ]; + dontBuild = true; + dontStrip = true; + installPhase = '' + mkdir -p $out/bin $out/share/flyway + cp -r sql jars lib drivers $out/share/flyway + makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ + --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ + --add-flags "-cp '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ + --add-flags "org.flywaydb.commandline.Main" + ''; + meta = with stdenv.lib; { + description = "Evolve your Database Schema easily and reliably across all your instances"; + homepage = "https://flywaydb.org/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = maintainers.cmcdragonkai; + }; + } diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index ded0aaa92424..f6fe24cc281f 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ]; meta = with stdenv.lib; { - homepage = "http://the-brannons.com/software/cligh.html"; + homepage = http://the-brannons.com/software/cligh.html; description = "A simple command-line interface to the facilities of Github"; longDescription = '' Cligh is a simple command-line interface to the facilities of GitHub. diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix new file mode 100644 index 000000000000..1cca6a096fe6 --- /dev/null +++ b/pkgs/development/tools/glslviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage, + libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi, + libX11, mesa_glu }: + +stdenv.mkDerivation rec { + name = "glslviewer-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "patriciogonzalezvivo"; + repo = "glslViewer"; + rev = version; + sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + }; + + # Makefile has /usr/local/bin hard-coded for 'make install' + preConfigure = '' + sed s,/usr/local,$out, -i Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 ]; + + meta = with stdenv.lib; { + description = "Live GLSL coding renderer"; + homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.hodapp ]; + }; +} diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index e6a317a2f883..f11bb83a74ab 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "mkdir -p $out; mv * $out/"; meta = { - homepage = "http://www.gnu.org/software/gnulib/"; + homepage = http://www.gnu.org/software/gnulib/; description = "Central location for code to be shared among GNU packages"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 5ec93462dec2..fe6bfc711e63 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -2,14 +2,19 @@ buildGoPackage rec { name = "gocode-${version}"; - version = "20170219-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc"; - + version = "20170530-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + goPackagePath = "github.com/nsf/gocode"; + # we must allow references to the original `go` package, + # because `gocode` needs to dig into $GOROOT to provide completions for the + # standard packages. + allowGoReference = true; + src = fetchgit { inherit rev; url = "https://github.com/nsf/gocode"; - sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; } diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 837da4a09dc9..fdb53dd288f0 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "Print where symbols are defined in Go source code"; - homepage = "https://github.com/rogpeppe/godef/"; + homepage = https://github.com/rogpeppe/godef/; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 62bf6557f68c..d9171ca09f2b 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://godotengine.org"; + homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; 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 e6f36b6e32eb..2041491cf80d 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google App Engine SDK for Go"; version = version; - homepage = "https://cloud.google.com/appengine/docs/go/"; + homepage = https://cloud.google.com/appengine/docs/go/; license = licenses.asl20; platforms = ["x86_64-linux" "x86_64-darwin"]; maintainers = with maintainers; [ lufia ]; diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 6a16a0372c1e..833b41ae985b 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "a helper script that creates application bundles form GTK+ executables for Mac OS X"; + description = "a helper script that creates application bundles form GTK+ executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling; diff --git a/pkgs/development/tools/haskell/haste/haste-Cabal.nix b/pkgs/development/tools/haskell/haste/haste-Cabal.nix deleted file mode 100644 index 45a60172e395..000000000000 --- a/pkgs/development/tools/haskell/haste/haste-Cabal.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Haste requires its own patched up version of Cabal that's not on hackage -{ mkDerivation, array, base, binary, bytestring, containers -, deepseq, directory, extensible-exceptions, filepath, old-time -, pretty, process, QuickCheck, regex-posix, stdenv, tasty -, tasty-hunit, tasty-quickcheck, time, unix -, fetchFromGitHub -}: - -mkDerivation { - pname = "Cabal"; - version = "1.23.0.0"; - src = fetchFromGitHub { - owner = "valderman"; - repo = "cabal"; - rev = "a1962987ba32d5e20090830f50c6afdc78dae005"; - sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh"; - }; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - pretty process time unix - ]; - testHaskellDepends = [ - base bytestring containers directory extensible-exceptions filepath - old-time pretty process QuickCheck regex-posix tasty tasty-hunit - tasty-quickcheck unix - ]; - prePatch = '' - rm -rf cabal-install - cd Cabal - ''; - doCheck = false; - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix b/pkgs/development/tools/haskell/haste/haste-cabal-install.nix deleted file mode 100644 index dd140409173e..000000000000 --- a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix +++ /dev/null @@ -1,46 +0,0 @@ -# Haste requires its own patched up version of cabal-install that's not on hackage -{ mkDerivation, array, base, bytestring, Cabal, containers -, directory, extensible-exceptions, filepath, HTTP, mtl, network -, network-uri, pretty, process, QuickCheck, random, regex-posix -, stdenv, stm, tagged, tasty, tasty-hunit, tasty-quickcheck, time -, unix, zlib -, fetchFromGitHub -}: - -mkDerivation { - pname = "cabal-install"; - version = "1.23.0.0"; - src = fetchFromGitHub { - owner = "valderman"; - repo = "cabal"; - rev = "a1962987ba32d5e20090830f50c6afdc78dae005"; - sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring Cabal containers directory filepath HTTP mtl - network network-uri pretty process random stm time unix zlib - ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory - extensible-exceptions filepath HTTP mtl network network-uri pretty - process QuickCheck random regex-posix stm tagged tasty tasty-hunit - tasty-quickcheck time unix zlib - ]; - prePatch = '' - rm -rf Cabal - cd cabal-install - ''; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - - # Manually added by Nix maintainer - mv -v $out/etc/bash_completion.d/cabal $out/etc/bash_completion.d/haste-cabal - ''; - doCheck = false; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/tools/haskell/haste/haste-compiler.nix b/pkgs/development/tools/haskell/haste/haste-compiler.nix deleted file mode 100644 index f9aa5abae574..000000000000 --- a/pkgs/development/tools/haskell/haste/haste-compiler.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ mkDerivation -, overrideCabal -, super-haste-compiler -}: - -overrideCabal super-haste-compiler (drv: { - configureFlags = [ "-f-portable" ]; - prePatch = '' - # Get ghc libdir by invoking ghc and point to haste-cabal binary - substituteInPlace src/Haste/Environment.hs \ - --replace \ - 'hasteGhcLibDir = hasteSysDir' \ - 'hasteGhcLibDir = head $ lines $ either (error . show) id $ unsafePerformIO $ shell $ run "ghc" ["--print-libdir"] ""' \ - --replace \ - 'hasteCabalBinary = hasteBinDir "haste-cabal" ++ binaryExt' \ - 'hasteCabalBinary = "haste-cabal" ++ binaryExt' - - # Don't try to download/install haste-cabal in haste-boot: - patch src/haste-boot.hs << EOF - @@ -178,10 +178,6 @@ - pkgSysLibDir, jsmodSysDir, pkgSysDir] - - mkdir True (hasteCabalRootDir portableHaste) - - case getHasteCabal cfg of - - Download -> installHasteCabal portableHaste tmpdir - - Prebuilt fp -> copyHasteCabal portableHaste fp - - Source mdir -> buildHasteCabal portableHaste (maybe "../cabal" id mdir) - - -- Spawn off closure download in the background. - dir <- pwd -- use absolute path for closure to avoid dir changing race - EOF - ''; -}) diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix index 7e82518c9b6b..a7ea5b9d5770 100644 --- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix +++ b/pkgs/development/tools/haskell/intero-nix-shim/default.nix @@ -22,6 +22,6 @@ mkDerivation { ln -s ${cabal-install}/bin/cabal $out/libexec ln -s ${intero }/bin/intero $out/libexec ''; - homepage = "https://github.com/michalrus/intero-nix-shim"; + homepage = https://github.com/michalrus/intero-nix-shim; license = stdenv.lib.licenses.asl20; } diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 85d4bfc93b6a..7282fb4970ee 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null @@ -25,7 +25,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in haskell-lib.overrideCabal haskellPackages.lambdabot (self: { +in haskellLib.overrideCabal haskellPackages.lambdabot (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' substituteInPlace src/Main.hs \ diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 81707a6bfc3e..90c9126c2b94 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2017-05-24"; + version = "git-2017-07-27"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "c1dcbcbcd3eadcc63adeac65d63497885b422a44"; - sha256 = "12xss8wgsqs2fghrfl4h6g5wli6wn274zmdsq5zdcib2m7da5yw2"; + rev = "f21804164cf646d682d7da668a625cdbd8baf05a"; + sha256 = "07l3qzlc2hl7g5wbgqh8ld8ynl004i6m7p903667gbhs7sw03nbl"; }; installPhase = '' @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generate .travis.yml for multiple ghc versions"; - homepage = "https://github.com/hvr/multi-ghc-travis"; + homepage = https://github.com/hvr/multi-ghc-travis; license = licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 peti ]; }; } diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 6334bb2e5ddf..9c5cbb1aa285 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -36,11 +36,12 @@ in stdenv.mkDerivation rec { version = "3.43.16"; meta = { - homepage = "https://toolbelt.heroku.com"; + homepage = https://toolbelt.heroku.com; description = "Everything you need to get started using Heroku"; maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ]; license = licenses.mit; platforms = with platforms; unix; + broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447 }; binPath = lib.makeBinPath [ postgresql ruby ]; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index ac5495b98d90..0dcb74b803d2 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "The server part of irony."; homepage = "https://melpa.org/#/irony"; maintainers = [ stdenv.lib.maintainers.deepfire ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 29d2f13ca9a8..a71ee53dced9 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,23 +1,36 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }: +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - name = "visualvm-1.3.8"; + name = "visualvm-1.3.9"; src = fetchzip { - url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip"; - sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y"; + url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip"; + sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' rm bin/visualvm.exe + rm platform/lib/nbexec64.exe + rm platform/lib/nbexec.exe + rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll + rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll + rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll + rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll + rm platform/modules/lib/amd64/jnidispatch-410.dll + rm platform/modules/lib/x86/jnidispatch-410.dll + rm platform/lib/nbexec.dll + rm platform/lib/nbexec64.dll substituteInPlace etc/visualvm.conf \ --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ --replace "/path/to/jdk" "${jdk.home}" \ --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true ' + substituteInPlace platform/lib/nbexec \ + --replace /usr/bin/\''${awk} ${gawk}/bin/awk + cp -r . $out # To get the native LAF, JVM needs to see GTK’s .so-s. diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index aafb5f541443..dd0379e83a7c 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A JMESPath implementation in Go"; - homepage = "https://github.com/jmespath/go-jmespath"; + homepage = https://github.com/jmespath/go-jmespath; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index 2cae6a7fcc87..d46f7b3e8833 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A command line interface to the JMESPath expression language for JSON"; - homepage = "https://github.com/jmespath/jp"; + homepage = https://github.com/jmespath/jp; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index ecc690ead059..261d16367d40 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A pair programming tool and library written in Golang"; - homepage = "https://github.com/jeffail/leaps/"; + homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; meta.platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index cd9bf94b904a..00c2663e3a46 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { # meta is all the information about the package.. meta = with stdenv.lib; { - homepage = "http://www.minizinc.org/"; + homepage = http://www.minizinc.org/; description = "MiniZinc is a medium-level constraint modelling language."; longDescription = '' diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index fb1e4a8ca4b5..9aea35104320 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { installFlags = "INSTALL=install prefix=$$out"; meta = { - homepage = "http://astyle.sourceforge.net/"; + homepage = http://astyle.sourceforge.net/; description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix deleted file mode 100644 index 34bffff23d4a..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.12.6"; - - # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is - # available upstream; see - # . - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # This test succeeds on my machine, but fails on Hydra (for reasons - # not yet understood). - patchPhase = '' - sed -i -e 's|t/aclocal7.sh||' Makefile.in - ''; - - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.12"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix deleted file mode 100644 index 77fe2b7b92c2..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.13.4"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.13"; - homepage = "http://www.gnu.org/software/automake/"; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix deleted file mode 100644 index fd074e6b96c8..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.14.1"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.14"; - homepage = "http://www.gnu.org/software/automake/"; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 3c4a8d1189e4..d6399e128a39 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.15"; + name = "automake-1.15.1"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"; + sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg"; }; buildInputs = [ perl autoconf ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.15"; - homepage = "http://www.gnu.org/software/automake/"; + homepage = http://www.gnu.org/software/automake/; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index e6c7dcbd3624..c2bf7e0a831c 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; meta = with stdenv.lib; { - homepage = http://techbase.kde.org/Development/Tools/Automoc4; + homepage = https://techbase.kde.org/Development/Tools/Automoc4; description = "KDE Meta Object Compiler"; license = licenses.bsd2; maintainers = [ maintainers.sander ]; diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index eb81b7136f3d..77cb86766692 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2; description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol"; - homepage = http://sourceforge.net/projects/avarice/files/avarice/; + homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ae58c72b786d..e02cf1667cdf 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -5,7 +5,10 @@ }: let - version = "2.28"; + # Note to whoever is upgrading this: 2.29 is broken. + # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64) + # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a. + version = "2.28.1"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; # The prefix prepended to binary names to allow multiple binuntils on the @@ -18,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2"; + sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"; }; patches = [ @@ -47,7 +50,6 @@ stdenv.mkDerivation rec { ./no-plugins.patch ]; - # TODO: all outputs on all platform outputs = [ "out" ] ++ optional (targetPlatform == hostPlatform && !hostPlatform.isDarwin) "lib" # problems in Darwin stdenv ++ [ "info" ] @@ -82,7 +84,7 @@ stdenv.mkDerivation rec { else "-static-libgcc"; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ]; configureFlags = [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ] ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop" diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 2cc8e640631a..51610349c45e 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://sourceforge.net/projects/cbrowser/; + homepage = https://sourceforge.net/projects/cbrowser/; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 765fdfb2ea45..65c7e633f8e2 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; @@ -32,18 +32,16 @@ let ccache = stdenv.mkDerivation rec { isGNU = unwrappedCC.isGNU or false; }; inherit (unwrappedCC) lib; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin wrap() { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then - cat > $out/bin/$cname << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@" - EOF - chmod +x $out/bin/$cname + makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ + --run ${stdenv.lib.escapeShellArg extraConfig} \ + --add-flags ${unwrappedCC}/bin/$cname fi } diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 563d76930880..2564b42731b3 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/checkbaskisms/; + homepage = https://sourceforge.net/projects/checkbaskisms/; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index c8378e06df6d..37ec63627b15 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C program reducer"; - homepage = "https://embed.cs.utah.edu/creduce"; + homepage = https://embed.cs.utah.edu/creduce; # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING license = licenses.ncsa; longDescription = '' diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 20d149f3efe0..9a8c24fa1685 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { --replace '../compiler_test.pl' $out/bin/compiler_test.pl \ --replace '../$CONFIG_FILE' '$CONFIG_FILE' - wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl + wrapProgram $out/bin/launchn.pl \ + --prefix PERL5LIB : "$PERL5LIB" mkdir -p $out/share/csmith mv $out/bin/compiler_test.in $out/share/csmith/ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A random generator of C programs"; - homepage = "https://embed.cs.utah.edu/csmith"; + homepage = https://embed.cs.utah.edu/csmith; # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING license = licenses.bsd2; longDescription = '' diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 32e212a09214..17ef66470505 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -71,7 +71,7 @@ let meta = { description = "A fast, free distributed C/C++ compiler"; - homepage = "http://distcc.org"; + homepage = http://distcc.org; license = "GPL"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index e7c6b108cdda..f9a640d47038 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line shell and Unix scripting interface for Drupal"; - homepage = http://github.com/drush-ops/drush; + homepage = https://github.com/drush-ops/drush; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 30cbc0daab9a..a6de652f9005 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib dbus dbus_glib ]; meta = { - homepage = http://hal.freedesktop.org/releases/; + homepage = https://hal.freedesktop.org/releases/; description = "D-Bus bindings for GObject"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 603f8c0bef60..905fa0d40935 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; + homepage = http://www.muppetlabs.com/~breadbox/software/elfkickers.html; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch new file mode 100644 index 000000000000..409f1311c315 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch @@ -0,0 +1,27 @@ +Look up .build-id files relative to the directories in the +colon-separated environment variable NIX_DEBUG_INFO_DIRS, unless +overriden by --debuginfo-path. + +diff -ru elfutils-0.169-orig/libdwfl/argp-std.c elfutils-0.169/libdwfl/argp-std.c +--- elfutils-0.169-orig/libdwfl/argp-std.c 2017-05-02 23:05:52.000000000 +0200 ++++ elfutils-0.169/libdwfl/argp-std.c 2017-07-28 16:08:06.739558106 +0200 +@@ -376,5 +376,7 @@ + const struct argp * + dwfl_standard_argp (void) + { ++ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS"); ++ + return &libdwfl_argp; + } +diff -ru elfutils-0.169-orig/src/stack.c elfutils-0.169/src/stack.c +--- elfutils-0.169-orig/src/stack.c 2017-02-24 11:55:28.000000000 +0100 ++++ elfutils-0.169/src/stack.c 2017-07-28 15:50:06.743196696 +0200 +@@ -631,6 +631,8 @@ + /* Set locale. */ + (void) setlocale (LC_ALL, ""); + ++ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS"); ++ + const struct argp_option options[] = + { + { NULL, 0, NULL, 0, N_("Input selection options:"), 0 }, diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 6e80f0907bc6..591e263205c8 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz }: +{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.168"; + version = "0.169"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; - sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq"; + sha256 = "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll"; }; + patches = ./debug-info-from-env.patch; + hardeningDisable = [ "format" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, @@ -17,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; buildInputs = [ zlib bzip2 xz ]; + propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; + configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch new file mode 100644 index 000000000000..ad6dca6749e4 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch @@ -0,0 +1,81 @@ +Look up .build-id files relative to the directories in the +colon-separated environment variable NIX_DEBUG_INFO_DIRS, in addition +to the existing debug-file-directory setting. + +diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/build-id.c gdb-8.0/gdb/build-id.c +--- gdb-8.0-orig/gdb/build-id.c 2017-06-04 17:51:26.000000000 +0200 ++++ gdb-8.0/gdb/build-id.c 2017-07-28 13:18:10.797375927 +0200 +@@ -67,8 +67,8 @@ + + /* See build-id.h. */ + +-gdb_bfd_ref_ptr +-build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id) ++static gdb_bfd_ref_ptr ++build_id_to_debug_bfd_in (const char *directories, size_t build_id_len, const bfd_byte *build_id) + { + char *link, *debugdir; + VEC (char_ptr) *debugdir_vec; +@@ -78,7 +78,7 @@ + int alloc_len; + + /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ +- alloc_len = (strlen (debug_file_directory) ++ alloc_len = (strlen (directories) + + (sizeof "/.build-id/" - 1) + 1 + + 2 * build_id_len + (sizeof ".debug" - 1) + 1); + link = (char *) alloca (alloc_len); +@@ -86,7 +86,7 @@ + /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will + cause "/.build-id/..." lookups. */ + +- debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory); ++ debugdir_vec = dirnames_to_char_ptr_vec (directories); + back_to = make_cleanup_free_char_ptr_vec (debugdir_vec); + + for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix) +@@ -137,6 +137,30 @@ + return abfd; + } + ++gdb_bfd_ref_ptr ++build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id) ++{ ++ gdb_bfd_ref_ptr abfd = build_id_to_debug_bfd_in(debug_file_directory, build_id_len, build_id); ++ ++ if (abfd != NULL) ++ return abfd; ++ ++ static int init = 0; ++ static char *env_var; ++ if (!init) ++ { ++ env_var = getenv("NIX_DEBUG_INFO_DIRS"); ++ init = 1; ++ } ++ ++ if (env_var) ++ { ++ abfd = build_id_to_debug_bfd_in(env_var, build_id_len, build_id); ++ } ++ ++ return abfd; ++} ++ + /* See build-id.h. */ + + char * +diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/symfile.c gdb-8.0/gdb/symfile.c +--- gdb-8.0-orig/gdb/symfile.c 2017-06-04 17:51:27.000000000 +0200 ++++ gdb-8.0/gdb/symfile.c 2017-07-28 12:54:05.401586174 +0200 +@@ -1415,8 +1415,8 @@ + struct cmd_list_element *c, const char *value) + { + fprintf_filtered (file, +- _("The directory where separate debug " +- "symbols are searched for is \"%s\".\n"), ++ _("The directories where separate debug " ++ "symbols are searched for are \"%s\".\n"), + value); + } + diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 78dd4a1e3f55..02ff52155b1c 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,6 +11,8 @@ # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null + +, setupDebugInfoDirs }: let @@ -32,7 +34,9 @@ stdenv.mkDerivation rec { sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn"; }; - nativeBuildInputs = [ pkgconfig texinfo perl ] + patches = [ ./debug-info-from-env.patch ]; + + nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] # TODO(@Ericson2314) not sure if should be host or target ++ stdenv.lib.optional targetPlatform.isHurd mig; @@ -41,6 +45,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional targetPlatform.isHurd hurd ++ stdenv.lib.optional doCheck dejagnu; + propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; + enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 24f099a15337..9e2f35875583 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = "http://gede.acidron.com"; + homepage = http://gede.acidron.com; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos ]; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index fbbd6cc4d6f8..33ea78907468 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, hostPlatform, fetchurl }: stdenv.mkDerivation rec { name = "gnum4-1.4.18"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-syscmd-shell=${stdenv.shell}"; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ]; + patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index fe1bb771fcad..128ce6008fa8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-06-22"; + version = "2017-07-27"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "803833aba77e1082c14857aa26933fc7fe5ae190"; - sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs"; + rev = "3fc320db320c9aa5180c54e77513f1bcb7407079"; + sha256 = "0kml2rvy5pz8pzl23vfib5vrwxccff9j1jmyq926qv7f5kbzy61b"; }; buildInputs = diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index d1aef990230b..ed3f1b46947d 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoconf, automake }: +, procps, autoreconfHook, utilmacros }: stdenv.mkDerivation rec { name = "intel-gpu-tools-1.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754"; }; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps ]; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 3c5dacb6f65e..cb64bd602b79 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co"; + + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = http://launchpad.net/intltool/; + homepage = https://launchpad.net/intltool/; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 71e21d31bb7a..69a19987020d 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y"; - "i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9"; - "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl"; + "x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb"; + "i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp"; + "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index bd85f6140288..fc1ac9323387 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -11,13 +11,13 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; - "i686-linux" = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf"; - "x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9"; + "x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0"; + "i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y"; + "x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.6.0"; + version = "4.6.5"; src = fetchurl { url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index adc5ba967583..af792c0c6b96 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -15,7 +15,7 @@ python2.pkgs.buildPythonApplication rec { meta = { description = "Portable tool for executing LLVM and Clang style test suites"; - homepage = "http://llvm.org/docs/CommandGuide/lit.html"; + homepage = http://llvm.org/docs/CommandGuide/lit.html; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 8994d0c3512b..3b294d137574 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liburcu }: +{ stdenv, fetchurl, liburcu, python }: # NOTE: # ./configure ... @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq"; }; - buildInputs = [ liburcu ]; + buildInputs = [ liburcu python ]; + + preConfigure = '' + patchShebangs . + ''; meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 08631fd0352b..9cd1a56e68fe 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -28,7 +28,7 @@ buildPerlPackage rec { meta = with stdenv.lib; { description = "A sentence based license detector"; - homepage = "http://ninka.turingmachine.org/"; + homepage = http://ninka.turingmachine.org/; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 807b2a9a49db..787b434df3ce 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; # problems when loading libc.so.6 meta = { - homepage = http://nixos.org/patchelf.html; + homepage = https://nixos.org/patchelf.html; license = "GPL"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 5f434c13abc6..2443c2804435 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://nixos.org/patchelf.html; + homepage = https://nixos.org/patchelf.html; license = "GPL"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index 6eb13bb242da..1e85e87c5378 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = "https://github.com/nickjj/rolespec"; + homepage = https://github.com/nickjj/rolespec; description = "A test library for testing Ansible roles"; longDescription = '' A shell based test library for Ansible that works both locally and over diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index 9d0e2d7430e8..94a452ce0836 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://srecord.sourceforge.net/; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 549872646cb0..2dad1c596ab7 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.17"; + version = "4.18"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "06bl4dld5fk4a3iiq4pyrkm6sh63599ah8dmds0glg5vbw45pww1"; + sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 2a6b6880183a..9b4fd05dc0a0 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "swig-${version}"; - version = "3.0.10"; + version = "3.0.12"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "049rj883r9mf2bgabj3b03p7cnmqgl5939lmh8v5nnia24zb51jg"; + sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; }; nativeBuildInputs = [ autoconf automake libtool bison ]; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index db86f1a56d6e..7b360655c4f7 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { name = "teensy-loader-cli-${version}"; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; - rev = "001da416bc362ff24485ff97e3a729bd921afe98"; - sha256 = "36aed0a725055e36d71183ff57a023993099fdc380072177cffc7676da3c3966"; + rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; + sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; }; buildInputs = [ unzip libusb ]; diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index d01a2f9cdd06..571af764fcf7 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = { - homepage = "http://www.gnu.org/software/texinfo/"; + homepage = http://www.gnu.org/software/texinfo/; description = "The GNU documentation system"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/texinfo/6.3.nix b/pkgs/development/tools/misc/texinfo/6.3.nix index b75878b8d332..704611e315a3 100644 --- a/pkgs/development/tools/misc/texinfo/6.3.nix +++ b/pkgs/development/tools/misc/texinfo/6.3.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; meta = with stdenv.lib; { - homepage = "http://www.gnu.org/software/texinfo/"; + homepage = http://www.gnu.org/software/texinfo/; description = "The GNU documentation system"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 19dd907b73b9..8fc268423505 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://dotat.at/prog/unifdef/"; + homepage = http://dotat.at/prog/unifdef/; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 903359f5c762..b0d5bcd28f79 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A maintained ctags implementation"; - homepage = "https://ctags.io/"; + homepage = https://ctags.io/; license = licenses.gpl2Plus; platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix new file mode 100644 index 000000000000..b44e52aa2bf5 --- /dev/null +++ b/pkgs/development/tools/mpfshell/default.nix @@ -0,0 +1,23 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonPackage rec { + name = "mpfshell-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "wendlers"; + repo = "mpfshell"; + rev = version; + sha256 = "1n4ap4yfii54y125f9n9krc0lc0drwg3hsq4z6g89xbswdx9sygr"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyserial colorama websocket_client + ]; + + meta = with lib; { + homepage = https://github.com/wendlers/mpfshell; + description = "A simple shell based file explorer for ESP8266 Micropython based devices"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index eb6e50840a5b..a68b29dee248 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, python35Packages }: -python35Packages.buildPythonApplication rec { - name = "mypy-${version}"; - version = "0.501"; +{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }: + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "mypy"; + version = "0.511"; # Tests not included in pip package. doCheck = false; - src = fetchurl { - url = "mirror://pypi/m/mypy/${name}.tar.gz"; - sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h"; + src = fetchPypi { + inherit pname version; + sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z"; }; - propagatedBuildInputs = with python35Packages; [ lxml typed-ast ]; + propagatedBuildInputs = [ lxml typed-ast ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; homepage = "http://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 30c40331a0f9..8e2953839b71 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = http://nwjs.io/; + homepage = https://nwjs.io/; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index f1bf5e33a617..db34450a7a6e 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, opam }: stdenv.mkDerivation { - name = "jbuilder-1.0+beta7"; + name = "jbuilder-1.0+beta12"; src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz; - sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8"; + url = http://github.com/janestreet/jbuilder/archive/1.0+beta12.tar.gz; + sha256 = "1gqpp1spcya9951mw2kcavam8v0m5s6zc5pjb7bkv5d71si04rlf"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix new file mode 100644 index 000000000000..11df26818c1f --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder +, cmdliner, cppo, yojson +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "js_of_ocaml-compiler-${version}"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "js_of_ocaml"; + rev = version; + sha256 = "17w1pqjk521jd4yp34miyif0cxjxchnw59xhj188qfl635ykb4k8"; + }; + + buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; + + propagatedBuildInputs = [ yojson ]; + + buildPhase = "jbuilder build -p js_of_ocaml-compiler"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Compiler from OCaml bytecode to Javascript"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 6f0d71d76b18..4680785ac7c2 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; - homepage = "http://the-lambda-church.github.io/merlin/"; + homepage = http://the-lambda-church.github.io/merlin/; license = licenses.mit; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix new file mode 100644 index 000000000000..1ec0fef49d38 --- /dev/null +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, ocamlPackages }: + +stdenv.mkDerivation rec { + name = "obelisk-${version}"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "Lelio-Brun"; + repo = "Obelisk"; + rev = "v${version}"; + sha256 = "0kbadib53x7mzqri9asd8fmhl4xfgk4ajgzd7rlq3irf2j3bmcqp"; + }; + + buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; + + installFlags = [ "BINDIR=$(out)/bin" ]; + + meta = { + description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e194a77fbe81..e9331d078cf3 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchzip, ncurses , ocamlPackages -, opam }: +, jbuilder }: stdenv.mkDerivation { - name = "ocaml-top-1.1.3"; + name = "ocaml-top-1.1.4"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz; - sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3"; + url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz; + sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j"; }; - buildInputs = [ ncurses opam ] + buildInputs = [ ncurses jbuilder ] ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); configurePhase = '' @@ -17,9 +17,9 @@ stdenv.mkDerivation { ocp-build -init ''; - buildPhase = "ocp-build ocaml-top"; + buildPhase = "jbuilder build"; - installPhase = "opam-installer --prefix=$out"; + inherit (jbuilder) installPhase; meta = { homepage = http://www.typerex.org/ocaml-top.html; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 931e6989aa10..2a9a634d0a4a 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: let - version = "1.99.18-beta"; + version = "1.99.19-beta"; in buildOcaml { @@ -11,7 +11,7 @@ buildOcaml { owner = "OCamlPro"; repo = "ocp-build"; rev = version; - sha256 = "14vzam8p1d2c5qxljrhsfppd8a3j9lxx8kzxlplwclkr2laar0ss"; + sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index ee70a80b6af5..bdc75766bbf7 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = http://typerex.ocamlpro.com/ocp-indent.html; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 500002bed444..f96b7888db0f 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = http://typerex.ocamlpro.com/ocp-indent.html; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index bcf08712ccb1..11909ec1a19b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.0.0"; + version = "1.0.3"; goPackagePath = "github.com/mitchellh/packer"; @@ -11,12 +11,14 @@ buildGoPackage rec { owner = "mitchellh"; repo = "packer"; rev = "v${version}"; - sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi"; + sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = http://www.packer.io; + homepage = https://www.packer.io; license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 000000000000..544facda0159 --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/hashicorp/packer"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/packer"; + rev = "07decf99adc272a386e3a013846248810d9aa690"; + sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz"; + }; + } +] diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5d4da29e9b0c..d760cec62a04 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # M4 = "${m4}/bin/m4"; meta = { - homepage = "http://www.gnu.org/software/bison/"; + homepage = http://www.gnu.org/software/bison/; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index ebbee4e693dc..f4d02043066e 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.4"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; meta = { - homepage = "http://www.gnu.org/software/bison/"; + homepage = http://www.gnu.org/software/bison/; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 97ee871c87e9..f3357de867ea 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, bison, m4 }: +{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "flex-2.5.35"; src = fetchurl { - url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2; - sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b"; + url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz; + sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm"; }; - buildInputs = [ bison ]; + nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ]; propagatedNativeBuildInputs = [ m4 ]; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 3bb34f5bc907..addf3b6197a3 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "flex-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz"; - sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8"; + sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"; }; buildInputs = [ bison ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 88fd2b559848..8c03c32655a9 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, - bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite, - darwin, writeScriptBin, cups +{ stdenv, fetchFromGitHub, fetchpatch +, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg +, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase +, darwin, writeScriptBin, cups }: let @@ -35,54 +36,54 @@ in stdenv.mkDerivation rec { name = "phantomjs-${version}"; version = "2.1.1"; - # needs git submodules, so can't use fetchFromGitHub - src = fetchgit { - rev = "refs/tags/${version}"; - url = "https://github.com/ariya/phantomjs.git"; - sha256 = "1gyc8qxn8v4vm4lgd9njrprz46fg1j5ziq0mm888q8ms0p7jy2pi"; + src = fetchFromGitHub { + owner = "ariya"; + repo = "phantomjs"; + rev = version; + sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq"; }; - buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - AGL ApplicationServices AppKit Cocoa OpenGL - darwin.libobjc fakeClang cups - ]); + nativeBuildInputs = [ qmake ]; + buildInputs = [ + bison2 flex fontconfig freetype gperf icu openssl + libjpeg libpng perl python ruby sqlite qtwebkit qtbase + ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AGL ApplicationServices AppKit Cocoa OpenGL + darwin.libobjc fakeClang cups + ]); + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-hardening.patch?id=42c9154d8c87c9fe434908259b0eddde4d892ca3"; + sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt-components.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-evaluateJavaScript.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-no-websecurity.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; + }) + ./system-qtbase.patch + ]; - patchPhase = '' + postPatch = '' patchShebangs . - sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure - touch src/qt/{qtbase,qtwebkit,3rdparty}/.git - '' + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri - substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \ - --replace "ENABLE_3D_RENDERING=1" "ENABLE_3D_RENDERING=0" - sed -i 88d src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.prf - echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/api.pri - echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/widgetsapi.pri - pushd src/qt - - substituteInPlace qtbase/configure \ - --replace /usr/bin/xcode-select true \ - --replace '/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null' 'echo /var/empty' \ - --replace '/usr/bin/xcrun -sdk $sdk -find' 'type -P' - substituteInPlace qtbase/mkspecs/features/mac/default_pre.prf \ - --replace '/usr/bin/xcode-select --print-path 2>/dev/null' "echo ${stdenv.libc}" \ - --replace '/usr/bin/xcrun -find xcrun 2>/dev/null' 'echo success' \ - --replace '/usr/bin/xcodebuild -version' 'echo Xcode 7.2; echo Build version 7C68' \ - --replace 'sdk rez' "" - for file in $(grep -rl /usr/bin/xcrun .); do - substituteInPlace "$file" --replace "/usr/bin/xcrun" ${fakeXcrun}/bin/xcrun - done - substituteInPlace qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable - - popd + substituteInPlace src/phantomjs.pro \ + --replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9" ''; __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - buildPhase = "./build.py --confirm -j$NIX_BUILD_CORES"; - enableParallelBuilding = true; installPhase = '' @@ -99,6 +100,10 @@ in stdenv.mkDerivation rec { $out/bin/phantomjs ''; + preFixup = '' + rm -r ../__nix_qt5__ + ''; + meta = with stdenv.lib; { description = "Headless WebKit with JavaScript API"; longDescription = '' diff --git a/pkgs/development/tools/phantomjs2/system-qtbase.patch b/pkgs/development/tools/phantomjs2/system-qtbase.patch new file mode 100644 index 000000000000..743372b0f0bc --- /dev/null +++ b/pkgs/development/tools/phantomjs2/system-qtbase.patch @@ -0,0 +1,13 @@ +--- a/build.py ++++ b/build.py +@@ -80,9 +80,9 @@ + def qmakePath(): + exe = "qmake" + if platform.system() == "Windows": + exe += ".exe" +- return os.path.abspath("src/qt/qtbase/bin/" + exe) ++ return os.path.abspath("@qtbase@" + exe) + + # returns paths for 3rd party libraries (Windows only) + def findThirdPartyDeps(): + include_dirs = [] diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index 4b6d230becd6..40cd133032fb 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = "https://github.com/Hibou57/PostiATS-Utilities"; + homepage = https://github.com/Hibou57/PostiATS-Utilities; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix index 154c0da93d49..2f0b03ab7e37 100644 --- a/pkgs/development/tools/profiling/gprof2dot/default.nix +++ b/pkgs/development/tools/profiling/gprof2dot/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication { }; meta = with stdenv.lib; { - homepage = "https://github.com/jrfonseca/gprof2dot"; + homepage = https://github.com/jrfonseca/gprof2dot; description = "Python script to convert the output from many profilers into a dot graph"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 23ee6dec86ab..39ee3179e9c4 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.10"; + version = "2.12"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0rv5hz4cfc1adpxvp4j4227nfc0p0yrjdc6l9i32jj11p69a5401"; + sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 8fb668df5b92..9be048257ced 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.26.1"; + version = "0.29.0"; src = fetchFromGitHub { - owner = "servo"; + owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "1w1vbfhmcrcl0vacxkivmavjp51cvpyq5lk75n9zs80q5x38ypna"; + sha256 = "190nilbqch8w2hcdmzgkk2npgsn49a4y9c5r0mxa9d7nz7h0imxk"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,13 +24,13 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "0s1x4ygjwc14fbl2amz5g6n7lq07zy8b00mvwfw6vi6k4bq1g59i"; + depsSha256 = "1y55xdqsk200hj5dhbigsgsx11w5cfxms84hhyl9y7w6jszbzxzw"; doCheck = false; # A test fails because it can't find standard headers in NixOS meta = with stdenv.lib; { - description = "C binding generator"; - homepage = https://github.com/servo/rust-bindgen; + description = "C and C++ binding generator"; + homepage = https://github.com/rust-lang-nursery/rust-bindgen; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d1cb4a8cd2e1..89c384eb6eca 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { name = "racer-${version}"; - version = "2.0.6"; + version = "2.0.9"; src = fetchFromGitHub { - owner = "phildawes"; + owner = "racer-rust"; repo = "racer"; rev = version; - sha256 = "09wgfrb0z2d2icfk11f1jal5p93sqjv3jzmzcgw0pgw3zvffhni3"; + sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp"; }; - depsSha256 = "0mnq7dk9wz2k9jhzciknybwc471sy8f71cd15m752b5ng6v1f5kn"; + depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1"; buildInputs = [ makeWrapper ]; preCheck = '' - export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src" + export RUST_SRC_PATH="${rustPlatform.rustcSrc}" ''; doCheck = true; @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin cp -p target/release/racer $out/bin/ - wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src" + wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}" ''; meta = with stdenv.lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; - homepage = https://github.com/phildawes/racer; + homepage = https://github.com/racer-rust/racer; license = licenses.mit; maintainers = with maintainers; [ jagajaga globin ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 7aaa62fef590..b2340e01c1a5 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -18,7 +18,7 @@ buildRustPackage rec { buildInputs = [ makeWrapper ]; - RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src''; + RUST_SRC_PATH = rustPlatform.rustcSrc; installPhase = '' mkdir -p $out/bin @@ -28,7 +28,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; - homepage = "https://github.com/jwilm/racerd"; + homepage = https://github.com/jwilm/racerd; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 1e990b0e2e90..eb82cf849660 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.3.2"; + version = "3.4.5"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "15a2b2698639dfdc7bd6a5ba7a9ecdaf8ebb9f15503fb04dea1be3133308e41d"; + sha256 = "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9"; }; patchPhase = '' diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index d32ea74cf7b4..3caec9a75c15 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,18 +4,18 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.4.7"; + version = "4.4.8"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0n7x9mvv6sww0h77k3d8rms78vah0j48ndsv4vnxq9znwjiglmva"; + sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1vwp8iqc5sk5kf7r86dld4767w4sm36hympnh1n2qza57ni7vy0g"; + sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1dwjysj3kjydz096bm5x0s1g3jm4a7y0qkgbsc6bwl44vxz81f66"; + sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg"; } ); diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 26e820517c04..b349b3899977 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,17 +6,17 @@ let allSpecs = { "i686-linux" = { system = "linux32"; - sha256 = "70845d81304c5f5f0b7f65274216e613e867e621676a09790c8aa8ef81ea9766"; + sha256 = "1qi49rcm7r4b8yqx4akmirilp4ifip89n7inji0pihdqzaw604d4"; }; "x86_64-linux" = { system = "linux64"; - sha256 = "bb2cf08f2c213f061d6fbca9658fc44a367c1ba7e40b3ee1e3ae437be0f901c2"; + sha256 = "1845nh7kj8scgn85yqwp4nsx7fabcb09w23jp8xa1cxyfvv2wdry"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "6c30bba7693ec2d9af7cd9a54729e10aeae85c0953c816d9c4a40a1a72fd8be0"; + sha256 = "0zyv8i4dbzyk58g4hr5143akgsfaaq9659bwj1m41jwi965grcxa"; }; }; @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.29"; + version = "2.31"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/chromedriver/; + homepage = https://sites.google.com/a/chromium.org/chromedriver; description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index f9c5ee1b7b9e..9028a796381c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { meta = { description = "A command line utility for various operations on container images and image repositories"; - homepage = "https://github.com/projectatomic/skopeo"; + homepage = https://github.com/projectatomic/skopeo; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 7c9d70528d5b..c55f76f9b7f5 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { it is intended as a replacement for the venerable 'isql' program supplied by Sybase. ''; - homepage = "http://www.cs.washington.edu/~rose/sqsh/sqsh.html"; + homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index cf21804ddde2..f8134a88643c 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; - homepage = "https://github.com/Kuniwak/vint"; + homepage = https://github.com/Kuniwak/vint; license = licenses.mit; maintainers = with maintainers; [ andsild ]; platforms = platforms.all; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 426d52eba707..66fdb1841e40 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Stupid golang vendoring tool, inspired by docker vendor script"; - homepage = "https://github.com/LK4D4/vndr"; + homepage = https://github.com/LK4D4/vndr; maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.asl20; }; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index aac773b11e60..29fedde90801 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = { description = "A command line tool for Vultr services, a provider for cloud virtual private servers"; - homepage = "https://github.com/JamesClonk/vultr"; + homepage = https://github.com/JamesClonk/vultr; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 379f87b4cf4f..15f265e31e3f 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, confFile ? config.watchman.confFile or null +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre, + libtool, pkgconfig, openssl, + confFile ? config.watchman.confFile or null }: stdenv.mkDerivation rec { name = "watchman-${version}"; - version = "4.7.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n"; + sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - buildInputs = [ autoconf automake pcre ]; + buildInputs = [ pcre openssl ]; + nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; configureFlags = [ "--enable-lenient" @@ -26,6 +28,10 @@ stdenv.mkDerivation rec { "--disable-statedir" ]; + prePatch = '' + patchShebangs . + ''; + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index 5a97eb09e4be..ffa6d4aac0ca 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { configurePhase = '' makeFlagsArray=( CFLAGS="-I. -O3" + STRIP="-s" INSTALL="install" BINDIR="$out/bin" MANDIR="$out/share/man" diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9e692e214b9f..779aed7fea34 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,51 +1,49 @@ -{ stdenv, lib, fetchurl, php }: +{ stdenv, lib, fetchurl, writeScript, writeText, php }: let - version = "1.2.0"; + name = "wp-cli-${version}"; + version = "1.3.0"; - bin = "bin/wp"; - ini = "etc/php/wp-cli.ini"; - phar = "share/wp-cli/wp-cli.phar"; + src = fetchurl { + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; + sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry"; + }; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; -in stdenv.mkDerivation rec { - name = "wp-cli-${version}"; + bin = writeScript "wp" '' + #! ${stdenv.shell} - src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1v51230gpw3ghz8vp3s1ykrwnmka9gj0r7xjad79bc9y250vr920"; - }; + set -euo pipefail - buildCommand = '' - mkdir -p $out/bin $out/etc/php + exec ${lib.getBin php}/bin/php \ + -c ${ini} \ + -f ${src} -- "$@" + ''; - cat <<_EOF > $out/${bin} - #! ${stdenv.shell} -eu - exec ${lib.getBin php}/bin/php \\ - -c $out/${ini} \\ - -f $out/${phar} "\$@" - _EOF - chmod 755 $out/${bin} - - cat <<_EOF > $out/${ini} + ini = writeText "wp-cli.ini" '' [Phar] phar.readonly = Off - _EOF - chmod 644 $out/${ini} + ''; - install -Dm644 ${src} $out/${phar} +in stdenv.mkDerivation rec { + inherit name version; + + buildCommand = '' + mkdir -p $out/{bin,share/bash-completion/completions} + + ln -s ${bin} $out/bin/wp install -Dm644 ${completion} $out/share/bash-completion/completions/wp ''; meta = with stdenv.lib; { description = "A command line interface for WordPress"; + homepage = https://wp-cli.org; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - homepage = https://wp-cli.org; - license = licenses.mit; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 8b6f751d3aa1..26c0fe281e78 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "0.27.5"; + version = "0.28.4"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0djjbdbwzlhdh6aww6awfl63nz72kj109kjxvmwk25x8dkvw795a"; + sha256 = "12l1ljgzk45i24d9x7036hdrb8f46in93xfc2z4wq94wzm24s2za"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index d5a6889c06af..4e8cb2b8829c 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rules to the code that look for problematic patterns or signs of inefficiency. The rules are all pluggable, so you can easily write your own or omit ones you don't want. ''; - homepage = http://nodejs.org; + homepage = https://nodejs.org; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index ef8ac133b2c3..c447173b6087 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -10,11 +10,12 @@ let ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { - name = "grails-2.4.3"; + name = "grails-${version}"; + version = "3.3.0"; src = fetchurl { - url = "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/${name}.zip"; - sha256 = "0lqkv0hsiiqa36pfnq5wv7s7nsp9xadmh1ri039bn0llpfck4742"; + url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; + sha256 = "0lk9ll0x9w2akmlwkams9pxyafmgjmsr3fa45gx1r16nx563qxsg"; }; buildInputs = [ unzip ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { over configuration to provide a productive and stream-lined development experience. ''; - homepage = http://grails.org/; + homepage = https://grails.org/; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 0b6ec87f00aa..d7917c52c99c 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -67,7 +67,7 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; + homepage = https://nodejs.org; license = licenses.mit; maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index edef6f7663cc..24832b6b8be0 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.8.1"; + version = "4.8.4"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms"; + sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 5fb122aefa86..9419b59e9212 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,10 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.9.5"; + version = "6.11.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp"; + sha256 = "6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8"; }; }) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix deleted file mode 100644 index 1c074fa47510..000000000000 --- a/pkgs/development/web/nodejs/v7.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: - -let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; -in - stdenv.mkDerivation (nodejs // rec { - version = "7.10.0"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "08czj7ssvzgv13zvhg2y9mhy4cc6pvm4bcp7rbzj3a2ba8axsd6w"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) - diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 273eb014180f..a891e637d269 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.1.0"; + version = "8.3.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1z3pcyxni8qmxljz6vbghm8242sr63l0dbc7x22ywbbqkfv21zzj"; + sha256 = "0lbfp7j73ig0xa3gh8wnl4g3lji7lm34l0ybfys4swl187c3da63"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 68ef1fd53926..f61b8bc1dcf6 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"; + sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare -- data files"; - homepage = "http://wildfiregames.com/0ad/"; + homepage = https://wildfiregames.com/0ad/; license = licenses.cc-by-sa-30; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 3a50196456c0..c1b69eb3120b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"; + sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare"; - homepage = "http://wildfiregames.com/0ad/"; + homepage = https://wildfiregames.com/0ad/; license = with licenses; [ gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 17d80f2e298a..c5bac4db8e5b 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -7,7 +7,7 @@ }: let - version = "2.0.36"; + version = "2.0.46"; inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; qt4 = pyqt4.qt; in @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { urls = [ - "http://ankisrs.net/download/mirror/${name}.tgz" - "http://ankisrs.net/download/mirror/archive/${name}.tgz" + "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + # "http://ankisrs.net/download/mirror/${name}.tgz" + # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v"; + sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr"; }; pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] diff --git a/pkgs/games/anki/fix-paths.patch b/pkgs/games/anki/fix-paths.patch index cfd3424f7990..9b2fd53783e3 100644 --- a/pkgs/games/anki/fix-paths.patch +++ b/pkgs/games/anki/fix-paths.patch @@ -1,7 +1,6 @@ -diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py ---- anki-2.0.33.orig/anki/lang.py 2015-12-27 11:23:02.334908723 +0100 -+++ anki-2.0.33/anki/lang.py 2015-12-27 14:06:00.688003103 +0100 -@@ -71,13 +71,7 @@ def ngettext(single, plural, n): +--- anki-2.0.46/anki/lang.py.orig 2017-08-06 15:30:10.781419237 +0200 ++++ anki-2.0.46/anki/lang.py 2017-08-06 15:31:33.023043036 +0200 +@@ -71,15 +71,7 @@ return localTranslation().ungettext(single, plural, n) def langDir(): @@ -11,6 +10,8 @@ diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py - dir = os.path.join(os.path.dirname(sys.argv[0]), "locale") - if not os.path.isdir(dir): - dir = "/usr/share/anki/locale" +- if not os.path.isdir(dir): +- dir = "/usr/local/share/anki/bin/locale" - return dir + return "@anki@/share/locale" diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 0ff040980573..d24833a31be2 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ]; meta = with stdenv.lib; { - homepage = "http://armagetronad.org"; + homepage = http://armagetronad.org; description = "An multiplayer networked arcade racing game in 3D similar to Tron"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 0d8c22d6e7be..40b594a19524 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = "http://arx-libertatis.org/"; + homepage = http://arx-libertatis.org/; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 82e5ddb06d4d..95d6365b99db 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; - homepage = "http://moikmellah.org/blog/?page_id=19"; + homepage = http://moikmellah.org/blog/?page_id=19; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 03cd2e7ca263..77809f1095fc 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - homepage = "http://blobby.sourceforge.net/"; + homepage = http://blobby.sourceforge.net/; downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; inherit version; }; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 599588e6f0ee..ef30a3d350c9 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}: +{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + makeFlags = [ "STRIP=" ]; + preConfigure = '' cat > config.params << EOF bsd_games_cfg_man6dir=$out/share/man/man6 @@ -56,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.t2-project.org/packages/bsd-games.html"; + homepage = http://www.t2-project.org/packages/bsd-games.html; description = "Ports of all the games from NetBSD-current that are free"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 93f341298a83..3f490b2976c1 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/btanks/; + homepage = https://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index ee65bcf307ef..9baa38777068 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { made for it. All of the original data files are required to do so ''; - homepage = "https://github.com/gerstrong/Commander-Genius"; + homepage = https://github.com/gerstrong/Commander-Genius; maintainers = with maintainers; [ hce ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 766b633057d3..808a4109f7b1 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,18 +1,24 @@ -diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile ---- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300 -@@ -285,7 +285,7 @@ +diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile +--- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 +@@ -286,13 +286,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a ifndef CROSSHOST -- SQLITE_INCLUDE_DIR := /usr/include +- # FreeBSD keeps all of its userland includes in /usr/local so +- # look there +- ifeq ($(uname_S),FreeBSD) +- SQLITE_INCLUDE_DIR := /usr/local/include +- else +- SQLITE_INCLUDE_DIR := /usr/include +- endif + SQLITE_INCLUDE_DIR := ${sqlite}/include else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for -diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font ---- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300 +diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font +--- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300 @@ -1,6 +1,6 @@ #! /bin/sh diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b6259c033af8..430da66c21c5 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.19.3"; + version = "0.20.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7"; + sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; }; patches = [ ./crawl_purify.patch ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source, single-player, role-playing roguelike game"; - homepage = "http://crawl.develz.org/"; + homepage = http://crawl.develz.org/; longDescription = '' Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting in dungeons filled with dangerous and unfriendly monsters diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ba9cd1e58055..0df91bb8df05 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,14 +5,12 @@ let dfVersion = "0.43.05"; - # version = "${dfVersion}-r1"; - # rev = "refs/tags/${version}"; - version = "${dfVersion}-r1"; + version = "${dfVersion}-r2"; rev = "refs/tags/${version}"; - sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w"; + sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c"; # revision of library/xml submodule - xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da"; + xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9"; arch = if stdenv.system == "x86_64-linux" then "64" @@ -51,6 +49,12 @@ in stdenv.mkDerivation rec { # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib ]; + preConfigure = '' + # Trick build system into believing we have .git + mkdir -p .git/modules/library/xml + touch .git/index .git/modules/library/xml/index + ''; + preBuild = '' export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" ''; @@ -63,7 +67,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; - homepage = "https://github.com/DFHack/dfhack/"; + homepage = https://github.com/DFHack/dfhack/; license = licenses.zlib; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ robbinch a1russell abbradar ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 5be8c7d759e9..bfdedcdd133f 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ the-kenny abbradar ]; license = licenses.mit; platforms = platforms.linux; - homepage = "https://github.com/splintermind/Dwarf-Therapist"; + homepage = https://github.com/splintermind/Dwarf-Therapist; }; } diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index cb56969578e8..740125bf4426 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A single-player fantasy game with a randomly generated adventure world"; - homepage = "http://www.bay12games.com/dwarves"; + homepage = http://www.bay12games.com/dwarves; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index d5b6ac6c6865..7d1f26e9aabc 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLA graphics set for Dwarf Fortress"; - homepage = "http://www.bay12forums.com/smf/index.php?topic=105376.0"; + homepage = http://www.bay12forums.com/smf/index.php?topic=105376.0; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; license = licenses.free; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 57f00e89b998..07bbde9f1480 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoebus graphics set for Dwarf Fortress"; - homepage = "http://www.bay12forums.com/smf/index.php?topic=137096.0"; + homepage = http://www.bay12forums.com/smf/index.php?topic=137096.0; platforms = platforms.all; maintainers = with maintainers; [ a1russell abbradar ]; # https://github.com/fricy/Phoebus/issues/5 diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 4b71b4377050..105da5a5731b 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; + homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 128cbe71b5d3..f39e32eb7520 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; - homepage = "https://endless-sky.github.io/"; + homepage = https://endless-sky.github.io/; license = with licenses; [ gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain ]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 0a94a1c433da..411101955093 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://sourceforge.net/projects/extremetuxracer/; + homepage = https://sourceforge.net/projects/extremetuxracer/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index a1560fb19340..85def0596dcc 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://ezquake.github.io/"; + homepage = http://ezquake.github.io/; description = "A modern QuakeWorld client focused on competitive online play."; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 1d52cf845d91..fca28b17223f 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de with stdenv.lib; let - version = if releaseType != "demo" then "0.15.26" else "0.15.25"; + version = if releaseType != "demo" then "0.15.33" else "0.15.33"; arch = if stdenv.system == "x86_64-linux" then { inUrl = "linux64"; @@ -26,9 +26,9 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "1nblfff1m5wgp177l508y94n61lga3palhzw4frp2vd98sdp7gqk"; }; - alpha = authenticatedFetch { inherit name url; sha256 = "0g7k58h15q4n9wxf96rx72w340xpdbj8k1faaxixrfrfx8bnmsls"; }; - demo = fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; }; + headless = fetchurl { inherit name url; sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; }; + alpha = authenticatedFetch { inherit name url; sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; }; + demo = fetchurl { inherit name url; sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh index 30d9c9fdefe0..312dc9b6d61e 100644 --- a/pkgs/games/factorio/fetch.sh +++ b/pkgs/games/factorio/fetch.sh @@ -33,7 +33,7 @@ $curl --data-urlencode csrf_token="$csrf" \ if grep -q 'Location: https://' headers; then # Now download. We need --insecure for this, but the sha256 should cover us. - $curl --insecure --location $url > $out + $curl --insecure --location --fail $url > $out || { echo "Login succeeded, but subsequent fetch failed."; exit 1; } set +x else set +x diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 3ae4ee7f2057..1aab0933b1bf 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; + homepage = http://home.hccnet.nl/h.g.muller/dwnldpage.html; }; } diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index e9d6ce9655bb..f5984806bd14 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://fillets.sourceforge.net/"; + homepage = http://fillets.sourceforge.net/; }; } diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 91d4db32b683..438b01fe51ac 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -35,7 +35,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"; + homepage = http://www.freeorion.org; license = [ licenses.gpl2 licenses.cc-by-sa-30 ]; platforms = platforms.linux; }; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch index fa0337fc5850..cf44dffc897c 100644 --- a/pkgs/games/gargoyle/darwin.patch +++ b/pkgs/games/gargoyle/darwin.patch @@ -1,39 +1,3 @@ -From 06255a8b5a378a2484cd0faa1dd718d5b4e98042 Mon Sep 17 00:00:00 2001 -From: Orivej Desh -Date: Fri, 17 Mar 2017 08:43:57 +0000 -Subject: [PATCH] darwin - ---- - Jamrules | 5 ++--- - Jamshared | 2 +- - support/Jamfile | 4 ++-- - tads/Jamfile | 4 ++-- - terps/Jamfile | 4 ++-- - 5 files changed, 9 insertions(+), 10 deletions(-) - -diff --git a/Jamrules b/Jamrules -index 698220d..2294dfc 100644 ---- a/Jamrules -+++ b/Jamrules -@@ -141,8 +141,7 @@ switch $(OS) - case MACOSX : - Echo "OS is MACOSX (cocoa)" ; - SUFDLL = .dylib ; -- MAINARCH = -arch i386 ; -- CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ; -+ CCFLAGS = -Wno-pointer-sign $(ALTARCH) ; - PKGCONFIG = "pkg-config freetype2" ; - GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ; - SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ; -@@ -155,7 +154,7 @@ switch $(OS) - SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ; - } - -- LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ; -+ LINK = $(CC) $(FRAMEWORKS) $(ALTARCH) ; - - - case * : diff --git a/Jamshared b/Jamshared index 13db835..fd42928 100644 --- a/Jamshared @@ -47,21 +11,6 @@ index 13db835..fd42928 100644 } } else -diff --git a/support/Jamfile b/support/Jamfile -index aedf8fe..70cfefd 100644 ---- a/support/Jamfile -+++ b/support/Jamfile -@@ -41,8 +41,8 @@ if $(USESDL) = yes - ; - - if $(OS) = MINGW { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; } -- if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; } -- if $(OS) = MACOSX { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; } -+ if $(OS) = SOLARIS { SubDirCcFlags -ISDL -fPIC ; } -+ if $(OS) = MACOSX { SubDirCcFlags -ISDL -fPIC ; } - - SEARCH_SOURCE = - [ FDirName $(TOP) support sdl_sound ] diff --git a/tads/Jamfile b/tads/Jamfile index 1f8829d..d8455eb 100644 --- a/tads/Jamfile @@ -77,6 +26,17 @@ index 1f8829d..d8455eb 100644 } SEARCH_SOURCE = +diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp +index 5e193a1..dce46f7 100644 +--- a/tads/tads3/vmtz.cpp ++++ b/tads/tads3/vmtz.cpp +@@ -1985,5 +1985,5 @@ void CVmTimeZone::query(vmtzquery *result, int32_t dayno, int32_t daytime, + * up until that moment + */ +- result->set(tcur > 0 ? tcur - 1 : tcur); ++ result->set(tcur != 0 ? tcur - 1 : tcur); + return; + } diff --git a/terps/Jamfile b/terps/Jamfile index b5f6d52..2d1ccdb 100644 --- a/terps/Jamfile @@ -92,6 +52,3 @@ index b5f6d52..2d1ccdb 100644 } SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ; --- -2.12.0 - diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index ecee61513b42..7a461fbfa0d7 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: +{ stdenv, fetchFromGitHub, jam, libtool, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: let - jamenv = if stdenv.isDarwin then '' + jamenv = '' + unset AR + '' + (if stdenv.isDarwin then '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" '' else '' @@ -12,21 +14,21 @@ let export _APPDIR=libexec/gargoyle export _LIBDIR=libexec/gargoyle export GARGLKINI="$out/etc/garglk.ini" - ''; + ''); in stdenv.mkDerivation { - name = "gargoyle-2017-03-12"; + name = "gargoyle-2017-05-17"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = "7d8fe875927c332ea30d75656bc982354b42f602"; - sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih"; + rev = "2da2824748b0b99107f481801f818efc54a43d3a"; + sha256 = "184lgylcbhj205pfccwgl7avs0pczwrc53nvkzhj2p5inxak20kk"; }; - nativeBuildInputs = [ jam pkgconfig ]; + nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool; buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 1d96d056a822..defee04e5c24 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = "http://gurpscharactersheet.com/"; + homepage = http://gurpscharactersheet.com/; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix deleted file mode 100644 index 2a2809cc805a..000000000000 --- a/pkgs/games/glestae/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl -, mesa, cmake, lua5, SDL, openal, libvorbis, libogg, zlib, physfs -, freetype, libpng, libjpeg, glew, wxGTK28, libxml2, libpthreadstubs -}: - -stdenv.mkDerivation rec { - name = "glestae-${version}"; - version = "0.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/glestae/${version}/glestae-src-${version}.tar.bz2"; - sha256 = "1k02vf88mms0zbprvy1b1qdwjzmdag5rd1p43f0gpk1sms6isn94"; - }; - - buildInputs = - [ mesa cmake lua5 SDL openal libvorbis libogg zlib physfs - freetype libpng libjpeg glew wxGTK28 libxml2 libpthreadstubs - ]; - - cmakeFlags = [ - "-DLUA_LIBRARIES=-llua" - "-DGAE_DATA_DIR=$out/share/glestae" - ]; - - meta = { - description = "A 3D RTS - fork of inactive Glest project"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - # Note that some data seems to be under separate redistributable licenses - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - downloadPage = "http://sourceforge.net/projects/glestae/files/0.3.2/"; - }; -} diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 061f7c328d68..49353f5d7b5b 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff +, fetchpatch }: let version = "0.9.4"; @@ -18,7 +19,12 @@ stdenv.mkDerivation rec { sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; }; - patches = [ ./header-order.patch ./public-buildproject.patch ]; + patches = [ ./header-order.patch ./public-buildproject.patch + (fetchpatch { + url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw; + sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; + }) + ]; postPatch = '' cp campaigns/tutorial-part4.map{,.orig} diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index c61d46e9d339..62c5ee803047 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.4"; + version="6.2.5"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw"; + sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs"; }; buildInputs = [ flex diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 827388691af0..6b053d9d53cd 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; - homepage = "http://http://www.gnu.org/software/gnugo/"; + homepage = http://http://www.gnu.org/software/gnugo/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index dc51a6f0cc0e..2110dfee11ef 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/coelckers/gzdoom"; + homepage = https://github.com/coelckers/gzdoom; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 4c3d22571b17..8a91af9cd652 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { to bring to life the video game used to determine the winner of Pierce Hawthorne's inheritance. ''; - homepage = "http://www.reddit.com/r/hawkthorne"; + homepage = http://www.reddit.com/r/hawkthorne; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; broken = true; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index b9316e2ca70a..296687c5d92d 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -6,7 +6,7 @@ let ghc = ghcWithPackages (pkgs: with pkgs; [ network vector utf8-string bytestring-show random hslogger - dataenc SHA entropy zlib_0_5_4_2 + dataenc SHA entropy pkgs.zlib ]); in stdenv.mkDerivation rec { diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 682021eee699..134cb650fd2f 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; - homepage = "https://ja2-stracciatella.github.io/"; + homepage = https://ja2-stracciatella.github.io/; }; } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index ea56c1f1ac20..83f8f1a8be7b 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "klavaro-${version}"; - version = "3.02"; + version = "3.03"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "5f77730a8c1c8dfd4443ec8390c7226e3f82537df0882cd1222b140f0d0fcd6c"; + sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0"; }; buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ]; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 1c433965c78b..6d8fddf3899a 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "City simulation game"; license = licenses.gpl2Plus; - homepage = "https://sourceforge.net/projects/lincity"; + homepage = https://sourceforge.net/projects/lincity; }; } diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 04640095ec0c..b072fa942b86 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick tactics game"; - homepage = "http://www.gnu.org/software/liquidwar6/"; + homepage = http://www.gnu.org/software/liquidwar6/; maintainers = [ maintainers.raskin ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index b2a1fd499dff..80769ab4f57a 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; license = stdenv.lib.licenses.gpl3; - homepage = "http://megaglest.org/"; + homepage = http://megaglest.org/; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix new file mode 100644 index 000000000000..8ea8dfccb166 --- /dev/null +++ b/pkgs/games/moon-buggy/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation rec { + baseName = "moon-buggy"; + version = "1.0.51"; + name = "${baseName}-${version}"; + + buildInputs = [ + ncurses + ]; + + src = fetchurl { + url = "http://m.seehuhn.de/programs/${name}.tar.gz"; + sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m"; + }; + + meta = { + description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.rybern]; + platforms = stdenv.lib.platforms.linux; + homepage = http://www.seehuhn.de/pages/moon-buggy; + }; +} diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index f5ff0b4690e9..ae086af184c6 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://www.dettus.net/n2048/"; + homepage = http://www.dettus.net/n2048/; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 1f033d493059..3fd20e6221e6 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, mesa, makeWrapper, zlib }: +, libpng, mesa, makeWrapper, zlib, freetype }: let pname = "naev"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib freetype ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index bf9d01800f33..92d87697fb16 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Rogue-like game"; - homepage = "http://nethack.org/"; + homepage = http://nethack.org/; license = "nethack"; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 0bfebd510c94..bde567a19033 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { meta = { description = "A free fast-paced first-person shooter"; - homepage = "http://www.alientrap.org/games/nexuiz"; + homepage = http://www.alientrap.org/games/nexuiz; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index ab60041aa306..cc337f58f735 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Japanese visual novel scripting engine"; - homepage = "http://unclemion.com/onscripter/"; + homepage = http://unclemion.com/onscripter/; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 91b9b6fbb6db..0b0561afd24d 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = "http://openclonk.org"; + homepage = http://openclonk.org; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; platforms = platforms.all; }; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 94a44446b6cd..7c2d168d6c37 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; - homepage = "https://opendungeons.github.io"; + homepage = https://opendungeons.github.io; license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; platforms = platforms.linux; }; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix new file mode 100644 index 000000000000..02afa0a8edc2 --- /dev/null +++ b/pkgs/games/openjk/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }: + +stdenv.mkDerivation rec { + name = "OpenJK-2017-08-11"; + + src = fetchFromGitHub { + owner = "JACoders"; + repo = "OpenJK"; + rev = "a0828f06e0181c62e110f2f78d30acb5036b4113"; + sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m"; + }; + + dontAddPrefix = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ makeWrapper cmake ]; + buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ]; + + # move from $out/JediAcademy to $out/opt/JediAcademy + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt") + ''; + + postInstall = '' + mkdir -p $out/bin + prefix=$out/opt/JediAcademy + makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix" + makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix" + makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix" + ''; + + meta = with stdenv.lib; { + description = "An open-source engine for Star Wars Jedi Academy game"; + homepage = https://github.com/JACoders/OpenJK; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8b3998aa6194..c09790e0c66c 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; - homepage = "http://openmw.org"; + homepage = http://openmw.org; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix new file mode 100644 index 000000000000..cb9e296cdd4f --- /dev/null +++ b/pkgs/games/openmw/tes3mp.nix @@ -0,0 +1,114 @@ +{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal +, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }: + +let + mygui_ = mygui.override { + inherit stdenv; + }; + terra_ = symlinkJoin { + name = "terra"; + paths = [ terra.static terra.dev ]; + }; + TES3MP = fetchFromGitHub { + owner = "TES3MP"; + repo = "openmw-tes3mp"; + rev = "f61664ff6d521e10db761a550c97c6edce8f0046"; + sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb"; + }; + CallFF = fetchFromGitHub { + owner = "Koncord"; + repo = "CallFF"; + rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9"; + sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57"; + }; + RakNet = fetchFromGitHub { + owner = "TES3MP"; + repo = "RakNet"; + rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba"; + sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q"; + }; + PluginExamples = fetchFromGitHub { + owner = "TES3MP"; + repo = "PluginExamples"; + rev = "213e72f315a8029eec71437e56de0eaeba5b3670"; + sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b"; + }; + + fakegit = writeScriptBin "git" '' + #! ${stdenv.shell} + if [ "$*" = "rev-list --tags --max-count=1" ] || + [ "$*" = "rev-parse HEAD" ]; then + echo "${TES3MP.rev}" + else + exit 1 + fi + ''; +in stdenv.mkDerivation rec { + version = "0.6.0"; + name = "tes3mp-${version}"; + + src = fetchFromGitHub { + owner = "GrimKriegor"; + repo = "TES3MP-deploy"; + rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45"; + sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6"; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ cmake makeWrapper fakegit ]; + buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt + ncurses mesa_noglu ]; + + buildPhase = '' + mkdir dependencies keepers + cp --no-preserve=mode -r ${TES3MP} code + mkdir code/.git + cp --no-preserve=mode -r ${CallFF} dependencies/callff + cp --no-preserve=mode -r ${RakNet} dependencies/raknet + cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples + ln -s ${terra_} dependencies/terra + + substituteInPlace tes3mp-deploy.sh \ + --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" + patchShebangs tes3mp-deploy.sh + echo y | ./tes3mp-deploy.sh -i -c $NIX_BUILD_CORES + ''; + + installPhase = '' + prefix=$out/opt/tes3mp + mkdir -p $prefix/build $out/etc/openmw $out/bin + for i in build/*; do + if [ -f "$i" ] && [ -x "$i" ]; then + mv "$i" $prefix/build + fi + done + mv build/resources $prefix/build + mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw + mv keepers $prefix + + for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh + do + bin="$out/bin/''${i%.sh}" + mv $i $bin + substituteInPlace $bin \ + --replace build/ $prefix/build/ + chmod +x $bin + done + ln -s $prefix/keepers/*.cfg $out/etc/openmw/ + + wrapProgram $out/bin/tes3mp-server \ + --run "mkdir -p ~/.config/openmw" \ + --run "cd ~/.config/openmw" \ + --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg" + ''; + + meta = with stdenv.lib; { + description = "Multiplayer for TES3:Morrowind based on OpenMW"; + homepage = "https://tes3mp.com/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 38597f8df070..51f2b6a8c4e4 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century"; - homepage = "http://pioneerspacesim.net"; + homepage = https://pioneerspacesim.net; license = with licenses; [ gpl3 cc-by-sa-30 ]; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index e34f05402f77..24a0281a874b 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.pokerth.net/; + homepage = https://www.pokerth.net; description = "Open Source Poker client and server"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index b6a76001ad09..dea0fe547da0 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. ''; - homepage = "https://github.com/pzorin/qgo"; + homepage = https://github.com/pzorin/qgo; license = licenses.gpl2; maintainers = with maintainers; [ zalakain ]; }; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 734f9daa9706..d94a1f9a8d4d 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2017-01-27"; + version = "2017-07-25"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "468da0fabca2f21b811a501c184b986e270c5113"; - sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58"; + rev = "356ae10ef65d4401958d50f03288dcb22d957c96"; + sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j"; }; nativeBuildInputs = [ which pkgconfig ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://ioquake3.org/"; + homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index cd7787604c2e..be480009b8a6 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "An engine for iD software's Quake"; - homepage = "http://quakespasm.sourceforge.net/"; + homepage = http://quakespasm.sourceforge.net/; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix new file mode 100644 index 000000000000..27dabe1deacd --- /dev/null +++ b/pkgs/games/rftg/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "rftg-${version}"; + version = "0.9.4"; + + src = fetchurl { + url = "http://keldon.net/rftg/rftg-${version}.tar.bz2"; + sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; + }; + + buildInputs = [ gtk2.dev pkgconfig ]; + + meta = { + homepage = http://keldon.net/rftg/; + description = "Implementation of the card game Race for the Galaxy, including an AI"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.falsifian ]; + }; + +} diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 0df7fae13c65..301991c1a6fd 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Chess database with play and training functionality"; - homepage = "http://scid.sourceforge.net/"; + homepage = http://scid.sourceforge.net/; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index dd4069e1c11c..be921bf11892 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lopenal" ]; meta = with stdenv.lib; { - homepage = "http://scorched3d.co.uk/"; + homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 5fa7410ef938..c2beeb13cadf 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = { description = "A strategy collectible card game"; - homepage = "https://scrolls.com/"; + homepage = https://scrolls.com/; # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bb9772dae72a..7e83b803246a 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/puzzles/; }; } diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7c4b2fe823c1..9fcab8b1ec9a 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin nckx ]; platforms = platforms.linux; license = licenses.free; - broken = true; downloadPage = http://sourceforge.net/projects/soi/files/; }; } diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index cd59f96037fb..5ca0de6a7732 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.stepmania.com/"; + homepage = http://www.stepmania.com/; description = "Free dance and rhythm game for Windows, Mac, and Linux"; platforms = platforms.linux; license = licenses.mit; # expat version diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index c1f53ec7f8ac..629d7b1ea82f 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://stockfishchess.org/"; + homepage = https://stockfishchess.org/; description = "Strong open source chess engine"; longDescription = '' Stockfish is one of the strongest chess engines in the world. It is also diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index f72307e0172f..ffbcd595cc35 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "91.5.330"; + version = "92.0.331"; src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7"; + sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax"; }; patches = [ ./fix-env.patch ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = "http://powdertoy.co.uk/"; + homepage = http://powdertoy.co.uk/; platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 4ce5aa5cf107..3594a04f03bf 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; - homepage = "http://tibia.com"; + homepage = http://tibia.com; license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index deb283c57c40..4514735bb709 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free MUD client for Mac OS X, Linux and Windows"; + description = "A free MUD client for macOS, Linux and Windows"; homepage = http://tintin.sourceforge.net; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index f13190abdf70..ad9b5f7dc6cd 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -34,7 +34,7 @@ EOF cp -r game $out/opt/tome4 ''; meta = with stdenv.lib; { - homepage = "http://te4.org/"; + homepage = http://te4.org/; description = "Tales of Maj'eyal (rogue-like game)"; maintainers = [ maintainers.chattered ]; license = licenses.gpl3; diff --git a/pkgs/games/ultrastardx/1.1.nix b/pkgs/games/ultrastardx/1.1.nix deleted file mode 100644 index 9810d5186b0e..000000000000 --- a/pkgs/games/ultrastardx/1.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng -, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }: - -stdenv.mkDerivation rec { - name = "ultrastardx-1.1"; - src = fetchurl { - url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz"; - sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd"; - }; - - buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg - sqlite lua ]; - - - # The fpc is not properly wrapped to add -rpath. I add this manually. - # I even do a trick on lib/lib64 for libgcc, that I expect it will work. - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib" - - sed -i 414,424d Makefile - ''; - - # dlopened libgcc requires the rpath not to be shrinked - dontPatchELF = true; - - meta = { - homepage = http://ultrastardx.sourceforge.net/; - description = "Free and open source karaoke game"; - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/default.nix similarity index 86% rename from pkgs/games/ultrastardx/1.3-beta.nix rename to pkgs/games/ultrastardx/default.nix index ca7d6b35a21b..ce68f190992b 100644 --- a/pkgs/games/ultrastardx/1.3-beta.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -12,18 +12,16 @@ let in stdenv.mkDerivation rec { name = "ultrastardx-${version}"; - version = "1.3.5-beta"; + version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm"; }; - buildInputs = [ - pkgconfig autoreconfHook - fpc libpng - ] ++ sharedLibs; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ fpc libpng ] ++ sharedLibs; postPatch = '' # autoconf substitutes strange things otherwise diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index ea0186323c02..57749c4f228c 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 = http://unnethack.wordpress.com/; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 9ba3a442eb73..af50759fd2fe 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { longDescription = '' Unvanquished is a free, open-source first-person shooter combining real-time strategy elements with a futuristic, sci-fi - setting. It is available for Windows, Linux, and Mac OS X. + setting. It is available for Windows, Linux, and macOS. Features: diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index f5fcdc088c8f..1a7ea2da75b6 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; - homepage = "http://www.unrealtournament2004.com"; + homepage = http://www.unrealtournament2004.com; license = licenses.unfree; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch index 6b683aa782f4..913b912af7d4 100644 --- a/pkgs/games/warmux/gcc-fix.patch +++ b/pkgs/games/warmux/gcc-fix.patch @@ -45,7 +45,7 @@ Author: Robin Gloster { if (!show) - return false; -+ return NULL; ++ return nullptr; const std::vector& items = poly->GetItem(); WeaponMenuItem * tmp; Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index ef0e4640c393..f83c5ac360a4 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Set in a futuristic cartoon-like world where rocketlauncher-wielding pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a completely free fast-paced first-person shooter (FPS) for Windows, Linux - and Mac OS X. + and macOS. ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 7e5cdae57fa6..66833ceb2104 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = "http://www.wesnoth.org/"; + homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 315f9ea7a5ea..95d49dd63759 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = "http://www.wesnoth.org/"; + homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index b6009ee72fd0..531560fd309e 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A free fast-paced first-person shooter"; longDescription = '' Xonotic is a free, fast-paced first-person shooter that works on - Windows, OS X and Linux. The project is geared towards providing + Windows, macOS and Linux. The project is geared towards providing addictive arena shooter gameplay which is all spawned and driven by the community itself. Xonotic is a direct successor of the Nexuiz project with years of development between them, and it diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index c370f489d2ca..90c1ad6f8ebc 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A multiplayer space combat game (client part)''; - homepage = "http://bloodspilot.sf.net/"; + homepage = http://bloodspilot.sf.net/; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 5cfec74d9639..514dd2f41db4 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A multiplayer X11 space combat game''; - homepage = "http://xpilot.sf.net/"; + homepage = http://xpilot.sf.net/; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 57c2ca2dfd86..e683e96d206d 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://tracker.debian.org/pkg/xsok"; + homepage = https://tracker.debian.org/pkg/xsok; }; } diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index a217c7217b6e..d2b94a14fe41 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://zdoom.org/"; + homepage = http://zdoom.org/; description = "Enhanced port of the official DOOM source code"; # Doom source license, MAME license license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e3453628ba98..fa2cafa298ac 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ZDoom's internal node builder for DOOM maps"; - homepage = "https://zdoom.org/wiki/ZDBSP"; + homepage = https://zdoom.org/wiki/ZDBSP; license = licenses.gpl2Plus; maintainers = with maintainers; [ertes]; platforms = platforms.linux; diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 4a902b640cb5..12d774467c52 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; - homepage = "https://github.com/i-rinat/apulse"; + homepage = https://github.com/i-rinat/apulse; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix index 9699065864ac..569370a79446 100644 --- a/pkgs/misc/base16/default.nix +++ b/pkgs/misc/base16/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Base16 provides carefully chosen syntax highlighting and a default set of sixteen colors suitable for a wide range of applications. Base16 is both a color scheme and a template."; - homepage = "https://github.com/chriskempson/base16"; + homepage = https://github.com/chriskempson/base16; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = with platforms; unix; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 779cf9656863..b79ffa1c9a12 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers for Canon printers"; - homepage = "http://www.canon.com/"; + homepage = http://www.canon.com/; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index adde818efcef..3577f5b38b0a 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; - homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; + homepage = http://support-th.canon-asia.com/contents/TH/EN/0100712901.html; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix new file mode 100644 index 000000000000..27b86ab89198 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, fetchzip, + autoconf, automake, libtool, + cups, popt, libtiff, libpng, + ghostscript }: + +/* this derivation is basically just a transcription of the rpm .spec + file included in the tarball */ + +stdenv.mkDerivation rec { + name = "cnijfilter-${version}"; + + /* important note about versions: cnijfilter packages seem to use + versions in a non-standard way. the version indicates which + printers are supported in the package. so this package should + not be "upgraded" in the usual way. + + instead, if you want to include another version supporting your + printer, you should try to abstract out the common things (which + should be pretty much everything except the version and the 'pr' + and 'pr_id' values to loop over). */ + version = "2.80"; + + src = fetchzip { + url = "http://gdlp01.c-wss.com/gds/1/0100000841/01/cnijfilter-common-2.80-1.tar.gz"; + sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53"; + }; + + buildInputs = [ autoconf libtool automake + cups popt libtiff libpng + ghostscript ]; + + patches = [ ./patches/missing-include.patch + ./patches/libpng15.patch ]; + + postPatch = '' + sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" backend/src/Makefile.am; + sed -i "s|/usr|$out|" backend/src/cnij_backend_common.c; + sed -i "s|/usr/bin|${ghostscript}/bin|" pstocanonij/filter/pstocanonij.c; + sed -i "s|/usr/local|$out|" libs/bjexec/bjexec.c; + ''; + + configurePhase = '' + cd libs + ./autogen.sh --prefix=$out; + + cd ../cngpij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin; + + cd ../pstocanonij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin; + + cd ../backend + ./autogen.sh --prefix=$out; + cd ..; + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/cups/filter $out/share/cups/model; + ''; + + postInstall = '' + for pr in mp140 mp210 ip3500 mp520 ip4500 mp610; do + cd ppd; + ./autogen.sh --prefix=$out --program-suffix=$pr + make clean; + make; + make install; + + cd ../cnijfilter; + ./autogen.sh --prefix=$out --program-suffix=$pr --enable-libpath=/var/lib/cups/path/lib/bjlib --enable-binpath=$out/bin; + make clean; + make; + make install; + + cd ..; + done; + + mkdir -p $out/lib/bjlib; + for pr_id in 315 316 319 328 326 327; do + install -c -m 755 $pr_id/database/* $out/lib/bjlib; + install -c -s -m 755 $pr_id/libs_bin/*.so.* $out/lib; + done; + + pushd $out/lib; + for so_file in *.so.*; do + ln -s $so_file ''${so_file/.so.*/}.so; + patchelf --set-rpath $out/lib $so_file; + done; + popd; + ''; + + /* the tarball includes some pre-built shared libraries. we run + 'patchelf --set-rpath' on them just a few lines above, so that + they can find each other. but that's not quite enough. some of + those libraries load each other in non-standard ways -- they + don't list each other in the DT_NEEDED section. so, if the + standard 'patchelf --shrink-rpath' (from + pkgs/development/tools/misc/patchelf/setup-hook.sh) is run on + them, it undoes the --set-rpath. this prevents that. */ + dontPatchELF = true; + + meta = with lib; { + description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; + homepage = http://support-asia.canon-asia.com/content/EN/0100084101.html; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ jerith666 ]; + }; +} diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch new file mode 100644 index 000000000000..f5b3a1b13db5 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch @@ -0,0 +1,23 @@ +diff -aur cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c +--- cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c 2009-03-26 06:11:05.000000000 +0100 ++++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c 2012-02-10 09:33:52.512334139 +0100 +@@ -1520,8 +1520,8 @@ + short tmpformat; + short retbyte = 0; + short bpp = 3; +- long width = 0; +- long length = 0; ++ png_uint_32 width = 0; ++ png_uint_32 length = 0; + long rstep = 0; + long RasterLength = 0; + long i; +@@ -1574,7 +1574,7 @@ + goto onErr; + } + +- if (setjmp (png_p->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_p))) + { + png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL); + goto onErr; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch new file mode 100644 index 000000000000..20c2d756d1eb --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch @@ -0,0 +1,20 @@ +--- a/backend/src/cnij_backend_common.c 2008-09-01 10:05:44.000000000 +0200 ++++ b/backend/src/cnij_backend_common.c 2012-05-06 17:38:40.000000000 +0200 +@@ -39,6 +39,7 @@ + // CUPS Header + #include + #include ++#include + + // Header file for CANON + #include "cnij_backend_common.h" +--- a/cngpijmon/src/bjcupsmon_cups.c 2008-09-02 12:28:24.000000000 +0200 ++++ b/cngpijmon/src/bjcupsmon_cups.c 2012-05-06 17:39:20.000000000 +0200 +@@ -21,6 +21,7 @@ + /*** Includes ***/ + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 9c187a8f378d..8abda27a5cf2 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; - homepage = "http://www.dymo.com/"; + homepage = http://www.dymo.com/; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index ee14e4a52db9..228f56d47ae0 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd , ghostscript, a2ps }: # Why: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \ - ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched + ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched #executing from current dir. segfaults if it's not r\w. mkdir -p $out/bin @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; - description = "Brother MFC-J6510DW LPR driver"; - license = with licenses; unfree; - platforms = with platforms; linux; + description = "Brother MFC-J6510DW LPR driver"; downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; - maintainers = with maintainers; [ ramkromberg ]; + homepage = http://www.brother.com/; + license = with licenses; unfree; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix new file mode 100644 index 000000000000..3b1d2e52881a --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -0,0 +1,44 @@ +{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }: + +stdenv.mkDerivation rec { + name = "mfcl2700dncupswrapper-${meta.version}"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + basedir=${mfcl2700dnlpr}/opt/brother/Printers/MFCL2700DN + dir=$out/opt/brother/Printers/MFCL2700DN + + substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "basedir =~" "basedir = \"$basedir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" + + wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN $out/lib/cups/filter + ln $dir/cupswrapper/brother-MFCL2700DN-cups-en.ppd $out/share/cups/model + ''; + + meta = { + description = "Brother MFC-L2700DN CUPS wrapper driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = stdenv.lib.platforms.linux; + version = "3.2.0-1"; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix new file mode 100644 index 000000000000..b0a030469349 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -0,0 +1,44 @@ +{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: + +stdenv.mkDerivation rec { + name = "mfcl2700dnlpr-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + dir=$out/opt/brother/Printers/MFCL2700DN + + substituteInPlace $dir/lpd/filter_MFCL2700DN \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" + + wrapProgram $dir/lpd/filter_MFCL2700DN \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused which + ]} + + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter + patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3 + patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3 + ''; + + meta = { + description = "Brother MFC-L2700DN LPR driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = [ "i686-linux" ]; + }; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index fec0634ba68b..be788f9add46 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.14.0"; + version = "1.16.0"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1v553wvr8qdwb1g04if7cw1mfm42vs6xfyg0cvzvbng6yr6jg93s"; + sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix new file mode 100644 index 000000000000..38cfb75fa091 --- /dev/null +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -0,0 +1,142 @@ +{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin, +pkgconfig, libtool, +gtk2, +libxml2, +libxslt, +libusb, +sane-backends, +rpm, cpio, +eject, +patchelf, gcc +}: + +let common_meta = { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; + license = with stdenv.lib.licenses; epson; + platforms = with stdenv.lib.platforms; linux; + }; +in +############################ +# +# PLUGINS +# +############################ + +# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... + +let plugins = { + f720 = stdenv.mkDerivation rec { + name = "iscan-gt-f720-bundle"; + version = "1.0.1"; + pluginVersion = "0.1.1-2"; + + buildInputs = [ patchelf ]; + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + ''; + preFixup = '' + lib=$out/lib/esci/libesci-interpreter-gt-f720.so + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $lib + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" + ''; + hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; + }; + + meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; + }; +}; +in + + + +let fwdir = symlinkJoin { + name = "esci-firmware-dir"; + paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; +}; +in +let iscan-data = stdenv.mkDerivation rec { + name = "iscan-data-${version}"; + version = "1.39.0-1"; + + src = fetchurl { + url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz"; + sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1"; + }; + + buildInputs = [ + libxslt + ]; + + meta = common_meta; +}; +in +stdenv.mkDerivation rec { + name = "iscan-${version}"; + version = "2.30.3-1"; + + src = fetchurl { + url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz"; + sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li"; + }; + + buildInputs = [ + pkgconfig + gtk2 + libxml2 + libtool + libusb + sane-backends + makeWrapper + ]; + + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch"; + sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd"; + }) + ./firmware_location.patch + ]; + patchFlags = "-p0"; + + configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"]; + + postConfigure = '' + echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h + ''; + + postInstall = '' + mkdir -p $out/etc/sane.d + cp backend/epkowa.conf $out/etc/sane.d + echo "epkowa" > $out/etc/sane.d/dll.conf + ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data + ''; + postFixup = '' + # iscan-registry is a shell script requiring getopt + wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin + registry=$out/bin/iscan-registry; + '' + + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' + plugin=${value}; + ${value.passthru.registrationCommand} + '') plugins); + meta = common_meta // { + description = "sane-epkowa backend for some epson scanners."; + longDescription = '' + Includes gui-less iscan (aka. Image Scan! for Linux). + Supported hardware: at least : + '' + + stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins); + }; +} diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch new file mode 100644 index 000000000000..7f67d9cf4579 --- /dev/null +++ b/pkgs/misc/drivers/epkowa/firmware_location.patch @@ -0,0 +1,19 @@ +Explanation: +in libesci-interpreter-gt-f720.so in +libesci_interpreter_gt_f720_342::libesci_interpreter_gt_f720_348 at 0xdf74: the +binary blob esfw8b.bin is searched either in /usr/share/esci/ or in +$ESCI_FIRMWARE_DIR. But since this library is to be used wia libsane.so in +every binary in the system, we can't wrapProgram the relevant executables to +set this environment variable. Instead, we patch iscan to set this variable +before loading libesci-interpreter-gt-f720.so. +--- backend/channel-usb.c.orig 2017-08-14 11:24:27.669582456 +0200 ++++ backend/channel-usb.c 2017-08-14 11:31:40.509010897 +0200 +@@ -169,6 +169,8 @@ + { + SANE_Status s; + ++ setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1); ++ + s = sanei_usb_open (self->name, &self->fd); + + if (SANE_STATUS_GOOD == s) diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 0ed6f5dfe190..605161903550 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -18,7 +18,7 @@ in buildInputs = [ cups ]; meta = with stdenv.lib; { - homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + homepage = http://download.ebz.epson.net/dsc/search/01/search/; description = "ESC/P-R Driver (generic driver)"; longDescription = '' Epson Inkjet Printer Driver (ESC/P-R) for Linux and the diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index e53ddf7143b3..0bd40721c4ed 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.11"; + name = "gutenprint-5.2.13"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "1yadw96rgp1z0jv1wxrz6cds36nb693w3xlv596xw9r5w394r8y1"; + sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; - homepage = http://sourceforge.net/projects/gimp-print/; + homepage = https://sourceforge.net/projects/gimp-print/; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index cb78bd3498a9..492488f675f2 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "https://github.com/donovan6000/M3D-Linux"; + homepage = https://github.com/donovan6000/M3D-Linux; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index 5b8f88218ff1..f6ddc61b5157 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; + homepage = http://www.openprinting.org/driver/Postscript-Lexmark/; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 6c1ee05b7657..4dc0f2591d82 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -45,6 +45,6 @@ in maintainers = [ maintainers.simonvandel ]; platforms = platforms.unix; license = licenses.unfree; - homepage = "http://support.sundtek.com/index.php/topic,1573.0.html"; + homepage = http://support.sundtek.com/index.php/topic,1573.0.html; }; } diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 1cf52368d62d..cc5d57ab6f9c 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ preConfigure = "cd src"; meta = { - homepage = "http://atari800.sourceforge.net/"; + homepage = http://atari800.sourceforge.net/; description = "An Atari 8-bit emulator"; longDescription = '' Atari800 is the emulator of Atari 8-bit computer systems and diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 526ea25a04ed..f4b4db497e2d 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { microsoft windows experience. Bsod displays the famous windows xp blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; - homepage = "http://www.vanheusden.com/bsod/"; + homepage = http://www.vanheusden.com/bsod/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index e39e52850395..e0fe451ce24d 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,8 +1,8 @@ { callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }: let pkg = import ./base.nix { - version = "3.0.1"; + version = "3.1.0"; pkgName = "image-analyzer"; - pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682"; + pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index 3a5850e10e95..ec4341a29459 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,12 @@ { callPackage, pythonPackages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.0.3"; + version = "3.1.0"; pkgName = "cdemu-client"; - pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9"; + pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ]; + buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + intltool makeWrapper ]; drvParams = { postFixup = '' wrapProgram $out/bin/cdemu \ diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index ef58ff7f58fc..587224e71d78 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao }: +{ callPackage, glib, libao, intltool }: let pkg = import ./base.nix { - version = "3.0.5"; + version = "3.1.0"; pkgName = "cdemu-daemon"; - pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i"; + pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ]; + buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 835a690eb697..d6c85c53b421 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,9 +1,9 @@ { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.0.2"; + version = "3.1.0"; pkgName = "gcdemu"; - pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p"; + pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; }; inherit (pythonPackages) python pygobject3; in callPackage pkg { diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index c9ba589cf2ae..3813ceef6115 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }: +{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: let pkg = import ./base.nix { - version = "3.0.5"; + version = "3.1.0"; pkgName = "libmirage"; - pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2"; + pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; }; in callPackage pkg { - buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ]; + buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index c1692e1b9a83..7ec83959e38d 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20161009"; + version = "20170610"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd"; + sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a Virtual (SCSI) HBA"; - homepage = "http://cdemu.sourceforge.net/about/vhba/"; + homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; licenses = licenses.gpl2Plus; }; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix new file mode 100644 index 000000000000..97f61e452ff2 --- /dev/null +++ b/pkgs/misc/emulators/citra/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }: + +stdenv.mkDerivation rec { + name = "citra-2017-07-26"; + + # Submodules + src = fetchgit { + url = "https://github.com/citra-emu/citra"; + rev = "a724fb365787718f9e44adedc14e59d0854905a6"; + sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 qtbase boost curl gtest ]; + cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ]; + + preConfigure = '' + # Trick configure system. + sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do + mkdir "$path/.git" + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://citra-emu.org/; + description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games."; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index feb474a13765..561f14b5554f 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.davidviner.com/dlx.php"; + homepage = http://www.davidviner.com/dlx.php; description = "DLX Simulator"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ed44ea593119..31e22240c3b4 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,12 +4,12 @@ , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20170705"; + name = "dolphin-emu-20170730"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "29cc009706f133aac39ebaa7003d37555b926109"; - sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz"; + rev = "141fb0f03ca4e0d05f7ccbf3e020997097f60dbe"; + sha256 = "1b4ygrfj1dpmyv7qqfnqrrvm96a3b68cwcnvv2pknrcpc17g52im"; }; cmakeFlags = '' diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix new file mode 100644 index 000000000000..95d03c425e35 --- /dev/null +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }: + +let revision = "4025"; + revisionDate = "2017-07-02"; + revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a"; +in stdenv.mkDerivation rec { + name = "dosbox-unstable-${revisionDate}"; + + src = fetchsvn { + url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk"; + rev = revision; + sha256 = revisionSha; + }; + + hardeningDisable = [ "format" ]; + + buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ]; + + desktopItem = makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + comment = "x86 emulator with internal DOS"; + desktopName = "DOSBox (SVN)"; + genericName = "DOS emulator"; + categories = "Application;Emulator;"; + }; + + postInstall = '' + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = { + homepage = http://www.dosbox.com/; + description = "A DOS emulator"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ binarin ]; + }; +} diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 57a5591f93a2..9f33305ae143 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = "http://emulationstation.org"; + homepage = http://emulationstation.org; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 1206bdefcb19..ed241de5b273 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib SDL cmake ]; meta = { - homepage = "http://hatari.tuxfamily.org/"; + homepage = http://hatari.tuxfamily.org/; description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b1495987e613..936378b05d66 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "102"; + version = "103"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj"; + sha256 = "0xj2k5g1zyl71hk3kwaixk1axbi6s9kqq31c702rl7qkljv6lfp6"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { make compiler=c++ -C higan ''; + # Now the cheats file will be distributed separately installPhase = '' install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps install -m 755 icarus/out/icarus $out/bin/ @@ -42,8 +43,6 @@ stdenv.mkDerivation rec { install -m 644 higan/data/higan.desktop $out/share/applications/ install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/data/cheats.bml $out/share/higan/ cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ higan/systems/* $out/share/higan/ ''; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { cat < $out/bin/higan-init.sh #!${stdenv.shell} - cp --update $out/share/higan/cheats.bml \$HOME/.config/ cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ EOF @@ -68,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a Nintendo multi-system emulator. + Higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); @@ -77,7 +75,7 @@ stdenv.mkDerivation rec { - NEC's PC Engine, SuperGrafx; - Bandai' WonderSwan, WonderSwan Color. ''; - homepage = http://byuu.org/higan/; + homepage = https://byuu.org/higan/; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 611cc84325c1..ac11b574ca11 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec{ installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; meta = { - homepage = "http://www.ppsspp.org/"; + homepage = http://www.ppsspp.org/; description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 7256120aa929..c2ec16081e86 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -33,7 +33,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = "http://www.libretro.com/"; + homepage = https://www.libretro.com/; license = licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 348b52dd492e..9fb90875b976 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { passthru = { inherit pkgArches; }; meta = { inherit version platforms; - homepage = "http://www.winehq.org/"; + homepage = http://www.winehq.org/; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 3ea16a2db682..0d0f9f21bf2a 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "2.0.1"; + version = "2.0.2"; url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz"; - sha256 = "10qm0xxqzvl4y3mhvaxcaacrcs8d5kdz5wf0gbxpmp36wnm4xyvc"; + sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -24,23 +24,23 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.6.4"; + version = "4.7.0"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi"; + sha256 = "18d5djnsb70740xs475jg1xsjsrq6zzjv0dmjq3vi7nbv56lg63n"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.11"; + version = "2.15"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0g6cwjyqwc660w33453aklh3hpc0b8rrb88dryn23ah6wannvagg"; + sha256 = "1cv890khg5zqk844y12daw2ql4vk4garnqfk273hiyw1pw650bfq"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0crv7hl39as0pjbi8ldws611izccdnss4hca4pgbz5cc80bki9gw"; + sha256 = "0psdkhf4gn4nkpp2fvwy0b2a0s5b6wgf40vlbdf6ii45kj59mn7f"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index ae94c3de41b2..6f3957379e53 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { preConfigure = '' cd src sed -i "/^STRIP/d" configure + sed -i "/\$STRIP/d" configure ''; configureFlags = [ "--enable-release" ]; diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix deleted file mode 100644 index 6d0222207944..000000000000 --- a/pkgs/misc/freestyle/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer -, swig, python }: - -stdenv.mkDerivation { - name = "freestyle-2.2.0"; - - src = fetchurl { - url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2; - sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga"; - }; - - buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ]; - - inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri - - buildPhase = '' - export PYTHON_VERSION=2.5 - cd src/system && qmake -makefile PREFIX=\$out && cd .. - cd rendering && qmake -makefile PREFIX=\$out && cd .. - qmake -makefile PREFIX=\$out && make - cd swig && make -f Makefile - cd ../.. - - hide=$out/nix-support/hide - moddir=$out/share/freestyle - mkdir -p $out/bin $moddir $hide - cp -r style_modules $moddir - cp build/lib/*.so* $hide - cp build/Freestyle $hide - cp -r build/linux-g++/debug/lib/python $hide/pylib - cat > $out/bin/Freestyle << EOF - #!/bin/sh - echo use export PYTHONPATH to add your py files to the search path - echo the style modules can be loded from directory $moddir - echo starting Freestyle know - have fun - echo -e "\n\n\n\n" - export PYTHONPATH=$PYTHONPATH:$moddir/style_modules:$hide/pylib - LD_LIBRARY_PATH=$hide - $hide/Freestyle - EOF - chmod +x $out/bin/Freestyle - ''; - - patches = ./patch; - - installPhase = ":"; - - meta = { - description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; - homepage = http://freestyle.sourceforge.net; - license = stdenv.lib.licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch deleted file mode 100644 index dae1b66f9bbd..000000000000 --- a/pkgs/misc/freestyle/patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -U3 -r a/src/Config.pri b/src/Config.pri ---- a/src/Config.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/Config.pri 2008-06-08 03:50:16.000000000 +0200 -@@ -80,11 +80,11 @@ - win32:QMAKE_CXXFLAGS *= /GR /GX - win32:QMAKE_CFLAGS *= /GR /GX - irix-n32:QMAKE_CFLAGS *= -LANG:std --irix-n32:QMAKE_CXXFLAGS *= -LANG:std --linux-g++:QMAKE_CFLAGS *= -Wno-deprecated --linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32 -+QMAKE_CXXFLAGS *= -LANG:std -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC - mac:QMAKE_CFLAGS *= -Wno-deprecated - mac:QMAKE_CXXFLAGS *= -Wno-deprecated - -diff -U3 -r a/src/geometry/Grid.h b/src/geometry/Grid.h ---- a/src/geometry/Grid.h 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/geometry/Grid.h 2008-06-06 22:05:52.000000000 +0200 -@@ -321,7 +321,7 @@ - for (OccludersSet::iterator it = occluders.begin(); - it != occluders.end(); - it++) { -- if ((unsigned)(*it)->userdata2 != _timestamp) { -+ if ((unsigned long)(*it)->userdata2 != _timestamp) { - (*it)->userdata2 = (void*)_timestamp; - visitor.examineOccluder(*it); - } -diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri ---- a/src/libconfig.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/libconfig.pri 2008-06-07 22:23:44.000000000 +0200 -@@ -1,110 +1,32 @@ - # This file should be viewed as a -*- mode: Makefile -*- - --contains( CONFIG, 3ds1.20 ) { - message ("Using 3ds 1.2.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.2.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.2.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0 -- win32:debug: LIBS *= lib3ds-120sd.lib -- win32:release: LIBS *= lib3ds-120s.lib --} -- --contains( CONFIG, 3ds1.30 ) { -- message ("Using 3ds 1.3.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.3.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.3.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0 -- win32:debug: LIBS *= lib3ds-1_3d.lib -- win32:release: LIBS *= lib3ds-1_3.lib --} -+ INCLUDEPATH *= $(lib3ds)/include -+ LIBS *= -L$(lib3ds)/lib -l3ds - - contains( CONFIG, qglviewer ) { - message ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer -- win32: INCLUDEPATH *= $(HOME)\INCLUDE -- win32: QMAKE_LIBDIR *= $(HOME)\LIB -- win32: LIBS *= QGLViewer.lib -+ INCLUDEPATH *= $(mesa)/include -+ LIBS *= -L$(mesa)/lib -lQGLViewer -+ LIBS *= -lQGLViewer - } - --contains( CONFIG, python2.3) { -- message ("Using python 2.3 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.3 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX -- win32: INCLUDEPATH *= C:\python23\include -- win32: QMAKE_LIBDIR *= C:\python23\libs -- win32: LIBS *= python23.lib --} -- --contains( CONFIG, python2.4) { -- message ("Using python 2.4 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.4 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.4 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.4/config -lpython2.4 -- win32: INCLUDEPATH *= C:\python24\include -- win32: QMAKE_LIBDIR *= C:\python24\libs -- win32: LIBS *= python24.lib --} -- --contains( CONFIG, python2.5) { -- message ("Using python 2.5 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.5 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX -- mac: INCLUDEPATH *= /usr/include/python2.5 -- mac: LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.5 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- win32: INCLUDEPATH *= C:\python25\include -- win32: QMAKE_LIBDIR *= C:\python25\libs -- win32: LIBS *= python25.lib --} -+message ("Using python ${PYTHON_VERSION} module") -+INCLUDEPATH *= ${python}/include/python${PYTHON_VERSION} -+LIBS *= -lpthread -lm -lutil -+LIBS *= -L${python}/lib -lpython${PYTHON_VERSION} -L$(HOME)/LIB/LINUX - - - contains( CONFIG, glut) { - message ("Using glut module") -- linux-g++:LIBS *= -lglut -lXi -- cygwin-g++:LIBS *= -lglut -lXi -- mac: LIBS *= -framework Glut -- win32:INCLUDEPATH *= C:\include -- win32: QMAKE_LIBDIR *= C:\lib\glut -- win32: LIBS *= glut32.lib -+ INCLUDEPATH *= ${freeglut}/include -+ LIBS *= -lglut -lXi -L{freeglut}/lib - } - - contains( CONFIG, qglviewer2 ) { -- message ("Using QGLViewer module") -+ MESSAGE ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- mac: LIBS *= -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer2 -- win32: INCLUDEPATH *= C:\include\QGLViewer\2.2.5 -- win32{ -- release{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\release -- } -- debug{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\debug -- } -- } -- win32: LIBS *= QGLViewer2.lib -+ INCLUDEPATH *= $(libqglviewer)/include -+ LIBS *= -L$(libqglviewer)/lib -lQGLViewer - } -diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile ---- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/swig/Makefile 2008-06-08 01:17:31.000000000 +0200 -@@ -19,14 +19,15 @@ - LIBDIR = ../../build/${PLATEFORM}/${BUILD}/lib/python - IPATH = -I../geometry -I../image -I../scene_graph -I../stroke \ - -I../system -I../view_map -I../winged_edge \ -- -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN} -+ -I${python}/include/python${PYTHON_VERSION} - # options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic - #OPTI = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686 - DBUG = #-ggdb #-pg - WARN = -w #-W -Wall #-pedantic -ansi - --CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} --LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -+CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} -fPIC -+LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -L${python}/lib -+ - - SWIG_SRC = Freestyle.i - PY_SRC = ${SWIG_SRC:.i=.py} diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 285a5b4ee497..524121a898e3 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; enableParallelBuilding = true; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; }; meta = { - homepage = "http://www.ghostscript.com/"; + homepage = https://www.ghostscript.com/; description = "PostScript interpreter (mainline version)"; longDescription = '' diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 62c734859d5b..52f288deba33 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = "http://jackaudio.org"; + homepage = http://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu wkennington ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 4250efcb6a29..28ce85bd8a3f 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = "http://jackaudio.org"; + homepage = http://jackaudio.org; license = "GPL"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index ec2fc975b339..2b555978edc3 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32"; + sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix deleted file mode 100644 index 6357c4e6f905..000000000000 --- a/pkgs/misc/misc.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ pkgs, stdenv } : - -let inherit (pkgs) stdenv runCommand perl lib; - -in - -{ - - # description see mergeAttrsByVersion in lib/misc.nix - versionedDerivation = name: version: attrsByVersion: base: - pkgs.stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion name version attrsByVersion base); - - /* - Usage example creating a derivation installing ruby, sup and a lib: - - packageOverrides = { - rubyCollection = collection { - name = "ruby"; - list = let l = rubyPackages; in - [ pkgs.ruby l.chronic l.sup ]; - }; - } - */ - collection = {list, name} : runCommand "collection-${name}" {} '' - mkdir -p $out/nix-support - echo ${builtins.toString list} > $out/nix-support/propagated-user-env-packages - ''; - - /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name} - then you can - ln -s ~/.nix-profile/cdt-envs/name ./nix-deps - and add .nix-deps/{libs,includes} to IDE's such as Eclipse/ Netbeans etc. - To update replace library versions just replace the symlink - */ - cdtEnv = { name, buildInputs }: - stdenv.mkDerivation { - name = "cdt-env-${name}"; - inherit buildInputs; - phases = "installPhase"; - installPhase = '' - set -x - # requires bash4 - PATH=$PATH:${pkgs.pkgconfig}/bin - - perlScript=$(dirname $(dirname ${builtins.getEnv "NIXPKGS_ALL"}))/build-support/buildenv/builder.pl - # now collect includes and lib paths - - # probably the nix hooks work best, so reuse them by reading NIX_CFLAGS_COMPILE and NIX_LDFLAGS - - PKG_CONFIG_KNOWN_PACKAGES=$(pkg-config --list-all | sed 's/ .*//') - - declare -A INCLUDE_PATHS - declare -A LIB_PATHS - declare -A LIBS - declare -A CFLAGS_OTHER - - PKG_CONFIG_LIBS="$(pkg-config --libs $PKG_CONFIG_KNOWN_PACKAGES)" - PKG_CONFIG_CFLAGS="$(pkg-config --cflags $PKG_CONFIG_KNOWN_PACKAGES)" - - for i in $NIX_CFLAGS_COMPILE $PKG_CONFIG_CFLAGS; do - echo i is $i - case $i in - -I*) INCLUDE_PATHS["''${i/-I/}"]= ;; - *) CFLAGS_OTHER["''${i}"]= ;; - esac - echo list is now ''${!INCLUDE_PATHS[@]} - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - case $i in - -L*) - LIB_PATHS["''${i/-L/}"]= ;; - esac - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - echo chekcing $i - case $i in - -l*) LIBS["''${i}"]= ;; - esac; - done - - # build output env - - target="$out/cdt-envs/${name}" - - link(){ - echo "link !!!!" - echo $1 - echo $2 - ( - export out="$1" - export paths="$2" - - export ignoreCollisions=1 - export manifest= - export pathsToLink=/ - ${perl}/bin/perl $perlScript - ) - } - - mkdir -p $target/{include,lib} - link $target/lib "$(echo "''${!LIB_PATHS[@]}")" - link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")" - echo "''${!LIBS[@]}" > $target/libs - echo "''${!CFLAGS_OTHER[@]}" > $target/cflags-other - echo "''${PKG_CONFIG_PATH}" > $target/PKG_CONFIG_PATH - echo "''${PATH}" > $target/PATH - ''; - }; - - - # build a debug version of a package - debugVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-ggdb -O0"; - CXXFLAGS="-ggdb -O0"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -ggdb -O0" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); - - # build an optimized ersion of a package but with symbols and source - symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-g -O2"; - CXXFLAGS="-g -O2"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -g -O2" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); -} diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 6f2ebbc51581..f05073469b73 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,27 +2,30 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20150418"; + date = "20170720"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "69b547602d965733d415f877eb59d05966bd158d"; - sha256 = "0lv2ng5qxzcq0vwbl61dbwigv79sin4zg90y9cgsz6ydvm4ncpas"; + rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; + sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; }; + PAM_DEFAULT_SERVICE = "login"; + configureFlags = [ "--enable-pam" "--enable-hash" "--enable-xrender" "--enable-imlib2" ]; + buildInputs = [ pkgconfig autoreconfHook libX11 pam libgcrypt libXrender imlib2 ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/Arkq/alock; description = "Simple screen lock application for X server"; longDescription = '' @@ -31,10 +34,10 @@ stdenv.mkDerivation rec { the X server is unlocked and the user can continue to work. alock does not provide any fancy animations like xlock or - xscreensaver and never will. Its just for locking the current + xscreensaver and never will. It's just for locking the current X session. ''; - platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + platforms = with platforms; allBut cygwin; + maintainers = with maintainers; [ ftrvxmtrx chris-martin ]; }; } diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 048740bfed29..6c8b722fce92 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { 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"; + homepage = https://github.com/Ma27/i3lock-pixeled; license = licenses.mit; platform = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 9393a978b071..8539db5e0027 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/pipeseroni/pipes.sh"; + homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cd437bfe452b..b69e3ab5faff 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = "http://www.jwz.org/xscreensaver/"; + homepage = http://www.jwz.org/xscreensaver/; description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = with stdenv.lib.platforms; allBut cygwin; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 4404d5d6fec7..6ce337855d99 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { - version = "5.0.7"; + version = "6.1.0"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670"; + sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ]; propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' - sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh ./autogen.sh ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec meta = { - homepage = "https://github.com/haiwen/seafile"; + 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; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index ff0e92d5b0e9..a86cfd48d54a 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,31 +1,48 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.90.0.125"; - - meta = with stdenv.lib; { - description = "An adaptive GTK+ theme based on Material Design"; - homepage = "https://github.com/tista500/Adapta"; - license = with licenses; [ gpl2 cc-by-sa-30 ]; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; + version = "3.91.2.10"; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "0abww5rcbn478w2kdhjlf68bfj8yf8i02nlmrjpp7j1v14r32xr0"; + sha256 = "0bp5fnxgrrrs0ajqw2lbhbarbpvzvajnvcjip6fkl9aa76gz9czy"; }; preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook pkgconfig parallel sassc inkscape libxml2 glib.dev ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + parallel + sassc + inkscape + libxml2 + glib.dev + gnome3.gnome_shell + ]; - buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ]; + buildInputs = [ + gdk_pixbuf + librsvg + gtk-engine-murrine + ]; postPatch = "patchShebangs ."; - configureFlags = "--disable-unity"; + configureFlags = [ + "--disable-gtk_legacy" + "--disable-gtk_next" + "--disable-unity" + ]; + + meta = with stdenv.lib; { + description = "An adaptive Gtk+ theme based on Material Design"; + homepage = https://github.com/tista500/Adapta; + license = with licenses; [ gpl2 cc-by-sa-30 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; } diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix index 965ee82a8263..14fe0f21d80e 100644 --- a/pkgs/misc/themes/albatross/default.nix +++ b/pkgs/misc/themes/albatross/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; - homepage = http://shimmerproject.org/our-projects/albatross/; + homepage = https://github.com/shimmerproject/Albatross; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 523ac16bf6a2..544642bc014b 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = "https://github.com/horst3180/arc-theme"; + homepage = https://github.com/horst3180/arc-theme; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ simonvandel romildo ]; diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 17aa60162ad6..dbc0beb1872b 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; - homepage = http://github.com/shimmerproject/Blackbird; + homepage = https://github.com/shimmerproject/Blackbird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix index ac0fb2cfee7d..73e9ea604d77 100644 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ b/pkgs/misc/themes/gnome-breeze/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; - homepage = "https://github.com/dirruk1/gnome-breeze"; + homepage = https://github.com/dirruk1/gnome-breeze; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix new file mode 100644 index 000000000000..a56f67b8df45 --- /dev/null +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + version = "2017-04-24"; + name = "numix-sx-gtk-theme-${version}"; + + src = fetchurl { + url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; + sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + install -dm 755 "$out/share/themes/" + cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/" + ''; + + meta = { + description = "Gray variation of Numix theme"; + homepage = https://www.gnome-look.org/p/1117412/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.sauyon ]; + }; +} diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix index 32883127c064..8bcb48812a3e 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; - homepage = "http://snwh.org/paper"; + homepage = https://snwh.org/paper; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.simonvandel maintainers.romildo ]; diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 491885a14b3f..cee459134991 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -4,20 +4,23 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; version = "${gnome3.version}.${date}"; date = { - "3.20" = "2017-02-09"; - "3.22" = "2017-02-17"; + "3.20" = "2017-05-03"; + "3.22" = "2017-04-23"; + "3.24" = "2017-06-26"; }."${gnome3.version}"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = { - "3.20" = "b9106c3c05012b7e91394819ca550def3357d2eb"; - "3.22" = "fc3cf7c372bcc439870c4785f91b8ea7af73e1cc"; + "3.20" = "ce7ae498df7d5c81acaf48ed957b9f828356d58c"; + "3.22" = "e97f2c3cf75b5205bc5ecd6072696327169fde5d"; + "3.24" = "d25e0a2fb6e08ad107d8bb627451433362f2a830"; }."${gnome3.version}"; sha256 = { - "3.20" = "03k18p25gsscv05934vs0py26vpcrx93wi5bj6di277c6kwgjzxg"; - "3.22" = "02ppk8wsx0k7j3zgmcb1l8jgij0m5rdkrahfv884jxkyjr6wwgs5"; + "3.20" = "0na81q9mc8kwn9m04kkcchrdr67087dqf3q155imhjgqrxjhh3w4"; + "3.22" = "195v0d2sgqh92c104xqm00p68yxp6kzp5mzx8q7s36bdv9p972q4"; + "3.24" = "0z5swi5aah3s4yinfglh491qydxgjkqwf6zxyz7k9c1d7lrvj3ww"; }."${gnome3.version}"; }; @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A selection of themes for GTK3, gnome-shell and more"; - homepage = "https://github.com/lassekongo83/zuki-themes"; + homepage = https://github.com/lassekongo83/zuki-themes; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a3e4f12cd892..a69bf2ceac7b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -51,7 +51,7 @@ let }; meta = with stdenv.lib; { - homepage = "http://www.denx.de/wiki/U-Boot/"; + homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 1523010b6d70..cd105793a9ad 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -224,11 +224,11 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-06-30"; + name = "The_NERD_tree-2017-07-17"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90"; - sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm"; + rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6"; + sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk"; }; dependencies = []; @@ -284,11 +284,11 @@ rec { }; clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2017-06-03"; + name = "clang_complete-2017-07-15"; src = fetchgit { url = "git://github.com/Rip-Rip/clang_complete"; - rev = "c963df1cd10463166e1245445bff27f28e89f9f7"; - sha256 = "1y7zx3ywir86mxgg86kb8z7xmxadcmv8ycc2i1y8s7jz6pv2v40l"; + rev = "c41eea05317526a4ddd3bd389f3723390b196d4d"; + sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j"; }; dependencies = []; # In addition to the arguments you pass to your compiler, you also need to @@ -363,23 +363,12 @@ rec { }; - forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "forms-2012-11-28"; - src = fetchgit { - url = "git://github.com/megaannum/forms"; - rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; - sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; - }; - dependencies = ["self"]; - - }; - fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-06-08"; + name = "fugitive-2017-07-12"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "be2ff98db543990d7e59a90189733d7a779788fd"; - sha256 = "1lkdypibsw2p45wrdcc8ambynszdcwiqyh50zhflf2slpd98iz3m"; + rev = "913fff1cea3aa1a08a360a494fa05555e59147f5"; + sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd"; }; dependencies = []; @@ -441,11 +430,11 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-07-05"; + name = "deoplete-nvim-2017-07-22"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "376b0c9bbdd30e51a253319ff63762165f30d41a"; - sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9"; + rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036"; + sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2"; }; dependencies = []; @@ -474,11 +463,11 @@ rec { }; vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2017-07-04"; + name = "vim-closetag-2017-07-24"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8"; - sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k"; + rev = "2cacc501df30586c0f96f40f24d1a1239529198c"; + sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg"; }; dependencies = []; @@ -496,11 +485,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-07-08"; + name = "clighter8-2017-07-23"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b"; - sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7"; + rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1"; + sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh"; }; dependencies = []; preFixup = '' @@ -510,11 +499,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-07-07"; + name = "neomake-2017-07-25"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe"; - sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x"; + rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6"; + sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh"; }; dependencies = []; @@ -554,11 +543,11 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2017-06-20"; + name = "vim-tmux-navigator-2017-07-07"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6"; - sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby"; + rev = "d724094e7128acd7375cc758008f1e1688130877"; + sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw"; }; dependencies = []; @@ -576,22 +565,22 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-07-04"; + name = "ctrlp-vim-2017-07-18"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "b9b334b7ee07f03bbbc46193bb544124bd430148"; - sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4"; + rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9"; + sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2017-03-18"; + name = "agda-vim-2017-07-18"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "7f00093e485f07aa1daafa71e85306397c059402"; - sha256 = "1yc1lhzir440jmv5aivhvn3bgxncz7p0vydla6mrf14gw6fqbp12"; + rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8"; + sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa"; }; dependencies = []; @@ -642,11 +631,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2017-06-17"; + name = "neco-ghc-2017-07-22"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc"; - rev = "ea515ae60a0523539fe75680f07aa2a588de9a99"; - sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w"; + rev = "1c7bf1b544f295d066863b9f193de709aec5bbad"; + sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb"; }; dependencies = []; @@ -675,22 +664,22 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-05-18"; + name = "vim-elixir-2017-07-19"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "fe7daaaff030e217dffedf53cb5f426099281e3e"; - sha256 = "09jqbymwf1m0c0wdsq93nryapzjw0fx0hwzzwxvwxygvnx3nvf22"; + rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06"; + sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb"; }; dependencies = []; }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2017-02-27"; + name = "elm-vim-2017-07-09"; src = fetchgit { url = "https://github.com/elmcast/elm-vim"; - rev = "b47d013d1fdfecc9e19df8034439b8e379813696"; - sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw"; + rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d"; + sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp"; }; dependencies = []; @@ -741,11 +730,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-07-06"; + name = "vim-go-2017-07-25"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "f08fcab5c51bee18174340405b773a950446e9f5"; - sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa"; + rev = "76cd99db6a88e825f361df0043cbff777c4a14fb"; + sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l"; }; dependencies = []; @@ -763,22 +752,22 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2017-02-08"; + name = "floobits-neovim-2017-07-25"; src = fetchgit { url = "https://github.com/floobits/floobits-neovim"; - rev = "9755412fcd68cfc76a36aa000682a84d96013650"; - sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1"; + rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd"; + sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4"; }; dependencies = []; }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-07-05"; + name = "psc-ide-vim-2017-07-14"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "22813d6222766d773e77fadf36ee5eed4162ece4"; - sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i"; + rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186"; + sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p"; }; dependencies = []; @@ -829,11 +818,11 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-07-02"; + name = "calendar-vim-2017-07-08"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638"; - sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4"; + rev = "6d6be26b2ad1870658525e2a42046429c845516c"; + sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz"; }; dependencies = []; @@ -972,11 +961,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-07-01"; + name = "fzf-vim-2017-07-24"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417"; - sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb"; + rev = "685f9aae97072a190a1230a5c79692e15b7f46c9"; + sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh"; }; dependencies = []; @@ -1049,22 +1038,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-07-06"; + name = "vimtex-2017-07-25"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98"; - sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f"; + rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b"; + sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2017-04-27"; + name = "vim-easymotion-2017-07-14"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion"; - rev = "d55e7bf515eab93e0b49f6f762bf5b0bf808264d"; - sha256 = "1dqx8nrw8jcpdnnqmca6yl1y0fdlc64rz9msbsmvp502v98wvhnh"; + rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50"; + sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd"; }; dependencies = []; @@ -1129,6 +1118,28 @@ rec { }; + forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "forms-2012-11-28"; + src = fetchgit { + url = "https://github.com/megaannum/forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + dependencies = ["self"]; + + }; + + self = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "self-2014-05-28"; + src = fetchgit { + url = "https://github.com/megaannum/self"; + rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; + sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-startify-2017-06-15"; src = fetchgit { @@ -1162,6 +1173,20 @@ rec { }; + vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-yapf-2017-03-21"; + src = fetchgit { + url = "https://github.com/mindriot101/vim-yapf"; + rev = "324380d77c9cf8e46e22b2e4391702273a53f563"; + sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw"; + }; + dependencies = []; + buildPhase = '' + substituteInPlace ftplugin/python_yapf.vim \ + --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"' + ''; + }; + lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "lushtags-2017-04-19"; src = fetchgit { @@ -1207,11 +1232,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2017-04-03"; + name = "haskell-vim-2017-07-18"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "9811f3803317c4f39c868e71b3202b5559735aef"; - sha256 = "02f87lfpr5lslh57cqimg91llflra8934jzy0g32l5zcm7fdljdk"; + rev = "21c48768f1c5986d4f2351784b119eb9a5f925db"; + sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h"; }; dependencies = []; @@ -1284,11 +1309,11 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-05-20"; + name = "vim-racer-2017-07-19"; src = fetchgit { url = "https://github.com/racer-rust/vim-racer"; - rev = "92c3e2b57e60c3d4f0102d1d587ddc762e662f60"; - sha256 = "0wf74ilkkqjm6s3r329i9w2jgnh5kd2jkswan3bvqc5g14a2ddhl"; + rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869"; + sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw"; }; dependencies = []; @@ -1328,33 +1353,33 @@ rec { }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2017-06-01"; + name = "rust-vim-2017-07-14"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "b77ac8ecbd4baaa23cca612e1c9b3df5ea23da9b"; - sha256 = "07qkyils4dgl81lqifx0pr075m3mdpzifp1w5d0zw4zkpvb0v8nk"; + rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02"; + sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-07-06"; + name = "neoformat-2017-07-22"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af"; - sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra"; + rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9"; + sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf"; }; dependencies = []; }; deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-rust-2017-06-28"; + name = "deoplete-rust-2017-07-18"; src = fetchgit { url = "https://github.com/sebastianmarkow/deoplete-rust"; - rev = "505735576e29d30fee5074a9a49fdeb989c632b2"; - sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm"; + rev = "0a86e502113910c33448b337c4d50cabea120d25"; + sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; }; dependencies = []; @@ -1372,22 +1397,22 @@ rec { }; neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-04-25"; + name = "neco-vim-2017-07-23"; src = fetchgit { url = "https://github.com/shougo/neco-vim"; - rev = "2329ad0a20af61ac104a29d3653e5af24add7077"; - sha256 = "1mf7xdlarwj2kfx3pbngrvfrzmbjp6k5f6bxl4n1wz9p7wdajap8"; + rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e"; + sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-06-24"; + name = "neocomplete-vim-2017-07-23"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "186881fc40d9b774766a81189af17826d27406c2"; - sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5"; + rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c"; + sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y"; }; dependencies = []; @@ -1405,11 +1430,11 @@ rec { }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-06-24"; + name = "neosnippet-vim-2017-07-15"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "867149c56651f0958bfde1f56e203f90afba134d"; - sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml"; + rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39"; + sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7"; }; dependencies = []; @@ -1427,11 +1452,11 @@ rec { }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-08-06"; + name = "vimproc-vim-2017-07-22"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim"; - rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0"; - sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20"; + rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639"; + sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr"; }; dependencies = []; buildInputs = [ which ]; @@ -1467,11 +1492,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2017-04-21"; + name = "alchemist-vim-2017-07-23"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "12d9d8b9a8875d0edb75c3d91d4f8f04f3558fb7"; - sha256 = "0xg1yixs8p4f2sghbh204p8b10m1zb3xxi4jwiqrrw4jhprh8g4f"; + rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb"; + sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58"; }; dependencies = []; @@ -1533,11 +1558,11 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2017-06-23"; + name = "vim-dispatch-2017-07-12"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "ca10dc106a5a3684573a3841560b167f4b86fde1"; - sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69"; + rev = "14a1695f844a320dd28a7706710325773d1046a8"; + sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp"; }; dependencies = []; @@ -1599,11 +1624,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-07-07"; + name = "youcompleteme-2017-07-24"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "d299f9eb708ec83713f904dbb49c4260b6b22240"; - sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0"; + rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c"; + sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc"; }; dependencies = []; buildPhase = '' @@ -1625,11 +1650,11 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-06-24"; + name = "vim-airline-themes-2017-07-10"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d"; - sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn"; + rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6"; + sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229"; }; dependencies = []; @@ -1778,6 +1803,17 @@ rec { }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ale-2017-07-23"; + src = fetchgit { + url = "https://github.com/w0rp/ale"; + rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280"; + sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h"; + }; + dependencies = []; + + }; + vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-wakatime-2017-07-03"; src = fetchgit { @@ -1846,7 +1882,7 @@ rec { sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -1856,11 +1892,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-06-11"; + name = "deoplete-jedi-2017-07-16"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "b7e789ef8b45b207650adb1af5e2e7f188053fe1"; - sha256 = "0xv7ggwyl332yr93rqmf1li0zz8rzhgb10cvd78jssdvlazi3mc8"; + rev = "56528fd1238bbf2f9363f16710d0936703dc9eab"; + sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb"; }; dependencies = []; @@ -1943,17 +1979,6 @@ rec { }; - self = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "self-2014-05-28"; - src = fetchgit { - url = "git://github.com/megaannum/self"; - rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; - sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; - }; - dependencies = []; - - }; - sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sensible-2017-05-09"; src = fetchgit { @@ -1966,11 +1991,11 @@ rec { }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-05-28"; + name = "sleuth-2017-07-23"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "fc5cf44466d50fada784530de933af80c6448db5"; - sha256 = "10l6ins66g1wxwzgjcpwim0295yz9ni282f8n7vjafd5v486fxnw"; + rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3"; + sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9"; }; dependencies = []; @@ -2273,11 +2298,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-07-07"; + name = "vim-airline-2017-07-21"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151"; - sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3"; + rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288"; + sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096"; }; dependencies = []; @@ -2339,11 +2364,11 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-06-22"; + name = "vim-latex-live-preview-2017-07-19"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3"; - sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m"; + rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5"; + sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps"; }; dependencies = []; @@ -2372,11 +2397,11 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2017-06-06"; + name = "vim-signify-2017-07-19"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "d9918a69bcff382569ddf5bda030aff412bfd790"; - sha256 = "1kc7q8xsvg0hl9b3z5a6phfndx7a5pcfy1d3q7i02aaa8dw4ga7j"; + rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4"; + sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm"; }; dependencies = []; @@ -2416,11 +2441,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-04-15"; + name = "vimwiki-2017-07-15"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af"; - sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h"; + rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6"; + sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index da5c1d62a2f9..608e14ef9468 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,7 +1,6 @@ "CSApprox" "CheckAttach" "Gist" -"gruvbox" "Hoogle" "Solarized" "Supertab" @@ -16,8 +15,8 @@ "YankRing" "clang_complete" "commentary" -"ctrlp-py-matcher" "ctrlp-cmatcher" +"ctrlp-py-matcher" "ctrlp-z" "extradite" "fugitive" @@ -27,8 +26,8 @@ "github:LnL7/vim-nix" "github:Quramy/tsuquyomi" "github:Shougo/deoplete.nvim" -"github:albfan/nerdtree-git-plugin" "github:ajh17/Spacegray.vim" +"github:albfan/nerdtree-git-plugin" "github:alvan/vim-closetag" "github:ap/vim-css-color" "github:bbchung/clighter8" @@ -45,6 +44,7 @@ "github:dleonard0/pony-vim-syntax" "github:dracula/vim" "github:eagletmt/neco-ghc" +"github:editorconfig/editorconfig-vim" "github:eikenb/acp" "github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" @@ -57,6 +57,7 @@ "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" "github:google/vim-jsonnet" +"github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" @@ -67,6 +68,7 @@ "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" +"github:jiangmiao/auto-pairs" "github:jistr/vim-nerdtree-tabs" "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" @@ -85,14 +87,18 @@ "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" "github:martinda/Jenkinsfile-vim-syntax" +"github:megaannum/forms" +"github:megaannum/self" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" +"github:mindriot101/vim-yapf" "github:mkasa/lushtags" "github:mpickering/hlint-refactor-vim" "github:nathanaelkane/vim-indent-guides" "github:nbouscal/vim-stylish-haskell" "github:neovimhaskell/haskell-vim" +"github:nixprime/cpsm" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-watchdogs" "github:plasticboy/vim-markdown" @@ -102,8 +108,8 @@ "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" "github:rust-lang/rust.vim" -"github:sebastianmarkow/deoplete-rust" "github:sbdchd/neoformat" +"github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" "github:shougo/neco-vim" "github:shougo/neocomplete.vim" @@ -134,20 +140,22 @@ "github:vim-scripts/Rename" "github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/a.vim" -"github:vim-scripts/argtextobj.vim" "github:vim-scripts/align" +"github:vim-scripts/argtextobj.vim" "github:vim-scripts/changeColorScheme.vim" "github:vim-scripts/random.vim" "github:vim-scripts/tabmerge" "github:vim-scripts/wombat256.vim" +"github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" "github:zah/nim.vim" -"github:zchee/deoplete-jedi" "github:zchee/deoplete-go" +"github:zchee/deoplete-jedi" "goyo" +"gruvbox" "matchit.zip" "pathogen" "quickfixstatus" @@ -196,7 +204,3 @@ "vimwiki" "vinegar" "vundle" -"github:jiangmiao/auto-pairs" -"github:editorconfig/editorconfig-vim" -"github:heavenshell/vim-jsdoc" -"github:nixprime/cpsm" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t index 57aa35999dc7..5c96e11de7a7 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t @@ -1,6 +1,6 @@ - buildInputs = [ perl ruby ]; + buildInputs = [ perl ruby git ]; buildPhase = '' pushd ruby/command-t - gem build command-t.gemspec + gem build ./command-t.gemspec popd ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf new file mode 100644 index 000000000000..63b54b22e0e0 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf @@ -0,0 +1,4 @@ + buildPhase = '' + substituteInPlace ftplugin/python_yapf.vim \ + --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"' + ''; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix new file mode 100644 index 000000000000..d357c43abd85 --- /dev/null +++ b/pkgs/misc/vscode-extensions/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl, vscode-utils }: + +let + inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension; +in +# +# Unless there is a good reason not to, we attemp to use the same name as the +# extension's unique identifier (the name the extension gets when installed +# from vscode under `~/.vscode`) and found on the marketplace extension page. +# So an extension's attribute name should be of the form: +# "${mktplcRef.publisher}.${mktplcRef.name}". +# +rec { + bbenoist.Nix = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Nix"; + publisher = "bbenoist"; + version = "1.0.1"; + sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix new file mode 100644 index 000000000000..f6e906ab575b --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchurl, runCommand, vscode, unzip }: + +let + extendedPkgVersion = lib.getVersion vscode; + extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name; + + mktplcExtRefToFetchArgs = ext: { + url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; + sha256 = ext.sha256; + # The `*.vsix` file is in the end a simple zip file. Change the extension + # so that existing `unzip` hooks takes care of the unpacking. + name = "${ext.publisher}-${ext.name}.zip"; + }; + + buildVscodeExtension = a@{ + name, + namePrefix ? "${extendedPkgName}-extension-", + src, + # Same as "Unique Identifier" on the extension's web page. + # For the moment, only serve as unique extension dir. + vscodeExtUniqueId, + configurePhase ? ":", + buildPhase ? ":", + dontPatchELF ? true, + dontStrip ? true, + buildInputs ? [], + ... + }: + stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { + + name = namePrefix + name; + + inherit vscodeExtUniqueId; + inherit configurePhase buildPhase dontPatchELF dontStrip; + + buildInputs = [ unzip ] ++ buildInputs; + + installPhase = '' + mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}" + find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" + ''; + + }); + + + fetchVsixFromVscodeMarketplace = mktplcExtRef: + fetchurl((mktplcExtRefToFetchArgs mktplcExtRef)); + + buildVscodeMarketplaceExtension = a@{ + name ? "", + src ? null, + mktplcRef, + ... + }: assert "" == name; assert null == src; + buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // { + name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; + src = fetchVsixFromVscodeMarketplace mktplcRef; + vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; + }); + + mktplcRefAttrList = [ + "name" + "publisher" + "version" + "sha256" + ]; + + mktplcExtRefToExtDrv = ext: + buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { + mktplcRef = ext; + }); + + extensionsFromVscodeMarketplace = mktplcExtRefList: + builtins.map mktplcExtRefToExtDrv mktplcExtRefList; + +in + +{ + inherit fetchVsixFromVscodeMarketplace buildVscodeExtension + buildVscodeMarketplaceExtension extensionsFromVscodeMarketplace; +} \ No newline at end of file diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries index 00aaba1d4982..494426eba6dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries @@ -19,7 +19,7 @@ /usr/lib/system/libsystem_configuration.dylib /usr/lib/system/libsystem_coreservices.dylib -/usr/lib/system/libsystem_coretls.dylib +# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 /usr/lib/system/libsystem_dnssd.dylib /usr/lib/system/libsystem_info.dylib 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 ff9073157a58..ed76787a9008 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 @@ -376,7 +376,6 @@ _fsync _fsync$NOCANCEL _ftruncate _futimes -_get_dp_control_port _getattrlist _getattrlistat _getattrlistbulk @@ -838,7 +837,6 @@ _sendmsg$NOCANCEL _sendmsg_x _sendto _sendto$NOCANCEL -_set_dp_control_port _setattrlist _setaudit _setaudit_addr diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 9fdb00d66be9..515471007527 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -108,8 +108,8 @@ let }; meta = { - homepage = "http://www.opensource.apple.com/source/cctools/"; - description = "Mac OS X Compiler Tools (cross-platform port)"; + homepage = http://www.opensource.apple.com/source/cctools/; + description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; }; }; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index f56c8148317d..175e9738ef9e 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -18,6 +18,11 @@ * x86_64-apple-darwin14 | x86_64 | true */ +# Apple uses somewhat non-standard names for this. We could fall back on +# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and +# likely to fail. Better just to require something manual. +assert targetPlatform ? arch; + let prefix = targetPlatform.config; diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index f5bfe890735c..1684c0e92ced 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Mach-O loader for Linux"; - homepage = "https://github.com/shinh/maloader"; + homepage = https://github.com/shinh/maloader; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 1cd7f2bf9d6e..4b32697c6ae2 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Cross platform port of the OS X CoreFoundation"; - homepage = "http://sourceforge.net/projects/opencflite/"; + description = "Cross platform port of the macOS CoreFoundation"; + homepage = http://sourceforge.net/projects/opencflite/; license = stdenv.lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 6944d2b8b437..5a89940c9dae 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Command line interface to Mac OS X keychains and Security framework"; + description = "Command line interface to macOS keychains and Security framework"; maintainers = with maintainers; [ copumpkin joelteon diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix index c5f7e3acce7e..f0af0f6ba553 100644 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -4,7 +4,7 @@ * This is needed to build GCC on Darwin. * * These are the collection of headers that would normally be available under - * /usr/include in OS X machines with command line tools installed. They need + * /usr/include in macOS machines with command line tools installed. They need * to be in one folder for gcc to use them correctly. */ diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2a48590154e4..d3a9ec012ebf 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "https://developer.apple.com/downloads/"; + homepage = https://developer.apple.com/downloads/; description = "Apple's XCode SDK"; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 65223a32bad6..fe8c0b65bb73 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchgit, fetchpatch, kernel }: stdenv.mkDerivation { name = "acpi-call-${kernel.version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation { sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75"; }; + patches = [ + (fetchpatch { + url = "https://github.com/mkottman/acpi_call/pull/67.patch"; + sha256 = "0z07apvdl8nvl8iwfk1sl1iidfjyx12fc0345bmp2nq1537kpbri"; + }) + ]; + hardeningDisable = [ "pic" ]; preBuild = '' diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index b815cd778fa4..6dae0f6bb38b 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = http://sourceforge.net/projects/acpiclient/; + homepage = https://sourceforge.net/projects/acpiclient/; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 9b2a984f3ae1..ce47932587cf 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; - homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; + homepage = https://sourceforge.net/projects/acpitool/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix index 93d77819e57a..d04e7b8fbeb0 100644 --- a/pkgs/os-specific/linux/alienfx/default.nix +++ b/pkgs/os-specific/linux/alienfx/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { prePatch = '' substituteInPlace Makefile --replace /usr/ $out/ - substituteInPlace Makefile --replace "install -o root -g root" "install" + substituteInPlace Makefile --replace "install -o root -g root -m 4755" "install -m 555" ''; - + patches = [./unistd.patch]; buildInputs = [ libusb1 ]; makeFlags = "build"; @@ -28,10 +28,10 @@ stdenv.mkDerivation { ''; installTargets = "install"; postInstall = ''cp alienfx.1 $out/man/man1''; - + meta = { description = "Controls AlienFX lighting"; - homepage = "https://github.com/tibz/alienfx"; + homepage = https://github.com/tibz/alienfx; maintainers = [stdenv.lib.maintainers.tomberek]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 55f62e6073f0..562a46d22109 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/M0Rf30/android-udev-rules"; + homepage = https://github.com/M0Rf30/android-udev-rules; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 5d1f14bfec6b..e433deff90c6 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.7.6"; + name = "audit-2.7.7"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs"; + sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq"; }; outputs = [ "bin" "dev" "out" "man" "plugins" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; - homepage = "http://people.redhat.com/sgrubb/audit/"; + homepage = http://people.redhat.com/sgrubb/audit/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 7b800fe6f4f5..9105f635ae93 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.1"; + ver = "2017.2"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq"; + sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index c34c7746b909..7ea8cf6d1bf6 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.1"; + ver = "2017.2"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq"; + sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8a96279c66be..4514e18f44f5 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2017.1"; in +let base = "batman-adv-2017.2"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "05cck0mlg8xsvbra69x6i25xclsq1xc49dggxq81gi086c14h67c"; + sha256 = "0krr6waxkmms23cacfzngddxy1vq577s54wy2fgx6lyb4579g1yl"; }; hardeningDisable = [ "pic" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 88242df76d4d..24686e73e23a 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -25,17 +25,19 @@ stdenv.mkDerivation rec { mv $out/share/bcc/man $out/share/ for f in $out/share/bcc/tools\/*; do - ln -s $f $out/bin/$(basename $f) - wrapProgram $f \ - --prefix LD_LIBRARY_PATH : $out/lib \ - --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ - --prefix PYTHONPATH : :${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages + if [ -x $f ]; then + ln -s $f $out/bin/$(basename $f) + wrapProgram $f \ + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ + --prefix PYTHONPATH : ${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages + fi done ''; meta = with stdenv.lib; { description = "Dynamic Tracing Tools for Linux"; - homepage = "https://iovisor.github.io/bcc/"; + homepage = https://iovisor.github.io/bcc/; license = licenses.asl20; maintainers = with maintainers; [ ragge ]; }; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 4d4a51b984a5..eb5d2a31e83a 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "http://sourceforge.net/projects/bridge/"; - homepage = "http://www.linux-foundation.org/en/Net:Bridge/"; + homepage = http://www.linux-foundation.org/en/Net:Bridge/; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 2723e662b797..3143968d75c8 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { ./linux-4.8.patch # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl ./linux-4.11.patch + # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl + ./linux-4.12.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch new file mode 100644 index 000000000000..8abc73db4db1 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch @@ -0,0 +1,68 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index da36405..d3741eb 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR; + #endif + + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, struct vif_params *params); ++#else + enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, ++#else + enum nl80211_iftype type, u32 *flags, ++#endif + struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); +@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_bss *bss; ++ struct wlc_ssid *ssid; ++ ssid = &wl->profile->ssid; ++ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, ++ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); ++ struct cfg80211_roam_info roam_info = { ++ .bss = bss, ++ .req_ie = conn_info->req_ie, ++ .req_ie_len = conn_info->req_ie_len, ++ .resp_ie = conn_info->resp_ie, ++ .resp_ie_len = conn_info->resp_ie_len, ++ }; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); +@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); + cfg80211_roamed(ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ &roam_info, ++#else + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, + #endif + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, +- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, ++#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 5447f13abc4c..ee897fc37813 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -27,11 +27,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.27.0"; + name = "busybox-1.27.2"; + # Note to whoever is updating busybox: please verify that: + # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test + # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1kcr0jvik0c31ls4f3li359xv7w0b60hv64fknj28bwlkdgbvpx5"; + sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; @@ -83,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; - homepage = http://busybox.net/; + homepage = https://busybox.net/; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 99cb7d264fec..6ef5476f8e83 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Local network file caching management daemon"; - homepage = "https://people.redhat.com/dhowells/fscache/"; + homepage = https://people.redhat.com/dhowells/fscache/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 9da2b755fd5c..78575899ff16 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; - homepage = "https://github.com/linux-can/can-utils"; + homepage = https://github.com/linux-can/can-utils; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 46b5fcb0bf94..4ffd8fadd121 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,25 +1,27 @@ { fetchurl, stdenv, kernel, onlyHeaders ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.8"; + pname = "cryptodev-linux-1.9"; name = "${pname}-${kernel.version}"; src = fetchurl { - url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"; - sha256 = "0xhkhcdlds9aiz0hams93dv0zkgcn2abaiagdjlqdck7zglvvyk7"; + urls = [ + "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" + "http://download.gna.org/cryptodev-linux/${pname}.tar.gz" + ]; + sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; }; hardeningDisable = [ "pic" ]; KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; INSTALL_MOD_PATH = "\${out}"; - PREFIX = "\${out}"; + prefix = "\${out}"; meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.9"; }; } diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix new file mode 100644 index 000000000000..3dd63cf02e49 --- /dev/null +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, fetchFromGitHub, meson, ninja, pkgconfig +, dbus, glib, systemd }: + +stdenv.mkDerivation rec { + name = "dbus-broker-${version}"; + version = "3"; + + src = fetchFromGitHub { + owner = "bus1"; + repo = "dbus-broker"; + rev = "v${version}"; + sha256 = "1f2vw5b2cbdgd3g7vnzwr9lsw9v4xc5nc0nf9xc3qb5xqzsq7v7i"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ dbus glib systemd ]; + + prePatch = '' + substituteInPlace meson.build \ + --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \ + --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')" "'$out/lib/systemd/user'" + ''; + + preConfigure = '' + mkdir build + meson --prefix "$out" --buildtype=release build/ + ''; + + buildPhase = "ninja -C build"; + + installPhase = '' + ninja -C build install + install -Dm644 README $out/share/doc/dbus-broker/README + ''; + + checkPhase = "ninja -C build test"; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Linux D-Bus Message Broker"; + homepage = https://github.com/bus1/dbus-broker/wiki; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 17450f36daac..4cee9678a9b6 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple program to read/write from/to any location in memory"; - homepage = "http://lartmaker.nl/lartware/port/"; + homepage = http://lartmaker.nl/lartware/port/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 1f923b9567a4..1f513786063c 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -48,6 +48,6 @@ in stdenv.mkDerivation rec { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.unfree; - homepage = "http://www.displaylink.com/"; + homepage = http://www.displaylink.com/; }; } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index cd561df0ec41..47dc42fed5ee 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18"; stdenv.mkDerivation rec { name = "dpdk-${version}-${kernel.version}"; - version = "16.07.2"; + version = "17.05.1"; src = fetchurl { url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876"; + sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; buildInputs = [ pkgconfig libvirt ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { install -m 0755 -d $out/${RTE_TARGET}/include install -m 0644 ${RTE_TARGET}/include/rte_config.h $out/${RTE_TARGET}/include - cp -pr mk scripts $out/ + cp -pr mk $out/ mkdir -p $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net cp ${RTE_TARGET}/kmod/*.ko $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index ea17c287a292..38ef803d8e52 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; - homepage = "http://e1000.sf.net/"; + homepage = http://e1000.sf.net/; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index b24099f95991..0f8826ecf8dc 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -25,13 +25,11 @@ stdenv.mkDerivation { postInstall = '' wrapProgram "$out/sbin/edac-ctl" \ - --set PATH : "" \ - --prefix PATH : "${dmidecode}/bin" \ - --prefix PATH : "${kmod}/bin" + --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]} ''; meta = with stdenv.lib; { - homepage = http://github.com/grondo/edac-utils; + homepage = https://github.com/grondo/edac-utils; description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 54ca7d9e324f..9e61c377ecf9 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = ''http://www.gentoo.org/proj/en/eudev/''; + homepage = ''https://www.gentoo.org/proj/en/eudev/''; downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; updateWalker = true; }; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 150534c9b957..064af708427b 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Extensible Virtual Display Interface"; platforms = platforms.linux; license = licenses.gpl2; - homepage = "http://www.displaylink.com/"; + homepage = http://www.displaylink.com/; broken = !versionAtLeast kernel.version "3.16"; }; } diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index fa2939e947e5..ee6249ce0408 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,21 +1,18 @@ { stdenv, lib, fetchFromGitHub, kernel }: -# Upstream build for kernel > 4.10 is currently broken -# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103 -assert lib.versionOlder kernel.version "4.10"; # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2017-01-03"; + version = "2017-06-19"; src = fetchFromGitHub { owner = "dorimanx"; repo = "exfat-nofuse"; - rev = "8d291f5"; - sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9"; + rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523"; + sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index 5cc875f5c90a..5fdcfa583827 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ubuntu FAN network support enablement"; - homepage = "https://launchpad.net/ubuntu/+source/ubuntu-fan"; + homepage = https://launchpad.net/ubuntu/+source/ubuntu-fan; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/ffado/build-fix.patch b/pkgs/os-specific/linux/ffado/build-fix.patch deleted file mode 100644 index b63fd65184ad..000000000000 --- a/pkgs/os-specific/linux/ffado/build-fix.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index ca5d5cf..76738e3 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -354,7 +354,7 @@ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and co - env['PYUIC4'] = True - build_mixer = True - --if conf.CheckForApp( 'xdg-desktop-menu --help' ): -+if conf.CheckForApp( 'which xdg-desktop-menu' ): - env['XDG_TOOLS'] = True - else: - print """ -diff --git a/support/dbus/SConscript b/support/dbus/SConscript -index 2b0f0c6..23069d8 100644 ---- a/support/dbus/SConscript -+++ b/support/dbus/SConscript -@@ -44,6 +44,7 @@ if not env.GetOption( "clean" ): - env.MergeFlags( env['LIBXML26_FLAGS'] ) - else: - env.PrependUnique( LIBS=["expat"] ) -+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) - - env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml') - env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml') -diff --git a/support/firmware/SConscript b/support/firmware/SConscript -index 2939cb0..307b295 100644 ---- a/support/firmware/SConscript -+++ b/support/firmware/SConscript -@@ -36,6 +36,7 @@ if not env.GetOption( "clean" ): - env.MergeFlags( env['LIBXML26_FLAGS'] ) - else: - env.PrependUnique( LIBS=["expat"] ) -+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) - - static_env = env.Clone() - -diff --git a/support/tools/SConscript b/support/tools/SConscript -index 651621d..01b11f4 100644 ---- a/support/tools/SConscript -+++ b/support/tools/SConscript -@@ -36,6 +36,7 @@ if not e.GetOption( "clean" ): - e.MergeFlags( env['LIBXML26_FLAGS'] ) - else: - e.PrependUnique( LIBS=["expat"] ) -+ e.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) - - # - # For the the ffado-diag tools -diff --git a/tests/SConscript b/tests/SConscript -index 307341f..4800b93 100644 ---- a/tests/SConscript -+++ b/tests/SConscript -@@ -35,6 +35,7 @@ if not env.GetOption( "clean" ): - env.MergeFlags( env['LIBXML26_FLAGS'] ) - else: - env.PrependUnique( LIBS=["expat"] ) -+ env.MergeFlags( "-DSERIALIZE_USE_EXPAT" ) - - static_env = env.Clone() - diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index ff259dcfbb05..1ca503f33ecd 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python -, expat, libraw1394, libconfig, libavc1394, libiec61883 +, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx, glibmm # Optional dependencies , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { name = "${prefix}ffado-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz"; + sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq"; }; nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { expat libraw1394 libconfig libavc1394 libiec61883 ] ++ stdenv.lib.optionals (!libOnly) [ optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4 - optXdg_utils + optXdg_utils libxmlxx glibmm ]; - patches = [ ./build-fix.patch ]; + patches = [ ./gcc6.patch ]; postPatch = '' # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { src/libutil/serialize_expat.cpp ''; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)" + ''; + # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR buildPhase = '' export PYDIR=$out/lib/${python.libPrefix}/site-packages diff --git a/pkgs/os-specific/linux/ffado/gcc6.patch b/pkgs/os-specific/linux/ffado/gcc6.patch new file mode 100644 index 000000000000..f9cad9c88abd --- /dev/null +++ b/pkgs/os-specific/linux/ffado/gcc6.patch @@ -0,0 +1,19 @@ +Author: Adrian Knoth +Forwarded: Yes +Applied-Upstream: 2.3.1 +Last-Update: 2016-08-11 +Description: Fix FTBFS with gcc6 + +Index: b/src/ffadotypes.h +=================================================================== +--- a/src/ffadotypes.h ++++ b/src/ffadotypes.h +@@ -51,6 +51,8 @@ struct ffado_handle { + }; + + ++#include ++#include + #include + #include + diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 1bbe8dbb160b..9230e6920f96 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.44.10"; + version="0.9.48"; name="${baseName}-${version}"; - hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; - url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz"; - sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; + hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz"; + sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; }; buildInputs = [ which @@ -21,6 +21,13 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; + prePatch = '' + # Allow whitelisting ~/.nix-profile + substituteInPlace etc/firejail.config --replace \ + '# follow-symlink-as-user yes' \ + 'follow-symlink-as-user no' + ''; + preConfigure = '' sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .) sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .) @@ -36,7 +43,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://l3net.wordpress.com/projects/firejail/"; + homepage = https://l3net.wordpress.com/projects/firejail/; downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix new file mode 100644 index 000000000000..b60ce6f1b4af --- /dev/null +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "openelec-dvb-firmware-${version}"; + version = "0.0.51"; + + src = fetchurl { + url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz"; + sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + DESTDIR="$out" ./install + find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + ''; + + meta = with stdenv.lib; { + description = "DVB firmware from OpenELEC"; + homepage = https://github.com/OpenELEC/dvb-firmware; + license = licenses.unfreeRedistributableFirmware; + platforms = platforms.linux; + priority = 7; + }; +} diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 8a6dfff34704..123a7d9395da 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20170427"; + version = "1.20170515"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl"; + sha256 = "0liy0p69p9yr5cqgrfc23d3n243xkrx889gc8yqd9m2jpns4s361"; }; dontStrip = true; # Stripping breaks some of the binaries diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 6a987dc9f5b5..d69d54af96c3 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.01.17"; + version = "0.02.00"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w"; + sha256 = "07df2lb32lbr2ggi84h9pjy6ig18n2961ksji4x1hhb4cvc175dg"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index fa63cddfcdb9..0f0eab1fa202 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; - homepage = http://sourceforge.net/projects/hdparm/; + homepage = https://sourceforge.net/projects/hdparm/; platforms = platforms.linux; license = licenses.bsd2; maintainers = [ maintainers.fuuzetsu ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index a330445634ac..b058aa692f0f 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = "--datadir=$(prefix)/data"; meta = { - homepage = "https://github.com/vcrhonek/hwdata"; + homepage = https://github.com/vcrhonek/hwdata; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 6b4841305b31..2f4511bcbc47 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; - homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; + homepage = http://www16.plala.or.jp/mano-a-mano/i810switch.html; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index a58f55abecf3..c3730dd8de50 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; - homepage = "http://sourceforge.net/projects/linux-ima/"; + homepage = https://sourceforge.net/projects/linux-ima/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4ffc99b6ced3..404e21bcbce0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj"; + sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if"; }; patches = lib.optionals enableFan [ diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 466ecb1efee1..e27f380ac3e2 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: # TODO: These tools are supposed to work under NetBSD and FreeBSD as # well, so I guess it's not appropriate to place this expression in @@ -16,8 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ readline openssl flex kerberos pam ]; - patches = [ ./dont-create-localstatedir-during-install.patch - ./CVE-2015-4047.patch ]; + patches = [ + ./dont-create-localstatedir-during-install.patch + ./CVE-2015-4047.patch + (fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b"; + sha256 = "1kf7j2pf1blni52z7q41n0yisqb7gvk01lvldr319zaxxg7rm84a"; + }) + ]; # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; @@ -37,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://ipsec-tools.sourceforge.net/"; + homepage = http://ipsec-tools.sourceforge.net/; description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 1b6be8e4aa1b..dd5770744bf7 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , libsysfs, gnutls, openssl -, libcap, sp, docbook_sgml_dtd_31 +, libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -18,13 +18,15 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile + sed -e s/sgmlspl/sgmlspl.pl/ \ + -e s/nsgmls/onsgmls/ \ + -i doc/Makefile ''; makeFlags = "USE_GNUTLS=no"; buildInputs = [ - libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle + libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle ]; buildFlags = "man all ninfod"; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 7c3947539029..26cedf41a5a9 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { - name = "irqbalance-1.1.0"; + name = "irqbalance-${version}"; + version = "1.2.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; - rev = "a23de3c455b88060620d102f6946b1d8be9e2680"; - sha256 = "06yq5k5v9wiwajqcjkbkk46g212qx78x323bygnyqshc5s25mp2x"; + rev = "v${version}"; + sha256 = "1xznxjbjzg6sds3fymdq9rk3g4cgq7xj7rz3dwbqqjqvd3k2nxw6"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ncurses libcap_ng ]; - preConfigure = '' - ./autogen.sh - ''; + LDFLAGS = "-lncurses"; meta = { homepage = https://github.com/Irqbalance/irqbalance; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 0700191e7a89..6a0706106625 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { - Asynchronous background rendering of the next page - Customizable multi-threaded caching ''; - homepage = http://seasonofcode.com/pages/jfbview.html; + homepage = https://seasonofcode.com/pages/jfbview.html; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index c8775eee48c6..6b79045ac67d 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl }: let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - sourceRoot = "Jool-${sourceAttrs.version}.zip/usr"; + sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; buildInputs = [ autoreconfHook pkgconfig libnl ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 824bc3f9a186..37dd4d727ec2 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, kernel }: +{ stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.11"; +assert stdenv.lib.versionOlder kernel.version "4.13"; let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 2de2aeeff8fa..ace103a92f91 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,11 @@ -{ fetchzip }: +{ fetchFromGitHub }: rec { - version = "3.5.3"; - src = fetchzip { - url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp"; + version = "3.5.4"; + src = fetchFromGitHub { + owner = "NICMx"; + repo = "Jool"; + rev = "v${version}"; + sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5"; }; } diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 8ccaaa663043..8e9f29306e74 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ linuxHeaders ]; meta = { - homepage = "http://code.google.com/p/jujuutils/"; + homepage = http://code.google.com/p/jujuutils/; description = "Utilities around FireWire devices connected to a Linux computer"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch deleted file mode 100644 index aefc20ff9140..000000000000 --- a/pkgs/os-specific/linux/kbd/console-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/loadkeys.c b/src/loadkeys.c -index 6b23f68..adf65a0 100644 ---- a/src/loadkeys.c -+++ b/src/loadkeys.c -@@ -166,10 +166,10 @@ main(int argc, char *argv[]) - exit(EXIT_FAILURE); - } - -- /* get console */ -- fd = getfd(console); -- - if (!(options & OPT_M) && !(options & OPT_B)) { -+ /* get console */ -+ fd = getfd(console); -+ - /* check whether the keyboard is in Unicode mode */ - if (ioctl(fd, KDGKBMODE, &kbd_mode) || - ioctl(fd, KDGETMODE, &kd_mode)) { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 6e8893cc37d6..b97f48af414a 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }: +{ stdenv, fetchurl, autoreconfHook, + gzip, bzip2, pkgconfig, flex, check, + pam, coreutils +}: stdenv.mkDerivation rec { name = "kbd-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; - sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs"; + sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; configureFlags = [ @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { "--disable-nls" ]; - patches = [ ./console-fix.patch ./search-paths.patch ]; + patches = [ ./search-paths.patch ]; postPatch = '' @@ -34,6 +37,14 @@ stdenv.mkDerivation rec { ''} ''; + postInstall = '' + for i in $out/bin/unicode_{start,stop}; do + substituteInPlace "$i" \ + --replace /usr/bin/tty ${coreutils}/bin/tty + done + ''; + + buildInputs = [ check pam ]; nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch index 66a56041481c..c9405a56721d 100644 --- a/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -1,77 +1,71 @@ -diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l ---- kbd-2.0.3-old/src/libkeymap/analyze.l 2016-07-03 02:31:28.258958092 +0300 -+++ kbd-2.0.3/src/libkeymap/analyze.l 2016-07-03 02:44:53.042592223 +0300 -@@ -99,6 +99,9 @@ +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan static const char *const include_dirpath0[] = { "", 0 }; static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 }; static const char *const include_dirpath3[] = { -+ "/etc/kbd/" KEYMAPDIR "/include/", -+ "/etc/kbd/" KEYMAPDIR "/i386/include/", -+ "/etc/kbd/" KEYMAPDIR "/mac/include/", ++ "/etc/kbd/" KEYMAPDIR "/include/", ++ "/etc/kbd/" KEYMAPDIR "/i386/include/", ++ "/etc/kbd/" KEYMAPDIR "/mac/include/", DATADIR "/" KEYMAPDIR "/include/", DATADIR "/" KEYMAPDIR "/i386/include/", DATADIR "/" KEYMAPDIR "/mac/include/", 0 -diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c ---- kbd-2.0.3-old/src/loadkeys.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/loadkeys.c 2016-07-03 02:34:34.123871103 +0300 -@@ -26,7 +26,7 @@ +--- a/src/loadkeys.c ++++ b/src/loadkeys.c +@@ -27,7 +27,7 @@ #include "keymap.h" - static const char *progname = NULL; + static const char *progname = NULL; -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; - static void __attribute__ ((noreturn)) -diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c ---- kbd-2.0.3-old/src/loadunimap.c 2016-07-03 02:31:28.259958091 +0300 -+++ kbd-2.0.3/src/loadunimap.c 2016-07-03 02:33:06.803911971 +0300 -@@ -28,7 +28,7 @@ + static void __attribute__((noreturn)) +--- a/src/loadunimap.c ++++ b/src/loadunimap.c +@@ -30,7 +30,7 @@ extern char *progname; extern int force; --static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; -+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 }; +-static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; ++static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 }; static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 }; #ifdef MAIN -diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c ---- kbd-2.0.3-old/src/mapscrn.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/mapscrn.c 2016-07-03 02:33:21.119905270 +0300 -@@ -25,7 +25,7 @@ - static int ctoi (char *); +--- a/src/mapscrn.c ++++ b/src/mapscrn.c +@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil); + static int ctoi(char *); /* search for the map file in these directories (with trailing /) */ --static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; -+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 }; +-static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; ++static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 }; static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 }; #ifdef MAIN -diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c ---- kbd-2.0.3-old/src/resizecons.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/resizecons.c 2016-07-03 02:33:32.253900060 +0300 -@@ -100,7 +100,7 @@ +--- a/src/resizecons.c ++++ b/src/resizecons.c +@@ -101,7 +101,7 @@ static int vga_get_fontheight(void); static void vga_set_cursor(int, int); static void vga_set_verticaldisplayend_lowbyte(int); --const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0}; -+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0}; +-const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0 }; ++const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0}; const char *const suffixes[] = { "", 0 }; - int -diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c ---- kbd-2.0.3-old/src/setfont.c 2016-07-03 02:31:28.260958091 +0300 -+++ kbd-2.0.3/src/setfont.c 2016-07-03 02:33:54.315889734 +0300 -@@ -51,10 +51,10 @@ - int debug = 0; + int main(int argc, char **argv) +--- a/src/setfont.c ++++ b/src/setfont.c +@@ -53,10 +53,10 @@ int force = 0; + int debug = 0; /* search for the font in these directories (with trailing /) */ --const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; -+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 }; +-const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 }; ++const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 }; const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 }; /* hide partial fonts a bit - loading a single one is a bad idea */ --const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; -+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; +-const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; ++const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 }; const char *const partfontsuffixes[] = { "", 0 }; static inline int diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix deleted file mode 100644 index 9457769f5efb..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ /dev/null @@ -1,54 +0,0 @@ -{stdenv, fetchurl, perl, cross ? null}: - -assert cross == null -> stdenv.isLinux; - -let - version = "2.4.37.9"; - kernelHeadersBaseConfig = if cross == null then - stdenv.platform.kernelHeadersBaseConfig - else - cross.platform.kernelHeadersBaseConfig; -in - -stdenv.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.4/linux-${version}.tar.bz2"; - sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g"; - }; - - targetConfig = if cross != null then cross.config else null; - - platform = - if cross != null then cross.platform.kernelArch else - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.isArm then "arm" else - abort "don't know what the kernel include directory is called for this platform"; - - buildInputs = [perl]; - - patchPhase = '' - sed -i s,/bin/pwd,pwd, Makefile - ''; - - extraIncludeDirs = - if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) - else if stdenv.system == "powerpc-linux" then ["ppc"] else []; - - buildPhase = '' - cp arch/$platform/${kernelHeadersBaseConfig} .config - make mrproper symlinks include/linux/{version,compile}.h \ - ARCH=$platform - yes "" | make oldconfig ARCH=$platform - ''; - - installPhase = '' - mkdir -p $out/include - cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ - $out/include - ''; -} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f9cb9e73e776..dfb5d2a43e17 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -97,6 +97,7 @@ with stdenv.lib; MQ_IOSCHED_DEADLINE y ''} ${optionalString (versionAtLeast version "4.12") '' + BFQ_GROUP_IOSCHED y MQ_IOSCHED_KYBER y IOSCHED_BFQ m ''} @@ -167,6 +168,7 @@ with stdenv.lib; BONDING m NET_L3_MASTER_DEV? y NET_FOU_IP_TUNNELS? y + IP_NF_TARGET_REDIRECT m # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -302,7 +304,9 @@ with stdenv.lib; CIFS_UPCALL y CIFS_ACL y CIFS_DFS_UPCALL y - CIFS_SMB2 y + ${optionalString (versionOlder version "4.13") '' + CIFS_SMB2 y + ''} ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y ''} @@ -447,8 +451,11 @@ with stdenv.lib; X86_CHECK_BIOS_CORRUPTION y X86_MCE y - # PCI-Expresscard hotplug support - ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"} + ${optionalString (versionAtLeast version "3.12") '' + HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI + HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support + ''} + # Linux containers. NAMESPACES? y # Required by 'unshare' used by 'nixos-install' @@ -521,27 +528,29 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.13") '' KVM_VFIO y ''} - XEN? y - XEN_DOM0? y - ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' - PCI_XEN? y - HVC_XEN? y - HVC_XEN_FRONTEND? y - XEN_SYS_HYPERVISOR? y - SWIOTLB_XEN? y - XEN_BACKEND? y - XEN_BALLOON? y - XEN_BALLOON_MEMORY_HOTPLUG? y - XEN_EFI? y - XEN_HAVE_PVMMU? y - XEN_MCE_LOG? y - XEN_PVH? y - XEN_PVHVM? y - XEN_SAVE_RESTORE? y - XEN_SCRUB_PAGES? y - XEN_SELFBALLOONING? y - XEN_STUB? y - XEN_TMEM? y + ${optionalString (stdenv.isx86_64 || stdenv.isi686) '' + XEN? y + XEN_DOM0? y + ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' + PCI_XEN? y + HVC_XEN? y + HVC_XEN_FRONTEND? y + XEN_SYS_HYPERVISOR? y + SWIOTLB_XEN? y + XEN_BACKEND? y + XEN_BALLOON? y + XEN_BALLOON_MEMORY_HOTPLUG? y + XEN_EFI? y + XEN_HAVE_PVMMU? y + XEN_MCE_LOG? y + XEN_PVH? y + XEN_PVHVM? y + XEN_SAVE_RESTORE? y + XEN_SCRUB_PAGES? y + XEN_SELFBALLOONING? y + XEN_STUB? y + XEN_TMEM? y + ''} ''} KSM y ${optionalString (!stdenv.is64bit) '' @@ -633,6 +642,10 @@ with stdenv.lib; TEST_USER_COPY? n XZ_DEC_TEST? n + ${optionalString (versionAtLeast version "4.13") '' + TEST_KMOD n + ''} + ${optionalString (versionOlder version "4.4") '' EFI_TEST? n RCU_PERF_TEST? n diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch deleted file mode 100644 index 8f2418c9efce..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 732e993..77f3ddd 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = 1, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index dd7cbb5..42b2dd5 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 77f3ddd..7aafe63 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_free = cpu_cgroup_css_free, -@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = 1, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 42b2dd5..b4d32a6 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -224,6 +224,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ed60562..44eace9 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/crc-regression.patch b/pkgs/os-specific/linux/kernel/crc-regression.patch deleted file mode 100644 index 623713d16a65..000000000000 --- a/pkgs/os-specific/linux/kernel/crc-regression.patch +++ /dev/null @@ -1,24 +0,0 @@ -See https://github.com/NixOS/nixpkgs/issues/6231 - -v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c"). -That's probably because crypto/crc32c.c was renamed to -crypto/crc32c_generic.c in commit -06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through -the cracks when backporting commit -5d26a105b5a73e5635eae0629b42fa0a90e07b7b. - -So the affected kernels (all that backported the "crypto-" prefix -patches) need this additional patch: - -diff --git a/crypto/crc32c.c b/crypto/crc32c.c -index 06f7018c9d95..aae5829eb681 100644 ---- a/crypto/crc32c.c -+++ b/crypto/crc32c.c -@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void) - module_init(crc32c_mod_init); - module_exit(crc32c_mod_fini); - -+MODULE_ALIAS_CRYPTO("crc32c"); - MODULE_AUTHOR("Clay Haapala "); - MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); - MODULE_LICENSE("GPL"); diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index bbe867926927..379d3cad9705 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -103,7 +103,7 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches; + inherit version modDirVersion src kernelPatches stdenv; configfile = configfile.nativeDrv or configfile; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index ba5e538c493a..5711779eb869 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -5,6 +5,8 @@ # Dangerous features that can be permanently (for the boot session) disabled at # boot via sysctl or kernel cmdline are left enabled here, for improved # flexibility. +# +# See also { stdenv, version }: @@ -13,42 +15,8 @@ with stdenv.lib; assert (versionAtLeast version "4.9"); '' -GCC_PLUGINS y # Enable gcc plugin options - -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin -''} - -DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning - -${optionalString (versionAtLeast version "4.10") '' - BUG_ON_DATA_CORRUPTION y # BUG if kernel struct validation detects corruption -''} - -# Additional validation of commonly targetted structures -DEBUG_CREDENTIALS y -DEBUG_NOTIFIERS y -DEBUG_LIST y -DEBUG_SG y - -HARDENED_USERCOPY y # Bounds check usercopy - -# Wipe on free with page_poison=1 -PAGE_POISONING y -PAGE_POISONING_NO_SANITY y -PAGE_POISONING_ZERO y - -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y - -# Stricter /dev/mem -STRICT_DEVMEM y -IO_STRICT_DEVMEM y - -# Disable various dangerous settings -ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory -PROC_KCORE n # Exposes kernel text image layout -INET_DIAG n # Has been used for heap based attacks in the past +# Report BUG() conditions and kill the offending process. +BUG y ${optionalString (stdenv.system == "x86_64-linux") '' DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory @@ -56,8 +24,77 @@ ${optionalString (stdenv.system == "x86_64-linux") '' # Reduce attack surface by disabling various emulations IA32_EMULATION n X86_X32 n + MODIFY_LDT_SYSCALL? n VMAP_STACK y # Catch kernel stack overflows + + # Randomize position of kernel and memory. + RANDOMIZE_BASE y + RANDOMIZE_MEMORY y + + # Disable legacy virtual syscalls by default (modern glibc use vDSO instead). + # + # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism, + # which is supposed to be safer than the native variant (wrt. ret2libc), so + # disabling it mainly helps reduce surface. + LEGACY_VSYSCALL_NONE y ''} +# Safer page access permissions (wrt. code injection). Default on >=4.11. +${optionalString (versionOlder version "4.11") '' + DEBUG_RODATA y + DEBUG_SET_MODULE_RONX y +''} + +# Mark LSM hooks read-only after init. Conflicts with SECURITY_SELINUX_DISABLE +# (disabling SELinux at runtime); hence, SELinux can only be disabled at boot +# via the selinux=0 boot parameter. +${optionalString (versionAtLeast version "4.12") '' + SECURITY_SELINUX_DISABLE n + SECURITY_WRITABLE_HOOKS n +''} + +DEBUG_WX y # boot-time warning on RWX mappings + +# Stricter /dev/mem +STRICT_DEVMEM y +IO_STRICT_DEVMEM y + +# Perform additional validation of commonly targeted structures. +DEBUG_CREDENTIALS y +DEBUG_NOTIFIERS y +DEBUG_LIST y +DEBUG_SG y +SCHED_STACK_END_CHECK y +BUG_ON_DATA_CORRUPTION y + +# Perform usercopy bounds checking. +HARDENED_USERCOPY y + +# Randomize allocator freelists. +SLAB_FREELIST_RANDOM y + +# Wipe higher-level memory allocations on free() with page_poison=1 +PAGE_POISONING y +PAGE_POISONING_NO_SANITY y +PAGE_POISONING_ZERO y + +# Reboot devices immediately if kernel experiences an Oops. +PANIC_ON_OOPS y +PANIC_TIMEOUT -1 + +GCC_PLUGINS y # Enable gcc plugin options + +${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin +''} + +# Disable various dangerous settings +ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory +PROC_KCORE n # Exposes kernel text image layout +INET_DIAG n # Has been used for heap based attacks in the past + +# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. +CC_STACKPROTECTOR_REGULAR n +CC_STACKPROTECTOR_STRONG y '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix deleted file mode 100644 index 9587ba356ff5..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.10.105"; - extraMeta.branch = "3.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix deleted file mode 100644 index 51151b449a4a..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.11.9"; - extraMeta.branch = "4.11"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q60690hmqhz2x3v6qyjq7lhp2j99dcldvd46myc9ggp78d93j1z"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index d4861e1de555..df64bffe80b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,13 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12"; - modDirVersion = "4.12.0"; + version = "4.12.9"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1asq73lq0f81qwv21agcrpc3694fs14sja26q48y936hskn3np54"; + sha256 = "1734l7h9rc8y0gr68ir6j99nf480y56b5i5xb40vkywxbhbkj139"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix deleted file mode 100644 index 5ac5a52c0a5e..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.4.76"; - extraMeta.branch = "4.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "180mngyar7ky2aiaszmgfqpfvwi0kxcym8j3ifflzggwqjkgrrki"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (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 dcd5694ebbce..393ae9d63ad1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.36"; + version = "4.9.45"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1x615q5fl17fqr8h0552l7lzrpmn1n9azmsrnq9xhf980imfj0d0"; + sha256 = "0vb62np19i88nslb24ydwnlhkb4018d247ha4xmn0ncsqy6x3rb6"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 6230911fbeec..9e0c55fed6ed 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -1,15 +1,15 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - version = "4.12"; - revision = "e"; - sha256 = "1zxmfddj3nx8fd4nfxi0sxa3j9byq1dkp05plnknmi45b3ji57zh"; + version = "4.12.8"; + revision = "a"; + sha256 = "03ldbgs4w70q756bl5gsxr2z428njnlslh6293y34r54gz5li9a3"; in import ./generic.nix (args // { version = "${version}-${revision}"; extraMeta.branch = "4.12"; - modDirVersion = "${version}.0"; + modDirVersion = "${version}-hardened"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 0e7f332e6177..f1fabad24fb0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.24"; - tag = "1.20170427"; + modDirVersion = "4.9.28"; + tag = "1.20170515"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9"; + sha256 = "19cjvns6zs53l319k3a2angffr93dh2j9g0022ww6rmi6niq4fkf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix new file mode 100644 index 000000000000..5599e1325d98 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -0,0 +1,23 @@ +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: + +assert stdenv.is64bit; + +import ./generic.nix (args // rec { + version = "4.12.2"; + extraMeta.branch = "4.12-2"; + + src = + let upstream = fetchFromGitHub { + owner = "raphael"; + repo = "linux-samus"; + rev = "v${extraMeta.branch}"; + sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9"; + }; in "${upstream}/build/linux"; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; + + extraMeta.hydraPlatforms = []; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 60dfe85a1606..5bbee02b9aaf 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, ... } @ args: import ./generic.nix (args // rec { - version = "4.12-rc7"; - modDirVersion = "4.12.0-rc7"; - extraMeta.branch = "4.12"; + version = "4.13-rc6"; + modDirVersion = "4.13.0-rc6"; + extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1svfswv0b4gagv1yiavwb22p726h0w81lgxjqq0h9m3gf4xlqp3x"; + sha256 = "06jdbgihdjmq84d7km43f3w6d3hwmbnv3sgzip3nhx77l14cp7f2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index c295293fa2cc..8227475f1b1a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl +{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl , writeTextFile, ubootChooser , hostPlatform }: @@ -14,6 +14,8 @@ let echo "}" >> $out '').outPath; in { + # Allow overriding stdenv on each buildLinux call + stdenv, # The kernel version version, # The version of the kernel module directory @@ -207,7 +209,7 @@ let + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); license = stdenv.lib.licenses.gpl2; - homepage = http://www.kernel.org/; + homepage = https://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ maintainers.thoughtpolice diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch deleted file mode 100644 index 9f5790862b65..000000000000 --- a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch +++ /dev/null @@ -1,45 +0,0 @@ - -From Yang Shi <> -Subject [PATCH] crypto: rsa - fix a potential race condition in build -Date Fri, 2 Dec 2016 15:41:04 -0800 - - -When building kernel with RSA enabled with multithreaded, the below -compile failure might be caught: - -| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory -| #include "rsapubkey-asn1.h" -| ^ -| compilation terminated. -| CC crypto/rsa-pkcs1pad.o -| CC crypto/algboss.o -| CC crypto/testmgr.o -| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1 -| make[3]: *** Waiting for unfinished jobs.... -| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2 -| make[1]: *** [Makefile:150: sub-make] Error 2 -| make: *** [Makefile:24: __sub-make] Error 2 - -The header file is not generated before rsa_helper is compiled, so -adding dependency to avoid such issue. - -Signed-off-by: Yang Shi - ---- - crypto/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/crypto/Makefile b/crypto/Makefile -index 99cc64a..8db39f9 100644 ---- a/crypto/Makefile -+++ b/crypto/Makefile -@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o - - $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h - $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h -+$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h - clean-files += rsapubkey-asn1.c rsapubkey-asn1.h - clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h - --- -2.0.2 diff --git a/pkgs/os-specific/linux/kernel/no-xsave.patch b/pkgs/os-specific/linux/kernel/no-xsave.patch deleted file mode 100644 index dde96d7dccd4..000000000000 --- a/pkgs/os-specific/linux/kernel/no-xsave.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/arch/x86/xen/enlighten.c -+++ b/arch/x86/xen/enlighten.c -@@ -168,21 +168,23 @@ static void __init xen_banner(void) - xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); - } - -+static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0; -+static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0; -+ - static void xen_cpuid(unsigned int *ax, unsigned int *bx, - unsigned int *cx, unsigned int *dx) - { -+ unsigned maskecx = ~0; - unsigned maskedx = ~0; - - /* - * Mask out inconvenient features, to try and disable as many - * unsupported kernel subsystems as possible. - */ -- if (*ax == 1) -- maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ -- (1 << X86_FEATURE_ACPI) | /* disable ACPI */ -- (1 << X86_FEATURE_MCE) | /* disable MCE */ -- (1 << X86_FEATURE_MCA) | /* disable MCA */ -- (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ if (*ax == 1) { -+ maskecx = cpuid_leaf1_ecx_mask; -+ maskedx = cpuid_leaf1_edx_mask; -+ } - - asm(XEN_EMULATE_PREFIX "cpuid" - : "=a" (*ax), -@@ -190,9 +192,43 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, - "=c" (*cx), - "=d" (*dx) - : "0" (*ax), "2" (*cx)); -+ -+ *cx &= maskecx; - *dx &= maskedx; - } - -+static __init void xen_init_cpuid_mask(void) -+{ -+ unsigned int ax, bx, cx, dx; -+ -+ cpuid_leaf1_edx_mask = -+ ~((1 << X86_FEATURE_MCE) | /* disable MCE */ -+ (1 << X86_FEATURE_MCA) | /* disable MCA */ -+ (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ -+ if (!xen_initial_domain()) -+ cpuid_leaf1_edx_mask &= -+ ~((1 << X86_FEATURE_APIC) | /* disable local APIC */ -+ (1 << X86_FEATURE_ACPI)); /* disable ACPI */ -+ -+ ax = 1; -+ xen_cpuid(&ax, &bx, &cx, &dx); -+ -+ /* cpuid claims we support xsave; try enabling it to see what happens */ -+ if (cx & (1 << (X86_FEATURE_XSAVE % 32))) { -+ unsigned long cr4; -+ -+ set_in_cr4(X86_CR4_OSXSAVE); -+ -+ cr4 = read_cr4(); -+ -+ if ((cr4 & X86_CR4_OSXSAVE) == 0) -+ cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_XSAVE % 32)); -+ -+ clear_in_cr4(X86_CR4_OSXSAVE); -+ } -+} -+ - static void xen_set_debugreg(int reg, unsigned long val) - { - HYPERVISOR_set_debugreg(reg, val); -@@ -903,6 +939,8 @@ asmlinkage void __init xen_start_kernel(void) - - xen_init_irq_ops(); - -+ xen_init_cpuid_mask(); -+ - #ifdef CONFIG_X86_LOCAL_APIC - /* - * set up the basic apic ops. diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 1747d34fe112..e5f430b4d824 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -21,12 +21,6 @@ in rec { - multithreaded_rsapubkey = - { - name = "multithreaded-rsapubkey-asn1.patch"; - patch = ./multithreaded-rsapubkey-asn1.patch; - }; - bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -37,12 +31,6 @@ rec { patch = ./p9-fixes.patch; }; - no_xsave = - { name = "no-xsave"; - patch = ./no-xsave.patch; - features.noXsave = true; - }; - mips_fpureg_emu = { name = "mips-fpureg-emulation"; patch = ./mips-fpureg-emulation.patch; @@ -63,22 +51,6 @@ rec { patch = ./modinst-arg-list-too-long.patch; }; - ubuntu_fan_4_4 = - { name = "ubuntu-fan"; - patch = ./ubuntu-fan-4.4.patch; - }; - - ubuntu_unprivileged_overlayfs = - { name = "ubuntu-unprivileged-overlayfs"; - patch = ./ubuntu-unprivileged-overlayfs.patch; - }; - - tuxonice_3_10 = makeTuxonicePatch { - version = "2013-11-07"; - kernelVersion = "3.10.18"; - sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; - }; - grsecurity_testing = throw '' Upstream has ceased free support for grsecurity/PaX. @@ -87,11 +59,6 @@ rec { for more information. ''; - crc_regression = - { name = "crc-backport-regression"; - patch = ./crc-regression.patch; - }; - genksyms_fix_segfault = { name = "genksyms-fix-segfault"; patch = ./genksyms-fix-segfault.patch; @@ -107,47 +74,8 @@ rec { patch = ./chromiumos-patches/no-link-restrictions.patch; }; - chromiumos_mfd_fix_dependency = - { name = "mfd_fix_dependency"; - patch = ./chromiumos-patches/mfd-fix-dependency.patch; - }; - - hiddev_CVE_2016_5829 = - { name = "hiddev_CVE_2016_5829"; - patch = fetchpatch { - url = "https://sources.debian.net/data/main/l/linux/4.6.3-1/debian/patches/bugfix/all/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch"; - sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy"; - }; - }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - lguest_entry-linkage = - { name = "lguest-asmlinkage.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" - + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; - sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; - }; - }; - - packet_fix_race_condition_CVE_2016_8655 = - { name = "packet_fix_race_condition_CVE_2016_8655.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c"; - sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki"; - }; - }; - - panic_on_icmp6_frag_CVE_2016_9919 = rec - { name = "panic_on_icmp6_frag_CVE_2016_9919.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2"; - sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; - }; - }; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; patch = fetchpatch { @@ -156,4 +84,9 @@ rec { sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; }; }; + + tag_hardened = rec { + name = "tag-hardened"; + patch = ./tag-hardened.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch deleted file mode 100644 index d20f2296ea30..000000000000 --- a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c ---- linux-4.9.31-orig/tools/perf/util/annotate.c 2017-06-07 12:08:04.000000000 +0200 -+++ linux-4.9.31/tools/perf/util/annotate.c 2017-06-12 13:10:08.811079574 +0200 -@@ -1350,7 +1350,7 @@ - "%s %s%s --start-address=0x%016" PRIx64 - " --stop-address=0x%016" PRIx64 - " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand", -- objdump_path ? objdump_path : "objdump", -+ objdump_path ? objdump_path : OBJDUMP_PATH, - disassembler_style ? "-M " : "", - disassembler_style ? disassembler_style : "", - map__rip_2objdump(map, sym->start), diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff deleted file mode 100644 index 88d0381784fd..000000000000 --- a/pkgs/os-specific/linux/kernel/perf.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- perf/config/utilities.mak.orig 2014-01-25 14:55:32.573320370 +0000 -+++ perf/config/utilities.mak 2014-01-25 15:13:34.174337760 +0000 -@@ -186,9 +186,14 @@ - endif - TRY_CC_MSG=echo " CHK $(3)" 1>&2; - -+define newline -+ -+ -+endef -+ - try-cc = $(shell sh -c \ - 'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \ - $(TRY_CC_MSG) \ -- echo "$(1)" | \ -+ echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c | \ - $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \ - rm -f "$$TMP"') diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 3fbad924568f..f01f39289501 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , libiberty, libaudit , zlib, withGtk ? false, gtk2 ? null }: @@ -13,12 +13,9 @@ stdenv.mkDerivation { inherit (kernel) src; - patches = kernel.patches ++ [ ./perf-binutils-path.patch ]; - preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"} [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; @@ -26,7 +23,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit ]; + flex bison libiberty libaudit makeWrapper ]; buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; @@ -45,6 +42,11 @@ stdenv.mkDerivation { installFlags = "install install-man ASCIIDOC8=1"; + preFixup = '' + wrapProgram $out/bin/perf \ + --prefix PATH : "${binutils}/bin" + ''; + crossAttrs = { /* I don't want cross-python or cross-perl - I don't know if cross-python even works */ diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/pkgs/os-specific/linux/kernel/tag-hardened.patch new file mode 100644 index 000000000000..ff8a3a127973 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/tag-hardened.patch @@ -0,0 +1,7 @@ +diff --git a/localversion-hardened b/localversion-hardened +new file mode 100644 +index 0000000000..e578045860 +--- /dev/null ++++ b/localversion-hardened +@@ -0,0 +1 @@ ++-hardened diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch deleted file mode 100644 index 39150ad790d3..000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch +++ /dev/null @@ -1,1240 +0,0 @@ -From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh -Date: Wed, 1 Apr 2015 16:11:09 -0700 -Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) - -Switch to a single tunnel for all mappings, this removes the limitations -on how many mappings each tunnel can handle, and therefore how many Fan -slices each local address may hold. - -NOTE: This introduces a new kernel netlink interface which needs updated -iproute2 support. - -BugLink: http://bugs.launchpad.net/bugs/1470091 -Signed-off-by: Jay Vosburgh -Signed-off-by: Andy Whitcroft -Signed-off-by: Tim Gardner - -Conflicts: - include/net/ip_tunnels.h ---- - include/net/ip_tunnels.h | 15 ++++ - include/uapi/linux/if_tunnel.h | 20 +++++ - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 186 +++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 222 insertions(+), 6 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 62a750a..47fec59 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -91,6 +91,19 @@ struct ip_tunnel_dst { - }; - - struct metadata_dst; -+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 -+ * underlay (10.88.0.0/16, for example). Multiple local addresses within -+ * the /16 may be used, but a particular overlay may not span -+ * multiple underlay subnets. -+ * -+ * We store one underlay, indexed by the overlay's high order octet. -+ */ -+#define FAN_OVERLAY_CNT 256 -+ -+struct ip_tunnel_fan { -+/* u32 __rcu *map;*/ -+ u32 map[FAN_OVERLAY_CNT]; -+}; - - struct ip_tunnel { - struct ip_tunnel __rcu *next; -@@ -123,6 +136,7 @@ struct ip_tunnel { - #endif - struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ - unsigned int prl_count; /* # of entries in PRL */ -+ struct ip_tunnel_fan fan; - int ip_tnl_net_id; - struct gro_cells gro_cells; - bool collect_md; -@@ -143,6 +157,7 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) -+#define TUNNEL_FAN __cpu_to_be16(0x4000) - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index af4de90..85a3e4b 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -57,6 +57,10 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, -+ -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_MAP = 33, -+ - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -@@ -132,4 +136,20 @@ enum { - }; - - #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+ -+enum { -+ IFLA_FAN_UNSPEC, -+ IFLA_FAN_MAPPING, -+ __IFLA_FAN_MAX, -+}; -+ -+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) -+ -+struct ip_tunnel_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ __u16 underlay_prefix; -+ __u16 overlay_prefix; -+}; -+ - #endif /* _UAPI_IF_TUNNEL_H_ */ -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index cbb51f3..7a6174b 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,6 +1110,11 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - -+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return -EINVAL; -+ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index a09fb0d..56e8984 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -107,6 +107,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -208,6 +209,40 @@ drop: - return 0; - } - -+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ -+/* -+ * Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. For an overlay (inner) address Y.A.B.C, the transformation is -+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay -+ * network (the network portion of a /16), "A" and "B" are the low order -+ * two octets of the underlay network host (the host portion of a /16), -+ * and "Y" is a configured first octet of the overlay network. -+ * -+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -+ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -+ * overlay network 99.6.7.0/24. -+ */ -+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+{ -+ unsigned int overlay; -+ u32 daddr, underlay; -+ -+ daddr = ntohl(ip_hdr(skb)->daddr); -+ overlay = daddr >> 24; -+ underlay = tunnel->fan.map[overlay]; -+ if (!underlay) -+ return -EINVAL; -+ -+ *iph = tunnel->parms.iph; -+ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ return 0; -+} -+ - /* - * This function assumes it is being called from dev_queue_xmit() - * and that skb is filled properly by that function. -@@ -215,7 +250,8 @@ drop: - static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct ip_tunnel *tunnel = netdev_priv(dev); -- const struct iphdr *tiph = &tunnel->parms.iph; -+ const struct iphdr *tiph; -+ struct iphdr fiph; - - if (unlikely(skb->protocol != htons(ETH_P_IP))) - goto tx_error; -@@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -+ if (ipip_tunnel_is_fan(tunnel)) { -+ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) -+ goto tx_error; -+ tiph = &fiph; -+ } else { -+ tiph = &tunnel->parms.iph; -+ } -+ - skb_set_inner_ipproto(skb, IPPROTO_IPIP); - - ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); -@@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static void ipip_fan_free_map(struct ip_tunnel *t) -+{ -+ memset(&t->fan.map, 0, sizeof(t->fan.map)); -+} -+ -+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+{ -+ u32 overlay, overlay_mask, underlay, underlay_mask; -+ -+ if ((map->underlay_prefix && map->underlay_prefix != 16) || -+ (map->overlay_prefix && map->overlay_prefix != 8)) -+ return -EINVAL; -+ -+ overlay = ntohl(map->overlay); -+ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ -+ underlay = ntohl(map->underlay); -+ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+ -+ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ return -EINVAL; -+ -+ t->parms.i_flags |= TUNNEL_FAN; -+ -+ /* Special case: overlay 0 and underlay 0 clears all mappings */ -+ if (!overlay && !underlay) { -+ ipip_fan_free_map(t); -+ return 0; -+ } -+ -+ overlay >>= (32 - map->overlay_prefix); -+ t->fan.map[overlay] = underlay; -+ -+ return 0; -+} -+ -+ -+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, -+ struct ip_tunnel_parm *parms) -+{ -+ struct ip_tunnel_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ if (!data[IFLA_IPTUN_FAN_MAP]) -+ return 0; -+ -+ if (parms->iph.daddr) -+ return -EINVAL; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = ipip_fan_set_map(t, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ - static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - return ip_tunnel_newlink(dev, tb, &p); - } - -@@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - - if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || - (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) -@@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -+ /* IFLA_IPTUN_FAN_MAP */ -+ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + - 0; - } - -@@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -+ if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ struct nlattr *fan_nest; -+ int i; -+ -+ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ for (i = 0; i < 256; i++) { -+ if (tunnel->fan.map[i]) { -+ struct ip_tunnel_fan_map map; -+ -+ map.underlay = htonl(tunnel->fan.map[i]); -+ map.underlay_prefix = 16; -+ map.overlay = htonl(i << 24); -+ map.overlay_prefix = 8; -+ if (nla_put(skb, IFLA_FAN_MAPPING, -+ sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - return 0; - - nla_put_failure: -@@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, -+ -+ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -+ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = { - .size = sizeof(struct ip_tunnel_net), - }; - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *ipip_fan_header; -+static unsigned int ipip_fan_version = 3; -+ -+static struct ctl_table ipip_fan_sysctls[] = { -+ { -+ .procname = "version", -+ .data = &ipip_fan_version, -+ .maxlen = sizeof(ipip_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+ -+#endif /* CONFIG_SYSCTL */ -+ - static int __init ipip_init(void) - { - int err; -@@ -541,9 +701,22 @@ static int __init ipip_init(void) - if (err < 0) - goto rtnl_link_failed; - -+#ifdef CONFIG_SYSCTL -+ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", -+ ipip_fan_sysctls); -+ if (!ipip_fan_header) { -+ err = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - out: - return err; - -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&ipip_link_ops); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_failed: - xfrm4_tunnel_deregister(&ipip_handler, AF_INET); - xfrm_tunnel_failed: -@@ -553,6 +726,9 @@ xfrm_tunnel_failed: - - static void __exit ipip_fini(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(ipip_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&ipip_link_ops); - if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) - pr_info("%s: can't deregister tunnel\n", __func__); --- -2.7.4 - -From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh -Date: Wed, 11 Nov 2015 13:04:50 +0000 -Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation - -Generify the fan mapping support and utilise that to implement fan -mappings over vxlan transport. - -Expose the existance of this functionality (when the module is loaded) -via an additional sysctl marker. - -Signed-off-by: Jay Vosburgh -[apw@canonical.com: added feature marker for fan over vxlan.] -Signed-off-by: Andy Whitcroft ---- - drivers/net/vxlan.c | 245 +++++++++++++++++++++++++++++++++++++++++ - include/net/ip_tunnels.h | 19 +++- - include/net/vxlan.h | 2 + - include/uapi/linux/if_link.h | 1 + - include/uapi/linux/if_tunnel.h | 2 +- - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 242 +++++++++++++++++++++++++++++++--------- - 7 files changed, 453 insertions(+), 65 deletions(-) - -diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 405a7b6..a17cfd0 100644 ---- a/drivers/net/vxlan.c -+++ b/drivers/net/vxlan.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) - ip_tunnel_collect_metadata(); - } - -+static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr) -+{ -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; -+} -+ -+static void vxlan_fan_flush_map(struct vxlan_dev *vxlan) -+{ -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } -+} -+ -+static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay) -+{ -+ struct ip_fan_map *fan_map; -+ -+ fan_map = vxlan_fan_find_map(vxlan, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ -+ return 0; -+} -+ -+static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; -+ -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); -+ -+ netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n", -+ map->overlay, map->overlay_prefix, -+ map->underlay, map->underlay_prefix, -+ overlay_mask, underlay_mask); -+ -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; -+ -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ vxlan_fan_flush_map(vxlan); -+ return 0; -+ } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return vxlan_fan_del_map(vxlan, map->overlay); -+ -+ if (vxlan_fan_find_map(vxlan, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; -+ -+ list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps); -+ -+ return 0; -+} -+ -+static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan) -+{ -+ struct ifla_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = vxlan_fan_add_map(vxlan, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ -+static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb, -+ struct vxlan_rdst *fan_rdst) -+{ -+ struct ip_fan_map *f_map; -+ union vxlan_addr *va; -+ u32 daddr, underlay; -+ struct arphdr *arp; -+ void *arp_ptr; -+ struct ethhdr *eth; -+ struct iphdr *iph; -+ -+ eth = eth_hdr(skb); -+ switch (eth->h_proto) { -+ case htons(ETH_P_IP): -+ iph = ip_hdr(skb); -+ if (!iph) -+ return -EINVAL; -+ daddr = iph->daddr; -+ break; -+ case htons(ETH_P_ARP): -+ arp = arp_hdr(skb); -+ if (!arp) -+ return -EINVAL; -+ arp_ptr = arp + 1; -+ netdev_dbg(vxlan->dev, -+ "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n", -+ arp_ptr, arp_ptr + skb->dev->addr_len, -+ arp_ptr + skb->dev->addr_len + 4, -+ arp_ptr + (skb->dev->addr_len * 2) + 4); -+ arp_ptr += (skb->dev->addr_len * 2) + 4; -+ memcpy(&daddr, arp_ptr, 4); -+ break; -+ default: -+ netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto); -+ return -EINVAL; -+ } -+ -+ f_map = vxlan_fan_find_map(vxlan, daddr); -+ if (!f_map) -+ return -EINVAL; -+ -+ daddr = ntohl(daddr); -+ underlay = ntohl(f_map->underlay); -+ if (!underlay) -+ return -EINVAL; -+ -+ memset(fan_rdst, 0, sizeof(*fan_rdst)); -+ va = &fan_rdst->remote_ip; -+ va->sa.sa_family = AF_INET; -+ fan_rdst->remote_vni = vxlan->default_dst.remote_vni; -+ va->sin.sin_addr.s_addr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); -+ netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n", -+ daddr, underlay, va->sin.sin_addr.s_addr); -+ -+ return 0; -+} -+ - #if IS_ENABLED(CONFIG_IPV6) - static inline - bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b) -@@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, - goto rt_tx_error; - } - -+ if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) { -+ netdev_dbg(dev, "discard fan to localhost %pI4\n", -+ &dst->sin.sin_addr.s_addr); -+ ip_rt_put(rt); -+ goto tx_free; -+ } -+ - /* Bypass encapsulation if the destination is local */ - if (rt->rt_flags & RTCF_LOCAL && - !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) { -@@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) - return NETDEV_TX_OK; - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct vxlan_rdst fan_rdst; -+ -+ netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n", -+ eth->h_proto, eth->h_dest); -+ if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) { -+ dev->stats.tx_dropped++; -+ kfree_skb(skb); -+ return NETDEV_TX_OK; -+ } -+ vxlan_xmit_one(skb, dev, &fan_rdst, 0); -+ return NETDEV_TX_OK; -+ } -+ - f = vxlan_find_mac(vxlan, eth->h_dest); - did_rsc = false; - -@@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev) - - for (h = 0; h < FDB_HASH_SIZE; ++h) - INIT_HLIST_HEAD(&vxlan->fdb_head[h]); -+ -+ INIT_LIST_HEAD(&vxlan->fan.fan_maps); - } - - static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = { -@@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create); - static int vxlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { -+ struct vxlan_dev *vxlan = netdev_priv(dev); - struct vxlan_config conf; - int err; - -@@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, - conf.remote_ip.sa.sa_family = AF_INET6; - } - -+ if (data[IFLA_VXLAN_FAN_MAP]) { -+ err = vxlan_parse_fan_map(data, vxlan); -+ if (err) -+ return err; -+ } -+ - if (data[IFLA_VXLAN_LOCAL]) { - conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]); - conf.saddr.sa.sa_family = AF_INET; -@@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev) - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */ -+ nla_total_size(sizeof(struct ip_fan_map) * 256) + - 0; - } - -@@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) - } - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct nlattr *fan_nest; -+ struct ip_fan_map *fan_map; -+ -+ fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) || - nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) || - nla_put_u8(skb, IFLA_VXLAN_LEARNING, -@@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net) - return 0; - } - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *vxlan_fan_header; -+static unsigned int vxlan_fan_version = 4; -+ -+static struct ctl_table vxlan_fan_sysctls[] = { -+ { -+ .procname = "vxlan", -+ .data = &vxlan_fan_version, -+ .maxlen = sizeof(vxlan_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+#endif /* CONFIG_SYSCTL */ -+ - static void __net_exit vxlan_exit_net(struct net *net) - { - struct vxlan_net *vn = net_generic(net, vxlan_net_id); -@@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void) - if (rc) - goto out3; - -+#ifdef CONFIG_SYSCTL -+ vxlan_fan_header = register_net_sysctl(&init_net, "net/fan", -+ vxlan_fan_sysctls); -+ if (!vxlan_fan_header) { -+ rc = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - return 0; -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&vxlan_link_ops); -+#endif /* CONFIG_SYSCTL */ - out3: - unregister_netdevice_notifier(&vxlan_notifier_block); - out2: -@@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module); - - static void __exit vxlan_cleanup_module(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(vxlan_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&vxlan_link_ops); - unregister_netdevice_notifier(&vxlan_notifier_block); - destroy_workqueue(vxlan_wq); -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 47fec59..28a38e5 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -100,9 +100,18 @@ struct metadata_dst; - */ - #define FAN_OVERLAY_CNT 256 - -+struct ip_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ u16 underlay_prefix; -+ u16 overlay_prefix; -+ u32 overlay_mask; -+ struct list_head list; -+ struct rcu_head rcu; -+}; -+ - struct ip_tunnel_fan { --/* u32 __rcu *map;*/ -- u32 map[FAN_OVERLAY_CNT]; -+ struct list_head fan_maps; - }; - - struct ip_tunnel { -@@ -157,7 +166,11 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) --#define TUNNEL_FAN __cpu_to_be16(0x4000) -+ -+static inline int fan_has_map(const struct ip_tunnel_fan *fan) -+{ -+ return !list_empty(&fan->fan_maps); -+} - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/net/vxlan.h b/include/net/vxlan.h -index e289ada..542f421 100644 ---- a/include/net/vxlan.h -+++ b/include/net/vxlan.h -@@ -161,6 +161,8 @@ struct vxlan_dev { - struct vxlan_rdst default_dst; /* default destination */ - u32 flags; /* VXLAN_F_* in vxlan.h */ - -+ struct ip_tunnel_fan fan; -+ - struct timer_list age_timer; - spinlock_t hash_lock; - unsigned int addrcnt; -diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h -index 5ad5737..6cde3bf 100644 ---- a/include/uapi/linux/if_link.h -+++ b/include/uapi/linux/if_link.h -@@ -443,6 +443,7 @@ enum { - IFLA_VXLAN_GBP, - IFLA_VXLAN_REMCSUM_NOPARTIAL, - IFLA_VXLAN_COLLECT_METADATA, -+ IFLA_VXLAN_FAN_MAP = 33, - __IFLA_VXLAN_MAX - }; - #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 85a3e4b..d36b150 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -145,7 +145,7 @@ enum { - - #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) - --struct ip_tunnel_fan_map { -+struct ifla_fan_map { - __be32 underlay; - __be32 overlay; - __u16 underlay_prefix; -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index 7a6174b..c821bf1 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,11 +1110,6 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - --static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) --{ -- return tunnel->parms.i_flags & TUNNEL_FAN; --} -- - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; -+ return fan_has_map(&tunnel->fan) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 56e8984..3877b0e 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -108,6 +108,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -209,37 +210,144 @@ drop: - return 0; - } - --static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr) - { -- return tunnel->parms.i_flags & TUNNEL_FAN; -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; - } - --/* -- * Determine fan tunnel endpoint to send packet to, based on the inner IP -- * address. For an overlay (inner) address Y.A.B.C, the transformation is -- * F.G.A.B, where "F" and "G" are the first two octets of the underlay -- * network (the network portion of a /16), "A" and "B" are the low order -- * two octets of the underlay network host (the host portion of a /16), -- * and "Y" is a configured first octet of the overlay network. -+/* Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. -+ * -+ * Given a /8 overlay and /16 underlay, for an overlay (inner) address -+ * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first -+ * two octets of the underlay network (the network portion of a /16), "A" -+ * and "B" are the low order two octets of the underlay network host (the -+ * host portion of a /16), and "Y" is a configured first octet of the -+ * overlay network. -+ * -+ * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would -+ * host overlay subnet 99.3.4.0/24. An overlay network datagram from -+ * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7, -+ * which hosts overlay network subnet 99.6.7.0/24. This transformation is -+ * described in detail further below. -+ * -+ * Using netmasks for the overlay and underlay other than /8 and /16, as -+ * shown above, can yield larger (or smaller) overlay subnets, with the -+ * trade-off of allowing fewer (or more) underlay hosts to participate. -+ * -+ * The size of each overlay network subnet is defined by the total of the -+ * network mask of the overlay plus the size of host portion of the -+ * underlay network. In the above example, /8 + /16 = /24. -+ * -+ * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In -+ * this case, the network portion of the underlay is 10.99.224.0/20, and -+ * the host portion is 0.0.14.5 (12 bits). To determine the overlay -+ * network subnet, the 12 bits of host portion are left shifted 12 bits -+ * (/20 - /8) and ORed with the overlay subnet prefix. This yields an -+ * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by -+ * 12 bits underlay. This yields 12 bits in the overlay network portion, -+ * allowing for 4094 addresses in each overlay network subnet. The -+ * trade-off is that fewer hosts may participate in the underlay network, -+ * as its host address size has shrunk from 16 bits (65534 addresses) in -+ * the first example to 12 bits (4094 addresses) here. -+ * -+ * For fewer hosts per overlay subnet (permitting a larger number of -+ * underlay hosts to participate), the underlay netmask may be made -+ * smaller. -+ * -+ * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion -+ * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift -+ * the 20 bits of host by 4 (so that it's highest order bit is adjacent to -+ * the lowest order bit of the /8 overlay). This yields an overlay subnet -+ * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of -+ * the underlay). This provides more addresses for the underlay network -+ * (approximately 2^20), but each host's segment of the overlay provides -+ * only 4 bits of addresses (14 usable). -+ * -+ * It is also possible to adjust the overlay subnet. -+ * -+ * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider -+ * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left -+ * shifted 15 bits (/20 - /5), yielding an overlay network of -+ * 240.129.0.0/17. An underlay host of 10.88.244.215 would yield an -+ * overlay network of 242.107.128.0/17. -+ * -+ * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for -+ * underlay host 10.224.220.10, the underlay host portion (.10) is left -+ * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18. -+ * This would permit 254 addresses on the underlay, with each overlay -+ * segment providing approximately 2^14 - 2 addresses (16382). -+ * -+ * For packets being encapsulated, the overlay network destination IP -+ * address is deconstructed into its overlay and underlay-derived -+ * portions. The underlay portion (determined by the overlay mask and -+ * overlay subnet mask) is right shifted according to the size of the -+ * underlay network mask. This value is then ORed with the network -+ * portion of the underlay network to produce the underlay network -+ * destination for the encapsulated datagram. -+ * -+ * For example, using the initial example of underlay 10.88.3.4/16 and -+ * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay -+ * subnet 99.3.4.0/24 with specfic host 99.3.4.5. A datagram from -+ * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion -+ * of the address extracted. This is a number of bits equal to underlay -+ * network host portion. In the destination address, the highest order of -+ * these bits is one bit lower than the lowest order bit from the overlay -+ * network mask. -+ * -+ * Using the sample value, 99.6.7.8, the overlay mask is /8, and the -+ * underlay mask is /16 (leaving 16 bits for the host portion). The bits -+ * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8 -+ * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of -+ * which is 1 bit lower than the lowest order overlay address bit). - * -- * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -- * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -- * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -- * overlay network 99.6.7.0/24. -+ * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7. -+ * This value is then ORed with the underlay network portion, -+ * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for -+ * the encapuslated datagram. -+ * -+ * Another transform using the final example: overlay 100.64.0.0/10 and -+ * underlay 10.224.220.0/24. Consider overlay address 100.66.128.1 -+ * sending a datagram to 100.66.200.5. In this case, 8 bits (the host -+ * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay -+ * prefix are masked off, yielding 0.2.192.0. This is right shifted 14 -+ * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay -+ * network portion and the underlay host portion) bits, yielding 0.0.0.11. -+ * This is ORed with the underlay network portion, 10.224.220.0/24, giving -+ * the underlay destination of 10.224.220.11 for overlay destination -+ * 100.66.200.5. - */ - static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) - { -- unsigned int overlay; -+ struct ip_fan_map *f_map; - u32 daddr, underlay; - -+ f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr); -+ if (!f_map) -+ return -ENOENT; -+ - daddr = ntohl(ip_hdr(skb)->daddr); -- overlay = daddr >> 24; -- underlay = tunnel->fan.map[overlay]; -+ underlay = ntohl(f_map->underlay); - if (!underlay) - return -EINVAL; - - *iph = tunnel->parms.iph; -- iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ iph->daddr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); - return 0; - } - -@@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -- if (ipip_tunnel_is_fan(tunnel)) { -+ if (fan_has_map(&tunnel->fan)) { - if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) - goto tx_error; - tiph = &fiph; -@@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = { - - static void ipip_tunnel_setup(struct net_device *dev) - { -+ struct ip_tunnel *t = netdev_priv(dev); -+ - dev->netdev_ops = &ipip_netdev_ops; - - dev->type = ARPHRD_TUNNEL; -@@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev) - dev->features |= IPIP_FEATURES; - dev->hw_features |= IPIP_FEATURES; - ip_tunnel_setup(dev, ipip_net_id); -+ INIT_LIST_HEAD(&t->fan.fan_maps); - } - - static int ipip_tunnel_init(struct net_device *dev) -@@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - --static void ipip_fan_free_map(struct ip_tunnel *t) -+static void ipip_fan_flush_map(struct ip_tunnel *t) - { -- memset(&t->fan.map, 0, sizeof(t->fan.map)); -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } - } - --static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay) - { -- u32 overlay, overlay_mask, underlay, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((map->underlay_prefix && map->underlay_prefix != 16) || -- (map->overlay_prefix && map->overlay_prefix != 8)) -- return -EINVAL; -+ fan_map = ipip_fan_find_map(t, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); - -- overlay = ntohl(map->overlay); -- overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ return 0; -+} - -- underlay = ntohl(map->underlay); -- underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -- return -EINVAL; -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); - -- if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) - return -EINVAL; - -- t->parms.i_flags |= TUNNEL_FAN; -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; - -- /* Special case: overlay 0 and underlay 0 clears all mappings */ -- if (!overlay && !underlay) { -- ipip_fan_free_map(t); -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ ipip_fan_flush_map(t); - return 0; - } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return ipip_fan_del_map(t, map->overlay); -+ -+ if (ipip_fan_find_map(t, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; - -- overlay >>= (32 - map->overlay_prefix); -- t->fan.map[overlay] = underlay; -+ list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps); - - return 0; - } -@@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) - static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - struct ip_tunnel_parm *parms) - { -- struct ip_tunnel_fan_map *map; -+ struct ifla_fan_map *map; - struct nlattr *attr; - int rem, rv; - -@@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - - nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { - map = nla_data(attr); -- rv = ipip_fan_set_map(t, map); -+ rv = ipip_fan_add_map(t, map); - if (rv) - return rv; - } -@@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev) - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + - /* IFLA_IPTUN_FAN_MAP */ -- nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + -+ nla_total_size(sizeof(struct ifla_fan_map)) * 256 + - 0; - } - -@@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -- if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ if (fan_has_map(&tunnel->fan)) { - struct nlattr *fan_nest; -- int i; -+ struct ip_fan_map *fan_map; - - fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); - if (!fan_nest) - goto nla_put_failure; -- for (i = 0; i < 256; i++) { -- if (tunnel->fan.map[i]) { -- struct ip_tunnel_fan_map map; -- -- map.underlay = htonl(tunnel->fan.map[i]); -- map.underlay_prefix = 16; -- map.overlay = htonl(i << 24); -- map.overlay_prefix = 8; -- if (nla_put(skb, IFLA_FAN_MAPPING, -- sizeof(map), &map)) -- goto nla_put_failure; -- } -+ list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; - } - nla_nest_end(skb, fan_nest); - } --- -2.7.4 - diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch deleted file mode 100644 index cfa8009e71ef..000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001 -From: Serge Hallyn -Date: Fri, 7 Feb 2014 09:32:46 -0600 -Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts - -Unprivileged mounting, here, refers to root in a non-initial user -namespace performing the mount. In particular, it requires -CAP_SYS_ADMIN toward the task's mounts namespace, alleviating -the concerns of manipulating mount environment for setuid-root -binaries on the host. - -We refuse unprivileged mounting of most filesystem types because -we do not trust the in-kernel superblock parsers to correctly -handle malicious input. - -However, overlayfs does not parse any user-provided data other -than the pathnames passed in. Therefore unprivileged mounting -of overlayfs should be safe. - -Allowing unprivileged mounting of overlayfs filesystems would -allow Ubuntu Trusty users to create overlayfs-based container -snapshots, which would be a huge usability improvement. - -This patch enables unprivileged mounting of overlayfs. - -I tested a few simple combinations, and found that, when -doing (the equivalent of) - -mount -t overlayfs -oupperdir=u,lowerdir=l l t - -(u for upper, l for lower, t for target), - -1. overlayfs mount is always allowed, regardless of ownership -of u, l, or t. However - -2. Creation of new files is allowed so long as u is owned by - T. Otherwise, regardless of ownerships of l and t it is - denied. (This is expected; t was the mountpoint and - 'disapears', so its ownership is irrelevant) - -3. modification of a file 'hithere' which is in l but not yet - in u, and which is not owned by T, is not allowed, even if - writes to u are allowed. This may be a bug in overlayfs, - but it is safe behavior. It also will not cause a problem - for lxc since lxc will ensure that files are mapped into T's - namespace. - -Signed-off-by: Serge Hallyn -Signed-off-by: Tim Gardner -Signed-off-by: Andy Whitcroft ---- - fs/overlayfs/super.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 9473e79..50890c2 100644 ---- a/fs/overlayfs/super.c -+++ b/fs/overlayfs/super.c -@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = { - .name = "overlayfs", - .mount = ovl_mount, - .kill_sb = kill_anon_super, -+ .fs_flags = FS_USERNS_MOUNT, - }; - MODULE_ALIAS_FS("overlayfs"); - --- -2.1.0.rc1 - diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 2aba3ef91128..c7915ace7ca3 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "keyutils-${version}"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; - sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; + sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 5d0dca7b6bec..c55ebffa8293 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/; + homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/; description = "Tools for loading and managing Linux kernel modules"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index f04198059138..850907d4f8a7 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "KMS/DRM based System Console"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; + homepage = http://www.freedesktop.org/wiki/Software/kmscon/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 079bfb7c5be1..c1389f30b059 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; - homepage = "https://github.com/robclark/kmscube"; + homepage = https://github.com/robclark/kmscube; license = licenses.mit; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 088d2ae234c2..1cc8ab60d75a 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; }; - outputs = [ "out" "dev" "lib" "doc" ] + outputs = [ "out" "dev" "lib" "man" "doc" ] ++ stdenv.lib.optional (pam != null) "pam"; nativeBuildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 8066eddd4f3d..81a3af54628e 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { inherit version; - homepage = "http://www.infradead.org/~tgr/libnl/"; + homepage = http://www.infradead.org/~tgr/libnl/; description = "Linux Netlink interface library suite"; license = licenses.lgpl21; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index eaf6d98ba9d8..9f911013f3b9 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { preFixup = ''rm -rf "$(pwd)" ''; meta = { - homepage = "http://linux.dell.com/libsmbios/main"; + homepage = http://linux.dell.com/libsmbios/main; description = "A library to obtain BIOS information"; license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index 203d1defa288..c0c6ad54579c 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shim to preserve libudev.so.0 compatibility"; - homepage = "https://github.com/archlinux/libudev0-shim"; + homepage = https://github.com/archlinux/libudev0-shim; platforms = platforms.linux; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index eb4d1ab04238..b7fa8e140e25 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.140"; + version = "2.02.173"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai"; + sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff"; }; configureFlags = [ @@ -27,10 +27,7 @@ stdenv.mkDerivation { preConfigure = '' - substituteInPlace scripts/lvmdump.sh \ - --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/sbin/lvm $out/sbin/lvm \ --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1d432f9bbd99..c1f9425efc34 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://linuxcontainers.org/"; + homepage = https://linuxcontainers.org/; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 350915c55b51..3116c50435a7 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; - homepage = "https://github.com/patjak/mba6x_bl"; + homepage = https://github.com/patjak/mba6x_bl; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.simonvandel ]; diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 4866c3d81327..200654909c28 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,24 +2,13 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "1.9.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5"; + sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp"; }; - patches = [ - ./fixes.patch - (fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72 - url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch; - sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; }) - ]; - postPatch = '' - substituteInPlace src/main.c \ - --replace '@GREP@' '${gnugrep}/bin/grep' \ - --replace '@LSMOD@' '${kmod}/bin/lsmod' - ''; installPhase = '' mkdir -p $out/bin $out/etc cp bin/mbpfan $out/bin @@ -27,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module"; - homepage = "https://github.com/dgraziotin/mbpfan"; + homepage = https://github.com/dgraziotin/mbpfan; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch deleted file mode 100644 index 548cce05c358..000000000000 --- a/pkgs/os-specific/linux/mbpfan/fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index e8af708..6cfee17 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -71,7 +71,7 @@ void check_requirements() - * Check for coretemp and applesmc modules - * Credits: -http://stackoverflow.com/questions/12978794 - */ -- FILE *fd = popen("lsmod | grep coretemp", "r"); -+ FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r"); - char buf[16]; - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { -@@ -87,7 +87,7 @@ void check_requirements() - - pclose(fd); - -- fd = popen("lsmod | grep applesmc", "r"); -+ fd = popen("@LSMOD@ | @GREP@ applesmc", "r"); - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { - DIR* dir = opendir(APPLESMC_PATH); -@@ -145,4 +145,4 @@ int main(int argc, char *argv[]) - void (*fan_control)() = mbpfan; - go_daemon(fan_control); - exit(EXIT_SUCCESS); --} -\ No newline at end of file -+} diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 64b937390f16..a7f5ffaae4a2 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "148"; + version = "153"; src = fetchFromGitHub { - sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c"; - rev = "v${version}"; - repo = "mcelog"; - owner = "andikleen"; + owner = "andikleen"; + repo = "mcelog"; + rev = "v${version}"; + sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa"; }; postPatch = '' @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ]; + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute mcelog.service $out/lib/systemd/system/mcelog.service \ + --replace /usr/sbin $out/bin + ''; + meta = with stdenv.lib; { description = "Log x86 machine checks: memory, IO, and CPU hardware errors"; longDescription = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 589099c911cf..0929bae991dd 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" + "STRIP=" ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.prefix}" ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index facab7128261..19425f810d0a 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 = "20170511"; + version = "20170707"; src = fetchurl { - url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz"; - sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg"; + url = "https://downloadmirror.intel.com/26925/eng/microcode-${version}.tgz"; + sha256 = "14zf7fbhg0msa3bm0kl139pclmkfm83s6l86x48sr9sjpxllgm2g"; }; buildInputs = [ libarchive ]; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index 8887237b3046..f4e7ad1f2344 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://archlinux.org/"; + homepage = https://archlinux.org/; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index ed88fc643fd0..6f16debaedff 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MOXA UPort 11x0 USB to Serial Hub driver"; - homepage = "https://github.com/ellysh/mxu11x0"; + homepage = https://github.com/ellysh/mxu11x0; license = licenses.gpl1; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 2e410fec561d..d28cf44bd67a 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { daemons. ''; - homepage = "https://sourceforge.net/projects/nfs/"; + homepage = https://sourceforge.net/projects/nfs/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 98d557261faf..22fd12427005 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.nvidia.com/object/unix.html"; + homepage = http://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index ddc190a08e66..e272ac14de0f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "http://www.nvidia.com/object/unix.html"; + homepage = http://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 9abb20a1c6a8..58dc3a481737 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; - homepage = "http://openvswitch.org/"; + homepage = http://openvswitch.org/; license = licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index d2b52822a557..6026ac1d41aa 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [pam openssl db]; meta = { - homepage = "http://www.padl.com/OSS/pam_ccreds.html"; + homepage = http://www.padl.com/OSS/pam_ccreds.html; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 1eee7dbdac2b..e7f2c8278e1a 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, pam, openldap}: - +{ stdenv, fetchurl, pam, openldap, perl }: + stdenv.mkDerivation rec { - name = "pam_ldap-183"; - + name = "pam_ldap-186"; + src = fetchurl { url = "http://www.padl.com/download/${name}.tar.gz"; - sha256 = "1l0mlwvas9dnsfcgbszbzq3bzhdkibn1c3x15fczq3i82faf5g5a"; + sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; + postPatch = '' + patchShebangs ./vers_string + ''; + preInstall = " substituteInPlace Makefile --replace '-o root -g root' '' "; - buildInputs = [pam openldap]; + nativeBuildInputs = [ perl ]; + buildInputs = [ pam openldap ]; meta = { homepage = http://www.padl.com/OSS/pam_ldap.html; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 10383a13e7e3..10856bb52c9c 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Support to authenticate against PostgreSQL for PAM-enabled appliations"; - homepage = "https://github.com/pam-pgsql/pam-pgsql"; + homepage = https://github.com/pam-pgsql/pam-pgsql; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index a686bd5496d7..57ef22083fe4 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; - homepage = "https://github.com/jpetazzo/pipework"; + homepage = https://github.com/jpetazzo/pipework; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b1b1a4649ba9..4d70533fac7f 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "plymouth-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; - sha256 = "0zympsgy5bbfl2ag5nc1jxlshpx8r1s1yyjisanpx76g88hfh31g"; + url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { --libdir=$out/lib --libexecdir=$out/lib --sysconfdir=/etc + --with-systemdunitdir=$out/etc/systemd/system --localstatedir=/var --with-logo=/etc/plymouth/logo.png --with-background-color=0x000000 diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e2257642d0b1..1053e07559e8 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pm-utils.freedesktop.org/wiki/; + homepage = https://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 69abdbec5d23..8e52bdf936ef 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.11"; + version = "0.02.12"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "0iid3b3284sf89pfp68i1k5mwmr31bqjzasb8clm2sa45ivafx52"; + sha256 = "16ls3rs1wfckl0b2szqqgiv072afy4qjd3r4kz4vf2qj77kjm06w"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 2fcf6dbf3c00..4023ea5c69f9 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-modern-top" ]; meta = { - homepage = http://sourceforge.net/projects/procps-ng/; + homepage = https://sourceforge.net/projects/procps-ng/; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index eb90ac303444..d14d0a233c28 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Realtek SDIO Wi-Fi driver"; - homepage = "https://github.com/hadess/rtl8723bs"; + homepage = https://github.com/hadess/rtl8723bs; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; broken = (! versionAtLeast kernel.version "3.19"); diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 93c8e5b7ae42..4ea6b35e377e 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -11,14 +11,32 @@ stdenv.mkDerivation rec { sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; }; + patches = [ + (fetchpatch { # From PR # 42 + name = "rtl8812au-4.11.x-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch; + sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks"; + }) + (fetchpatch { # From PR #46 + name = "rtl8812au-4.11.9-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch; + sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz"; + }) + (fetchpatch { # From PR #43 + name = "rtl8812au-4.12-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch; + sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d"; + }) + ]; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - patchPhase = '' + prePatch = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" - substituteInPlace ./Makefile --replace /sbin/depmod # + substituteInPlace ./Makefile --replace /sbin/depmod \# substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; @@ -28,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; + homepage = https://github.com/Grawp/rtl8812au_rtl8821au; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 390d6ee47039..72dfea082ef6 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The cake qdisc scheduler"; - homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/"; + homepage = https://www.bufferbloat.net/projects/codel/wiki/Cake/; license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index b2d85376c6a9..f24996562d8b 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Query or alter a process' scheduling policy under Linux"; - homepage = "http://freequaos.host.sk/schedtool/"; + homepage = http://freequaos.host.sk/schedtool/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 5f539b9a97e5..8262c03e1e52 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux Tools"; - homepage = "http://oss.tresys.com/projects/setools/"; + homepage = http://oss.tresys.com/projects/setools/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 0c0edde05e22..64d7a694fc14 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { name = "shadow-${version}"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; rev = "${version}"; - sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka"; + sha256 = "1aj7s2arnsfqf34ak40is2zmwm666l28pay6rv1ffx46j0wj4hws"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { patches = [ ./keep-path.patch dots_in_usernames - (fetchpatch { - url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch; - sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7"; - }) ]; # The nix daemon often forbids even creating set[ug]id files. diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index bf8367fcd45c..9207a6b3511d 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 = http://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 26cc8ea7c711..227b67e44863 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -6,67 +6,57 @@ }: with stdenv.lib; + let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; - - common = { version, sha256 } @ args : stdenv.mkDerivation rec { - name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - rev = "spl-${version}"; - inherit sha256; - }; - - patches = [ ./const.patch ./install_prefix.patch ]; - - nativeBuildInputs = [ autoreconfHook ]; - - hardeningDisable = [ "pic" ]; - - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildKernel [ - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; - - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; - }; - }; - in assert any (n: n == configFile) [ "kernel" "user" "all" ]; assert buildKernel -> kernel != null; - { - splStable = common { - version = "0.6.5.10"; - sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi"; - }; - splUnstable = common { - version = "0.7.0-rc4"; - sha256 = "13r5qwrdnaabqfy9fvizvdj4n4cvfv6zy4jh0vijzjvbjd4an9g1"; - }; - } +stdenv.mkDerivation rec { + name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-${version}"; + sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + }; + + patches = [ ./const.patch ./install_prefix.patch ]; + + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ "pic" ]; + + preConfigure = '' + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; + + configureFlags = [ + "--with-config=${configFile}" + ] ++ optionals buildKernel [ + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux + kernel. + ''; + + homepage = http://zfsonlinux.org/; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + }; +} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index ed0e0849721e..ca5cea0a0128 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,23 +3,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06"; + sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd"; }; - patches = [ - (fetchpatch { - # Sysdig fails to run on linux kernels with unified cgroups enabled - url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt; - sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84"; - }) - ]; - buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc ]; @@ -37,6 +29,12 @@ stdenv.mkDerivation rec { "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" ]; + postPatch = '' + sed 's|curl/curlbuild\.h|curl/system.h|' -i \ + userspace/libsinsp/marathon_http.cpp \ + userspace/libsinsp/mesos_http.cpp + ''; + preConfigure = '' export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index ce63d383c8e8..37a237f57ac9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) - substituteInPlace utils/ppmtolss16 gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) + substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) ''; stripDebugList = "bin sbin share/syslinux/com32"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 41f9c1e3e996..c79343322d93 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -9,14 +9,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "233"; + version = "234"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "72782e7ad96f9da9b0e5873f87a64007068cee06"; - sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa"; + rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f"; + sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; - configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" @@ -76,6 +75,8 @@ stdenv.mkDerivation rec { preConfigure = '' + unset RANLIB + ./autogen.sh # FIXME: patch this in systemd properly (and send upstream). @@ -99,8 +100,6 @@ stdenv.mkDerivation rec { --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - - #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib" ''; PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python @@ -166,16 +165,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - /* - # some libs fail to link to liblzma and/or libffi - postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ]; - in '' - for f in "$out"/lib/*.so.0.*; do - patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f" - done - ''; - */ - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes @@ -185,7 +174,7 @@ stdenv.mkDerivation rec { passthru.interfaceVersion = 2; meta = { - homepage = "http://www.freedesktop.org/wiki/Software/systemd"; + homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 526b1a86db1e..6a400f1de226 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" ''; - makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; + makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index f1347c197bf6..2ef5d53b0665 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - # it works fine with gnupg v2, but it looks for an executable named gpg - ln -s ${gnupg}/bin/gpg2 $out/bin/gpg + ln -s ${gnupg}/bin/gpg $out/bin/gpg wrapProgram $out/bin/tomb \ --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 765305d0fdaf..510f781e3936 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; - homepage = "https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41"; + homepage = https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.garbas ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 35873b3a062f..a265395f96e5 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; patches = [ ./force-path.patch ]; diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index d5b9be34d9c3..76ce2637cede 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -49,7 +49,7 @@ let ''; meta = { - homepage = "http://upstart.ubuntu.com/"; + homepage = http://upstart.ubuntu.com/; description = "An event-based replacement for the /sbin/init daemon"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch new file mode 100644 index 000000000000..eb4d5df698ac --- /dev/null +++ b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch @@ -0,0 +1,13 @@ +diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp +index 8aefa65..40914f7 100644 +--- a/src/Library/ConfigFilePrivate.cpp ++++ b/src/Library/ConfigFilePrivate.cpp +@@ -51,7 +51,7 @@ namespace usbguard + + void ConfigFilePrivate::open(const std::string& path) + { +- _stream.open(path, std::ios::in|std::ios::out); ++ _stream.open(path, std::ios::in); + if (!_stream.is_open()) { + throw std::runtime_error("Can't open " + path); + } diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix new file mode 100644 index 000000000000..b88d96e02a44 --- /dev/null +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -0,0 +1,68 @@ +{ + stdenv, fetchurl, lib, + libxslt, pandoc, pkgconfig, + dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + libgcrypt ? null, + libsodium ? null +}: + +with stdenv.lib; + +assert libgcrypt != null -> libsodium == null; + +stdenv.mkDerivation rec { + version = "0.7.0"; + name = "usbguard-${version}"; + + repo = "https://github.com/dkopecek/usbguard"; + + src = fetchurl { + url = "${repo}/releases/download/${name}/${name}.tar.gz"; + sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709"; + }; + + patches = [ + ./daemon_read_only_config.patch + ./documentation.patch + ]; + + nativeBuildInputs = [ + libxslt + pandoc # for rendering documentation + pkgconfig + ]; + + buildInputs = [ + dbus_glib + libcap_ng + libqb + libseccomp + polkit + protobuf + + qtbase + qtsvg + qttools + ] + ++ (lib.optional (libgcrypt != null) libgcrypt) + ++ (lib.optional (libsodium != null) libsodium); + + configureFlags = [ + "--with-bundled-catch" + "--with-bundled-pegtl" + "--with-dbus" + "--with-gui-qt=qt5" + "--with-polkit" + ] + ++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt") + ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium"); + + enableParallelBuilding = true; + + meta = { + description = "The USBGuard software framework helps to protect your computer against BadUSB."; + homepage = "https://dkopecek.github.io/usbguard/"; + license = licenses.gpl2; + maintainers = [ maintainers.tnias ]; + }; +} diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch new file mode 100644 index 000000000000..89de627131f5 --- /dev/null +++ b/pkgs/os-specific/linux/usbguard/documentation.patch @@ -0,0 +1,32 @@ +diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md +index ea86ad1..63aec70 100644 +--- a/doc/usbguard-daemon.conf.5.md ++++ b/doc/usbguard-daemon.conf.5.md +@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars + **RestoreControllerDeviceState**=<*boolean*> + : The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown. + ++**DeviceManagerBackend**=<*backend*> ++: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. ++ + **IPCAllowedUsers**=<*username*> [<*username*> ...] + : A space delimited list of usernames that the daemon will accept IPC connections from. + + **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...] + : A space delimited list of groupnames that the daemon will accept IPC connections from. + +-**IPCAccessControlFiles**=<*path*> +-: Path to a directory holding the IPC access control files. +- +-**DeviceManagerBackend**=<*backend*> +-: Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`. +- + **IPCAccessControlFiles**=<*path*> + : The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details. + ++**DeviceRulesWithPort**=<*boolean*> ++: Generate device specific rules including the "via-port" attribute. ++ + **AuditFilePath**=<*filepath*> + : USBGuard audit events log file path. + diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 622bf4fbd5cc..3adedf8c1dd1 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; - homepage = http://linuxtv.org/projects.php; + homepage = https://linuxtv.org/projects.php; license = licenses.lgpl21Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 63e2e4ef493c..277c6d19f5b3 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,15 +6,15 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170706"; + version = "0.0.20170810"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp"; + sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"; }; meta = with stdenv.lib; { - homepage = https://www.wireguard.io/; + homepage = https://www.wireguard.com/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 1cac0911b246..1530d20667e3 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_P2P=y CONFIG_TDLS=y + CONFIG_BGSCAN_SIMPLE=y '' + optionalString (pcsclite != null) '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix deleted file mode 100644 index 7decd42b376b..000000000000 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, wvstreams, pkgconfig }: - -stdenv.mkDerivation rec { - name = "wvdial-1.61"; - - src = fetchurl { - url = "http://wvstreams.googlecode.com/files/${name}.tar.gz"; - sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; - }; - - buildInputs = [ wvstreams pkgconfig ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - export makeFlags="prefix=$out" - # not sure about this line - sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in - - sed -e '1i#include ' -i $(find . -name '*.cc') - ''; - - meta = { - description = "A dialer that automatically recognises the modem"; - homepage = http://alumnit.ca/wiki/index.php?page=WvDial; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 50f4e6f2b410..48389a758b71 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -13,144 +13,112 @@ let buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; - common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args: - if buildKernel && - (incompatibleKernelVersion != null) && - versionAtLeast kernel.version incompatibleKernelVersion then - throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable." - else stdenv.mkDerivation rec { - name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; +in stdenv.mkDerivation rec { + name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + version = "0.7.1"; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "zfs"; - rev = "zfs-${version}"; - inherit sha256; - }; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "zfs"; + rev = "zfs-${version}"; + sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + }; - patches = extraPatches; + patches = [ + (fetchpatch { + url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; + sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; + }) + ]; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ]; + buildInputs = [ autoreconfHook nukeReferences ] + ++ optionals buildKernel [ spl ] + ++ optionals buildUser [ zlib libuuid python attr ]; - # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; + # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "pic" ]; - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" - substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "@bindir@/rm " "${coreutils}/bin/rm " - ./autogen.sh - ''; + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " - configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildUser [ - "--with-dracutdir=$(out)/lib/dracut" - "--with-udevdir=$(out)/lib/udev" - "--with-systemdunitdir=$(out)/etc/systemd/system" - "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" - "--with-mounthelperdir=$(out)/bin" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; + for f in ./udev/rules.d/* + do + substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + done - enableParallelBuilding = true; + ./autogen.sh + ''; - installFlags = [ - "sysconfdir=\${out}/etc" - "DEFAULT_INITCONF_DIR=\${out}/default" - ]; + configureFlags = [ + "--with-config=${configFile}" + ] ++ optionals buildUser [ + "--with-dracutdir=$(out)/lib/dracut" + "--with-udevdir=$(out)/lib/udev" + "--with-systemdunitdir=$(out)/etc/systemd/system" + "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--with-mounthelperdir=$(out)/bin" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-systemd" + ] ++ optionals buildKernel [ + "--with-spl=${spl}/libexec/spl" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; - postInstall = '' - # Prevent kernel modules from depending on the Linux -dev output. - nuke-refs $(find $out -name "*.ko") - '' + optionalString buildUser '' - # Remove provided services as they are buggy - rm $out/etc/systemd/system/zfs-import-*.service + enableParallelBuilding = true; - sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* + installFlags = [ + "sysconfdir=\${out}/etc" + "DEFAULT_INITCONF_DIR=\${out}/default" + ]; - for i in $out/etc/systemd/system/*; do - substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" - done + postInstall = '' + # Prevent kernel modules from depending on the Linux -dev output. + nuke-refs $(find $out -name "*.ko") + '' + optionalString buildUser '' + # Remove provided services as they are buggy + rm $out/etc/systemd/system/zfs-import-*.service - # Fix pkgconfig. - ln -s ../share/pkgconfig $out/lib/pkgconfig + sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* - # Remove tests because they add a runtime dependency on gcc - rm -rf $out/share/zfs/zfs-tests - ''; + for i in $out/etc/systemd/system/*; do + substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + done - meta = { - description = "ZFS Filesystem Linux Kernel module"; - longDescription = '' - ZFS is a filesystem that combines a logical volume manager with a - Copy-On-Write filesystem with data integrity detection and repair, - snapshotting, cloning, block devices, deduplication, and more. - ''; - homepage = http://zfsonlinux.org/; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; - }; - }; -in - assert any (n: n == configFile) [ "kernel" "user" "all" ]; - assert buildKernel -> kernel != null && spl != null; - { - # also check if kernel version constraints in - # ./nixos/modules/tasks/filesystems/zfs.nix needs - # to be adapted - zfsStable = common { - # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + # Fix pkgconfig. + ln -s ../share/pkgconfig $out/lib/pkgconfig - version = "0.6.5.10"; + # Remove tests because they add a runtime dependency on gcc + rm -rf $out/share/zfs/zfs-tests + ''; - # this package should point to the latest release. - sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3"; - extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch"; - sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z"; - }) - ]; - inherit spl; - }; - zfsUnstable = common { - # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.12"; + outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; - version = "0.7.0-rc4"; - - # this package should point to a version / git revision compatible with the latest kernel release - sha256 = "16jiq2h7m2ljg5xv7m5lqmsszzclkhvj1iq1wa9w740la4vl22kf"; - extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; - sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; - }) - ]; - spl = splUnstable; - }; - } + meta = { + description = "ZFS Filesystem Linux Kernel module"; + longDescription = '' + ZFS is a filesystem that combines a logical volume manager with a + Copy-On-Write filesystem with data integrity detection and repair, + snapshotting, cloning, block devices, deduplication, and more. + ''; + homepage = http://zfsonlinux.org/; + license = licenses.cddl; + platforms = platforms.linux; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + }; +} diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index ceb6e8c86c01..cc68697756cd 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://kafka.apache.org"; + homepage = http://kafka.apache.org; description = "A high-throughput distributed messaging system"; license = licenses.asl20; maintainers = [ maintainers.ragge ]; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 72951c168dce..e5c545c37bbb 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + prePatch = '' + sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ + -i ./src/apcagent/Makefile ./autoconf/targets.mak + ''; + # ./configure ignores --prefix, so we must specify some paths manually # There is no real reason for a bin/sbin split, so just use bin. preConfigure = '' diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index e6102c84f134..8a25188d595f 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -97,8 +97,8 @@ in }; asterisk-stable = common { - version = "14.4.0"; - sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w"; + version = "14.6.0"; + sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26"; externals = { "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 20b7250d75df..ea8d2651836a 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.2.2"; + version = "6.3.1"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1fpn799382m8x7b0s3w4mxzlhy1s62ya287i622gbadqscprhagg"; + sha256 = "0f7hc8q4sigvr9bdxx8phnp6bkfkz9bccwkrx0xqyrvvdc5x5690"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/confluence/logs/ . rm -r work; ln -sf /run/confluence/work/ . rm -r temp; ln -sf /run/confluence/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.confluence.user.ConfluenceAuthenticator\ + com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat < confluence/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 48678804c566..0013286c03c1 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.3.7"; + version = "7.4.1"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1ixnnw3yj2ip9ndr9pwxcmdy8gaixkmp517ahg3w8xzymr8wh2qp"; + sha256 = "1ixkhc206z3zpiaj46v8z2gxmix24sxqs2d17fb64gkyml9s5gqb"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; @@ -17,6 +20,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/atlassian-jira/logs/ . rm -r work; ln -sf /run/atlassian-jira/work/ . rm -r temp; ln -sf /run/atlassian-jira/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ + com.atlassian.jira.security.login.SSOSeraphAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat < atlassian-jira/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 8478804a7b03..d83e32bcb392 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.tinkerforge.com/; + homepage = https://www.tinkerforge.com/; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; maintainers = [ stdenv.lib.maintainers.qknight ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 77c836305147..e221c67a2c02 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.4"; + version = "0.10.6"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk"; + sha256 = "17k8518mx1l0q5bjlx0c6f249ibr9qdrcgwn3wpwhd244cbg44gn"; }; buildFlagsArray = '' diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 9249d7cc347d..befa36edd9e2 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { ''; meta = { - homepage = "https://cayley.io/"; + homepage = https://cayley.io/; description = "A graph database inspired by Freebase and Knowledge Graph"; maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 3a28368cc81c..3db3d9327031 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -24,11 +24,11 @@ buildGoPackage rec { buildInputs = [ avahi cups ]; meta = with stdenv.lib; { - description = "Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector"; + description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector"; homepage = https://github.com/google/cloud-print-connector; license = licenses.bsd3; maintainers = with maintainers; [ hodapp ]; - # TODO: Fix broken build on OS X. The GitHub presently lists the + # TODO: Fix broken build on macOS. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. platforms = platforms.linux; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 311d707e9c59..69afd479af30 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl +{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { - name = "slurm-llnl-${version}"; - version = "15-08-5-1"; + name = "slurm-${version}"; + version = "17.02.6"; src = fetchurl { - url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; - sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; + url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2"; + sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' + # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es + # this doesn't fix tests completely at least makes slurmd to launch + hardeningDisable = [ "bindnow" ]; + + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; @@ -25,8 +30,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' - substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" - substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" + patchShebangs ./doc/html/shtml2html.py + patchShebangs ./doc/man/man2html.py ''; postInstall = '' diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 81d0f494955e..0219a1bf7ecb 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = "http://storm.apache.org"; + homepage = http://storm.apache.org; description = "Distributed realtime computation system"; license = licenses.asl20; maintainers = with maintainers; [ edwtjo vizanto ]; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index cc566e712c29..86995f440040 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; - homepage = "https://www.consul.io/"; + homepage = https://www.consul.io/; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index caf3792e9831..b4cbca22c30a 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.consul.io/; + homepage = https://www.consul.io/; description = "A tool for service discovery, monitoring and configuration"; maintainers = with maintainers; [ cstrahan wkennington ]; license = licenses.mpl20 ; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix new file mode 100644 index 000000000000..1712476b923b --- /dev/null +++ b/pkgs/servers/dgraph/default.nix @@ -0,0 +1,48 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dgraph-${version}"; + version = "0.8.1"; + + goPackagePath = "github.com/dgraph-io/dgraph"; + + src = fetchFromGitHub { + owner = "dgraph-io"; + repo = "dgraph"; + rev = "v${version}"; + sha256 = "1gls2pvgcmd364x84gz5fafs7pwkll4k352rg1lmv70wvzyydsdr"; + }; + + extraOutputsToInstall = [ "dashboard" ]; + + goDeps = ./deps.nix; + subPackages = [ "cmd/dgraph" "cmd/dgraphloader" ]; + + # let's move the dashboard to a different output, to prevent $bin from + # depending on $out + # TODO: provide a proper npm application for the dashboard. + postPatch = '' + mv dashboard/* $dashboard + ''; + + preBuild = '' + export buildFlagsArray="-ldflags=\ + -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \ + -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/" + ''; + + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + # Somehow on Darwin, $out/lib (which doesn't exist) ends up in RPATH. + # Removing it fixes cycle between $out and $bin + install_name_tool -delete_rpath $out/lib $bin/bin/dgraph + install_name_tool -delete_rpath $out/lib $bin/bin/dgraphloader + ''; + + meta = { + homepage = "https://dgraph.io/"; + description = "Fast, Distributed Graph DB"; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.agpl3; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix new file mode 100644 index 000000000000..2e03c75489b2 --- /dev/null +++ b/pkgs/servers/dgraph/deps.nix @@ -0,0 +1,326 @@ +[ + { + goPackagePath = "github.com/AndreasBriese/bbloom"; + fetch = { + type = "git"; + url = "https://github.com/AndreasBriese/bbloom"; + rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e"; + sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp"; + }; + } + { + goPackagePath = "github.com/MakeNowJust/heredoc"; + fetch = { + type = "git"; + url = "https://github.com/MakeNowJust/heredoc"; + rev = "1d91351acdc1cb2f2c995864674b754134b86ca7"; + sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"; + sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; + }; + } + { + goPackagePath = "github.com/blevesearch/bleve"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/bleve"; + rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd"; + sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx"; + }; + } + { + goPackagePath = "github.com/blevesearch/blevex"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/blevex"; + rev = "507dcd576550f9f3260f11495ba2de4e96773a3e"; + sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z"; + }; + } + { + goPackagePath = "github.com/blevesearch/go-porterstemmer"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/go-porterstemmer"; + rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e"; + sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d"; + }; + } + { + goPackagePath = "github.com/blevesearch/segment"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/segment"; + rev = "762005e7a34fd909a84586299f1dd457371d36ee"; + sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "3a0bb77429bd3a61596f5e8a3172445844342120"; + sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "1ebeef5cbfe69c0dab2bc701ee5307eed7a7d8d2"; + sha256 = "12lidn1a8nwsk6nlwyfirrxkxhs4lhj53f4cd19xm8w070q0mg19"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; + sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; + }; + } + { + goPackagePath = "github.com/dgraph-io/badger"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/badger"; + rev = "ad23a425b3c87b8223780cb882bed568ca14b9f0"; + sha256 = "1xjd05vska1kanmgdhp5cvkn2i6236rqphrc9i4kfjndgwkmas57"; + }; + } + { + goPackagePath = "github.com/dgryski/go-farm"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-farm"; + rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727"; + sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "e57a569e1882958f6b188cb42231d6db87701f2a"; + sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc"; + }; + } + { + goPackagePath = "github.com/golang/geo"; + fetch = { + type = "git"; + url = "https://github.com/golang/geo"; + rev = "3a42ea109208469f16baf9e090135dd0e82ece5c"; + sha256 = "1fzlakjj94gv516q7gd9qycn91lij7wmjbdv0vsrh6qnxvgqr8hw"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; + sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; + }; + } + { + goPackagePath = "github.com/google/codesearch"; + fetch = { + type = "git"; + url = "https://github.com/google/codesearch"; + rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; + sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "17b591df37844cde689f4d5813e5cea0927d8dd2"; + sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l"; + }; + } + { + goPackagePath = "github.com/pkg/profile"; + fetch = { + type = "git"; + url = "https://github.com/pkg/profile"; + rev = "5b67d428864e92711fcbd2f8629456121a56d91f"; + sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "310ce84375bb84c5cbbf0d05069c92daa5673740"; + sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "0866df4b85a18d652b6965be022d007cdf076822"; + sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506"; + sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m"; + }; + } + { + goPackagePath = "github.com/tebeka/snowball"; + fetch = { + type = "git"; + url = "https://github.com/tebeka/snowball"; + rev = "6b06bd306c4e4442a63e546752278920ae487934"; + sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k"; + }; + } + { + goPackagePath = "github.com/twpayne/go-geom"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-geom"; + rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216"; + sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f"; + sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c"; + sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "abf9c25f54453410d0c6668e519582a9e1115027"; + sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; + sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "b0a3dcfcd1a9bd48e63634bd8802960804cf8315"; + sha256 = "0lkj73lyr4dzj2pxgmild0i1bl6kdgrxa3c8m44j5ms537pyxcpr"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "2bb318258959db281674bc6fd67b5167b7ff0d65"; + sha256 = "1g8ir87ksr8549801vdgb0n6rmxws05ky50bkgjv86370h146cqm"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; + sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; + }; + } +] diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 45abcff27767..bf7a7266022e 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.1-P2"; in +let version = "9.11.2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"; + sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.isc.org/software/bind"; + homepage = http://www.isc.org/software/bind; description = "Domain name server"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index f1ae382aa382..0b556a0859c8 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv, fetchpatch +, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty }: let inherit (stdenv.lib) optional optionals; in @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9"; + sha256 = "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e"; }; outputs = [ "bin" "out" "dev" ]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ] # Use embedded lmdb there for now, as detection is broken on Darwin somehow. ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ] + ++ libintlOrEmpty ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls # Not ideal but seems to work on Linux. diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 441e1f1ab0f9..390bf43d4d62 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which +{ stdenv, fetchurl, pkgconfig, hexdump, which , knot-dns, luajit, libuv, lmdb , cmocka, systemd, hiredis, libmemcached , gnutls, nettle @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117"; + sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 8b838a58b279..bcbb6bb120ef 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative DNS server"; - homepage = http://www.powerdns.com/; + homepage = https://www.powerdns.com; platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 7e4c69e3862d..2ba0146520a4 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.22.0"; + version = "3.2.28.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; + sha256 = "0bv0wj7rny3gh4d6qdyd8widd549ap3fl35sz3q6w9x8sqhw5nfi"; }; buildInputs = with pkgs; [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "MediaBrowser - Bring together your videos, music, photos, and live television"; - homepage = http://emby.media/; + homepage = https://emby.media/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix new file mode 100644 index 000000000000..c1234606291d --- /dev/null +++ b/pkgs/servers/exhibitor/default.nix @@ -0,0 +1,54 @@ +{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +stdenv.mkDerivation rec { + name = "exhibitor-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "soabase"; + repo = "exhibitor"; + sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45"; + rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd"; + }; + mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv"; + # This is adapted from https://github.com/volth/nixpkgs/blob/6aa470dfd57cae46758b62010a93c5ff115215d7/pkgs/applications/networking/cluster/hadoop/default.nix#L20-L32 + fetchedMavenDeps = stdenv.mkDerivation { + name = "exhibitor-${version}-maven-deps"; + inherit src nativeBuildInputs; + buildPhase = '' + cd ${pomFileDir}; + while timeout --kill-after=21m 20m mvn package -Dmaven.repo.local=$out/.m2; [ $? = 124 ]; do + echo "maven hangs while downloading :(" + done + ''; + installPhase = ''find $out/.m2 -type f \! -regex '.+\(pom\|jar\|xml\|sha1\)' -delete''; # delete files with lastModified timestamps inside + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = mavenDependenciesSha256; + }; + + # The purpose of this is to fetch the jar file out of public Maven and use Maven + # to build a monolithic, standalone jar, rather than build everything from source + # (given the state of Maven support in Nix). We're not actually building any java + # source here. + pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven"; + nativeBuildInputs = [ maven ]; + buildInputs = [ makeWrapper ]; + buildPhase = '' + cd ${pomFileDir} + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; + meta = with stdenv.lib; { + homepage = https://github.com/soabase/exhibitor; + description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; + license = licenses.asl20; + platforms = platforms.unix; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/java + mv target/$name.jar $out/share/java/ + makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${stdenv.lib.makeBinPath [ jdk ]} + ''; + +} diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index 3e097c0ebd47..3f600b5a1221 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed init system"; - homepage = http://coreos.com/using-coreos/clustering/; + homepage = https://coreos.com/using-coreos/clustering/; license = licenses.asl20; maintainers = with maintainers; [ cstrahan diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index ceabce82c712..cc1582eb9e9c 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://bftpd.sf.net/"; + homepage = http://bftpd.sf.net/; downloadPage = "http://bftpd.sf.net/download.html"; }; } diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index ccab31ce225f..e63e13a218e7 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share your terminal as a web application"; - homepage = "https://github.com/yudai/gotty"; + homepage = https://github.com/yudai/gotty; maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.mit; }; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 568b0ee6c045..3393d0cf58b6 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,16 +16,16 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.26"; + version = "2.4.27"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a"; + sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; }; # FIXME: -dev depends on -doc - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [perl] ++ diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index c89e4100d38b..2b8693f7379d 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.zdziarski.com/blog/?page_id=442"; + homepage = http://www.zdziarski.com/blog/?page_id=442; description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index eef935f73745..647589621029 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.fastcgi.com/"; + homepage = http://www.fastcgi.com/; description = "Provide support for the FastCGI protocol"; longDescription = '' diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 0481ebb9b8dc..1e56a2dac48d 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; + homepage = http://couchdb.apache.org; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 697c9d95884f..5a988d22ecb6 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; + homepage = http://couchdb.apache.org; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index ba733c5bde58..0ca888fd6ed1 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "darkhttpd-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2"; - sha256 = "0lbcv6pa82md0gqyyskxndf8hm58y76nrnkanc831ia3vm529bdg"; + sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; }; installPhase = '' @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and secure static webserver"; - homepage = http://dmr.ath.cx/net/darkhttpd/; + homepage = https://unix4lyfe.org/darkhttpd/; license = stdenv.lib.licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index c5dd9f7a577d..aa6f0e1f9108 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced and secure webserver"; license = licenses.gpl2; - homepage = "https://www.hiawatha-webserver.org"; + homepage = https://www.hiawatha-webserver.org; maintainer = [ maintainers.ndowens ]; }; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 87efc41b1d68..e5f4ada33010 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; + postInstall = '' + mkdir -p "$out/share/lighttpd/doc/config" + cp -vr doc/config "$out/share/lighttpd/doc/" + # Remove files that references needless store paths (dependency bloat) + rm "$out/share/lighttpd/doc/config/Makefile"* + rm "$out/share/lighttpd/doc/config/conf.d/Makefile"* + rm "$out/share/lighttpd/doc/config/vhosts.d/Makefile"* + ''; + meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index d5af6e432924..75ec8514e356 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://mini-httpd.nongnu.org/"; + homepage = http://mini-httpd.nongnu.org/; description = "A minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index dfde20452723..c79bbc989bc8 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat , gd, geoip -, withStream ? false +, withStream ? true +, withMail ? false , modules ? [] , hardening ? true , version, sha256, ... @@ -39,10 +40,20 @@ stdenv.mkDerivation { "--with-http_secure_link_module" "--with-http_degradation_module" "--with-http_stub_status_module" - "--with-ipv6" + "--with-threads" + "--with-pcre-jit" # Install destination problems # "--with-http_perl_module" - ] ++ optional withStream "--with-stream" + ] ++ optional withStream [ + "--with-stream" + "--with-stream_geoip_module" + "--with-stream_realip_module" + "--with-stream_ssl_module" + "--with-stream_ssl_preread_module" + ] ++ optional withMail [ + "--with-mail" + "--with-mail_ssl_module" + ] ++ optional (gd != null) "--with-http_image_filter_module" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 959e9d4ebf82..64d0a9b79524 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.2"; - sha256 = "0w4vj6hl23z9kdw09v7jzq3c1593i4fhwmrz6qx2g7cq2i6j6zyp"; + version = "1.13.4"; + sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index bc8b831eec72..aa03d6162dd1 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.12.0"; - sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml"; + version = "1.12.1"; + sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7"; }) diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 38ab4bd3187d..4eb74c8cb534 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; - homepage = "https://github.com/mgorny/pshs"; + homepage = https://github.com/mgorny/pshs; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.eduarrrd ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 96652515f7ab..08e682aa7169 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny/turbo/throttling HTTP server"; - homepage = "http://www.acme.com/software/thttpd/"; + homepage = http://www.acme.com/software/thttpd/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 871b3524f424..67172edfd36e 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance HTTP 1.1 server in Erlang"; - homepage = http://http://yaws.hyber.org; + homepage = http://yaws.hyber.org; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu the-kenny ]; diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index e09a9f740982..0ffef616f370 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -66,7 +66,7 @@ in pythonPackages.buildPythonApplication rec { meta = { description = "An intelligent grader that allows secured and automated testing of code made by students"; - homepage = "https://github.com/UCL-INGI/INGInious"; + homepage = https://github.com/UCL-INGI/INGInious; license = licenses.agpl3; maintainers = with maintainers; [ layus ]; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index b2288336d579..befb4039ea09 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = http://www.charybdis.io/; + homepage = http://atheme.org/projects/charybdis.html; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 82a571ca77c3..c13a0ee3d89b 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; platforms = stdenv.lib.platforms.unix; - homepage = "http://www.ircd-hybrid.org/"; + homepage = http://www.ircd-hybrid.org/; }; } diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index fb5d49849f87..6ad233593a3b 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRC client that runs as a daemon accepting notification requests"; - homepage = "https://gitlab.com/esr/irker"; + homepage = https://gitlab.com/esr/irker; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 36d45672150e..91b9ed972d8c 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite "--with-sqlite"; meta = { - homepage = "http://dovecot.org/"; + homepage = http://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix index b972192da7a7..1a1ba1ad4486 100644 --- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://wiki2.dovecot.org/Plugins/Antispam"; + homepage = http://wiki2.dovecot.org/Plugins/Antispam; description = "An antispam plugin for the Dovecot IMAP server"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 0c3ed84deff9..623f0a2b0e22 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://nuclearelephant.com/"; + homepage = http://nuclearelephant.com/; description = "Community Driven Antispam Filter"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 554634d5a79d..019c84d2898b 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Web and API based SMTP testing"; - homepage = "https://github.com/mailhog/MailHog"; + homepage = https://github.com/mailhog/MailHog; maintainers = with maintainers; [ disassembler ]; license = licenses.mit; }; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 3c028b1ac170..d64e41f30071 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, python, pythonPackages }: stdenv.mkDerivation rec { - name = "mailman-2.1.23"; + name = "mailman-${version}"; + version = "2.1.24"; src = fetchurl { url = "mirror://gnu/mailman/${name}.tgz"; - sha256 = "0s9ywix4m3n7qa0baws744ildg48hsa87jahpsfiqqilhmpwl8mh"; + sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; }; buildInputs = [ python pythonPackages.dns ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DIRSETGID=:" ]; meta = { - homepage = "http://www.gnu.org/software/mailman/"; + homepage = http://www.gnu.org/software/mailman/; description = "Free software for managing electronic mail discussion and e-newsletter lists"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 44840c91b058..be923ff2305c 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://untroubled.org/nullmailer/"; + homepage = http://untroubled.org/nullmailer/; description = '' A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays. It is designed to be simple to configure, secure, and easily extendable. diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7ad5f6e9ad59..d2667597c627 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace smtpd/smtpctl.c --replace \ 'if (geteuid())' \ 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' + substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555" ''; configureFlags = [ diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 395f3ded7fda..8ccd783b6ad8 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://petidomo.sourceforge.net/"; + homepage = http://petidomo.sourceforge.net/; description = "A simple and easy to administer mailing list server"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 998dce882866..e14b62a85971 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; meta = { - homepage = "http://www.openwall.com/popa3d/"; + homepage = http://www.openwall.com/popa3d/; description = "Tiny POP3 daemon with security as the primary goal"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bfdea71c5d78..f3266046cb99 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.postfix.org/"; + homepage = http://www.postfix.org/; description = "A fast, easy to administer, and secure mail server"; license = lib.licenses.bsdOriginal; platforms = lib.platforms.linux; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 978ccec503d2..a9ec36f59ca9 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -27,7 +27,7 @@ buildPerlPackage rec { ''; meta = { - homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; + homepage = http://jimsun.linxnet.com/postfix_contrib.html; maintainers = with stdenv.lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 7fdf0edb096d..95f460e917b5 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -17,7 +17,7 @@ in runCommand name { }; meta = with stdenv.lib; { description = "A postfix policy server to provide greylisting"; - homepage = "https://postgrey.schweikert.ch/"; + homepage = https://postgrey.schweikert.ch/; platforms = postfix.meta.platforms; licenses = licenses.gpl2; }; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 4eeb80095581..01eeeb15efaf 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake help2man ]; meta = with stdenv.lib; { - homepage = "https://github.com/roehling/postsrsd"; + homepage = https://github.com/roehling/postsrsd; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index e0e5fd45b7f2..739270326e5b 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; meta = with stdenv.lib; { - homepage = "https://github.com/vstakhov/rmilter"; + homepage = https://github.com/vstakhov/rmilter; license = licenses.asl20; description = '' Daemon to integrate rspamd and milter compatible MTA, for example diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 6283bed96c38..13834f952827 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://github.com/vstakhov/rspamd"; + homepage = https://github.com/vstakhov/rspamd; license = licenses.asl20; description = "Advanced spam filtering system"; maintainers = with maintainers; [ avnik fpletz ]; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index f4ab6a029952..acbc50fd42bf 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -34,7 +34,7 @@ buildPerlPackage rec { ''; meta = { - homepage = "http://spamassassin.apache.org/"; + homepage = http://spamassassin.apache.org/; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index a00eed26dbf2..4668ac240961 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-Source, self-hosted Slack-alternative"; - homepage = "https://www.mattermost.org"; + homepage = https://www.mattermost.org; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 166c5cdbf522..fabd5b83724b 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.33"; + name = "memcached-1.4.39"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3"; + sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 52596d6e0795..0b82f1deef62 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; - homepage = "http://www.meteor.com"; + homepage = http://www.meteor.com; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index b5834bf62922..4c21a29a05c4 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,7 +2,7 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,44 @@ var springboard = function (rel, options) { +@@ -484,6 +484,45 @@ var springboard = function (rel, options) { process.exit(ret.wait()); } @@ -10,6 +10,7 @@ index 84f94bc..4fbda17 100644 + // patch shebang: + var fs = require('fs'); + var path = require("path") ++ var Future = require("fibers/future") + var srcOld = fs.readFileSync(executable, 'utf8'); + srcNew = srcOld.replace(/^#!\/bin\/bash/, '#!/bin/sh'); + if (srcOld !== srcNew) { diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix new file mode 100644 index 000000000000..57040f469479 --- /dev/null +++ b/pkgs/servers/misc/airsonic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "airsonic-${version}"; + version = "10.0.1"; + + src = fetchurl { + url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; + sha256 = "1qky8dz49200f6100ivkn5g7i0hzkv3gpq2r0cj6z53s8d1ayblc"; + }; + + buildCommand = '' + mkdir -p "$out/webapps" + cp "$src" "$out/webapps/airsonic.war" + ''; + + meta = with stdenv.lib; { + description = "Personal media streamer"; + homepage = https://airsonic.github.io; + license = stdenv.lib.licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ disassembler ]; + }; +} diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix new file mode 100644 index 000000000000..027e10901573 --- /dev/null +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }: + +stdenv.mkDerivation rec { + name = "lcdproc-${version}"; + version = "0.5.9"; + + src = fetchFromGitHub { + owner = "lcdproc"; + repo = "lcdproc"; + rev = "v${version}"; + sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm"; + }; + + patches = [ + ./hardcode_mtab.patch + ]; + + configureFlags = [ + "--enable-lcdproc-menus" + "--enable-drivers=all" + "--with-pidfile-dir=/run" + ]; + + buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; + nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; + enableParallelBuilding = true; + + postFixup = '' + for f in $out/bin/*.pl ; do + substituteInPlace $f \ + --replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl + done + + # NixOS will not use this file anyway but at least we can now execute LCDd + substituteInPlace $out/etc/LCDd.conf \ + --replace server/drivers/ $out/lib/lcdproc/ + ''; + + meta = with stdenv.lib; { + description = "Client/server suite for controlling a wide variety of LCD devices"; + homepage = http://lcdproc.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch new file mode 100644 index 000000000000..33c4b8e83b2d --- /dev/null +++ b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch @@ -0,0 +1,17 @@ +diff --git a/clients/lcdproc/machine_Linux.c b/clients/lcdproc/machine_Linux.c +index 7bb7266..a629674 100644 +--- a/clients/lcdproc/machine_Linux.c ++++ b/clients/lcdproc/machine_Linux.c +@@ -259,11 +259,7 @@ machine_get_fs(mounts_type fs[], int *cnt) + char line[256]; + int x = 0, err; + +-#ifdef MTAB_FILE +- mtab_fd = fopen(MTAB_FILE, "r"); +-#else +-#error "Can't find your mounted filesystem table file." +-#endif ++ mtab_fd = fopen("/etc/mtab", "r"); + + /* Get rid of old, unmounted filesystems... */ + memset(fs, 0, sizeof(mounts_type) * 256); diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix new file mode 100644 index 000000000000..4989a01c9e39 --- /dev/null +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl }: + +stdenv.mkDerivation rec { + name = "check_ssl_cert-${version}"; + version = "1.51.0"; + + src = fetchFromGitHub { + owner = "matteocorti"; + repo = "check_ssl_cert"; + rev = "v${version}"; + sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; + + postInstall = '' + wrapProgram $out/bin/check_ssl_cert \ + --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}" + ''; + + meta = with stdenv.lib; { + description = "A Nagios plugin to check the CA and validity of an X.509 certificate"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix deleted file mode 100644 index 67c3954ef569..000000000000 --- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, openssh, openssl }: - -stdenv.mkDerivation rec { - name = "nagios-plugins-${version}"; - version = "2.2.0"; - - src = fetchurl { - url = "http://nagios-plugins.org/download/${name}.tar.gz"; - sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3"; - }; - - # !!! Awful hack. Grrr... this of course only works on NixOS. - # Anyway the check that configure performs to figure out the ping - # syntax is totally impure, because it runs an actual ping to - # localhost (which won't work for ping6 if IPv6 support isn't - # configured on the build machine). - preConfigure= " - configureFlagsArray=( - --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s' - --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s' - ) - "; - - postInstall = "ln -s libexec $out/bin"; - - # !!! make openssh a runtime dependency only - buildInputs = [ openssh openssl ]; - - meta = { - description = "Official plugins for Nagios"; - homepage = http://www.nagios.org/download/plugins; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; - }; -} diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix new file mode 100644 index 000000000000..808257ca121f --- /dev/null +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: + +with stdenv.lib; + +let + majorVersion = "2.2"; + minorVersion = ".0"; + + binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp ]; + +in stdenv.mkDerivation rec { + name = "monitoring-plugins-${majorVersion}${minorVersion}"; + + src = fetchFromGitHub { + owner = "monitoring-plugins"; + repo = "monitoring-plugins"; + rev = "v${majorVersion}"; + sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1"; + }; + + # !!! Awful hack. Grrr... this of course only works on NixOS. + # Anyway the check that configure performs to figure out the ping + # syntax is totally impure, because it runs an actual ping to + # localhost (which won't work for ping6 if IPv6 support isn't + # configured on the build machine). + preConfigure= '' + substituteInPlace po/Makefile.in.in \ + --replace /bin/sh ${stdenv.shell} + + sed -i configure.ac \ + -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"\$out/bin:/run/wrappers/bin:${binPath}\"|' + + configureFlagsArray=( + --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s' + --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s' + ) + ''; + + # !!! make openssh a runtime dependency only + buildInputs = [ net_snmp openssh openssl perl ]; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + # For unknown reasons the installer tries executing $out/share and fails if + # it doesn't succeed. + # So we create it and remove it again later. + preBuild = '' + mkdir -p $out + cat <<_EOF > $out/share +#!${stdenv.shell} +exit 0 +_EOF + chmod 755 $out/share + ''; + + postInstall = '' + rm $out/share + ln -s libexec $out/bin + ''; + + meta = { + description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others."; + homepage = https://www.monitoring-plugins.org; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice relrod ]; + }; +} diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix new file mode 100644 index 000000000000..312caab954bb --- /dev/null +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +let + bName = "check_esxi_hardware"; + pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}"; + +in python2Packages.buildPythonApplication rec { + name = "${pName}-${version}"; + version = "20161013"; + + src = fetchFromGitHub { + owner = "Napsty"; + repo = bName; + rev = version; + sha256 = "19zybcg62dqcinixnp1p8zw916x3w7xvy6dlsmn347iigfa5s55s"; + }; + + dontBuild = true; + doCheck = false; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin ${bName}.py + install -Dm644 -t $out/share/doc/${pName} README.md + + runHook postInstall + ''; + + propagatedBuildInputs = with python2Packages; [ pywbem ]; + + meta = with stdenv.lib; { + homepage = https://www.claudiokuenzler.com/nagios-plugins/; + license = licenses.gpl2; + maintainer = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix new file mode 100644 index 000000000000..441d9595bbd1 --- /dev/null +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper +, perl, NetSNMP, coreutils, gnused, gnugrep }: + +let + owner = "lausser"; + + glplugin = fetchFromGitHub { + repo = "GLPlugin"; + rev = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b"; + sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh"; + inherit owner; + }; + + generic = { pname, version, rev, sha256, description, ... } @ attrs: + let + attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"]; + in perl.stdenv.mkDerivation rec { + name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}"; + + src = fetchFromGitHub { + repo = pname; + inherit owner rev sha256; + }; + + buildInputs = [ perl NetSNMP ]; + + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + + prePatch = with stdenv.lib; '' + ln -s ${glplugin}/* GLPlugin + substituteInPlace plugins-scripts/Makefile.am \ + --replace /bin/cat ${getBin coreutils}/bin/cat \ + --replace /bin/echo ${getBin coreutils}/bin/echo \ + --replace /bin/grep ${getBin gnugrep}/bin/grep \ + --replace /bin/sed ${getBin gnused}/bin/sed + ''; + + postInstall = '' + test -d $out/libexec && ln -sr $out/libexec $out/bin + ''; + + postFixup = '' + for f in $out/bin/* ; do + wrapProgram $f --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = with stdenv.lib; { + homepage = https://labs.consol.de/; + license = licenses.gpl2; + maintainer = with maintainers; [ peterhoeg ]; + inherit description; + }; + }; + +in { + check-nwc-health = generic { + pname = "check_nwc_health"; + version = "20170804"; + rev = "e959b412b5cf027c82a446668e026214fdcf8df3"; + sha256 = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk"; + description = "Check plugin for network equipment."; + }; + + check-ups-health = generic { + pname = "check_ups_health"; + version = "20170804"; + rev = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9"; + sha256 = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l"; + description = "Check plugin for UPSs."; + }; +} diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix new file mode 100644 index 000000000000..2f26bc26ba44 --- /dev/null +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "check-uptime-${version}"; + version = "20161112"; + + src = fetchFromGitHub { + owner = "madrisan"; + repo = "nagios-plugins-uptime"; + rev = "51822dacd1d404b3eabf3b4984c64b2475ed6f3b"; + sha256 = "18q9ibzqn97dsyr9xs3w9mqk80nmmfw3kcjidrdsj542amlsycyk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + postInstall = "ln -sr $out/libexec $out/bin"; + + meta = with stdenv.lib; { + description = "Uptime check plugin for Sensu/Nagios/others"; + homepage = https://github.com/madrisan/nagios-plugins-uptime; + license = licenses.gpl3; + maintainer = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index ccbcce260332..27e6dea01ecc 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.5.0"; + version = "0.8.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1"; + sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 63ea093b4bb0..8d5450127d65 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -34,7 +34,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Service monitoring system and time series database"; - homepage = http://prometheus.io; + homepage = https://prometheus.io; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 465a85259f4d..ea17c0b18b23 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; - homepage = "https://github.com/kawamuray/prometheus-json-exporter"; + homepage = https://github.com/kawamuray/prometheus-json-exporter; license = lib.licenses.asl20; }; } diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix similarity index 64% rename from pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix rename to pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix index 1de25a21d8cc..93aae1b867e9 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix @@ -1,4 +1,4 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/beorn7/perks"; @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317"; - sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; + rev = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"; + sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5"; }; } { @@ -27,22 +27,13 @@ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } - { - goPackagePath = "github.com/mdlayher/unifi"; - fetch = { - type = "git"; - url = "https://github.com/mdlayher/unifi"; - rev = "418aad77bdb31a9b97d13f79162b0bac1a38bb25"; - sha256 = "16hv2mk2vl4lcj1qf2wp9psvffz26b5zsajs2yl21rbx0pcwkcp7"; - }; - } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "a5060f1eaab721946b185b2de468ff83ea5b89cb"; - sha256 = "1v9qva9c0wrjkl71b0rvvi1qj7l42gvcsj349r4lg8pwni8i6did"; + rev = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc"; + sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil"; }; } { @@ -59,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "49fee292b27bfff7f354ee0f64e1bc4850462edf"; - sha256 = "01vcjzkxs34yyy402rsbxw3md7ia85ls9yzsxhgddcisa3mq23cj"; + rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8"; + sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "a1dba9ce8baed984a2495b658c82687f8157b98f"; - sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; }; } ] diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix new file mode 100644 index 000000000000..eac962f75606 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "openvpn_exporter-unstable-${version}"; + version = "2017-05-15"; + rev = "a2a179a222144fa9a10030367045f075375a2803"; + + goPackagePath = "github.com/kumina/openvpn_exporter"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "openvpn_exporter"; + inherit rev; + sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4"; + }; + + goDeps = ./openvpn-exporter-deps.nix; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Prometheus exporter for OpenVPN"; + license = licenses.asl20; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a52e1abad875..6915877ef4fb 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; - version = "0.1.0"; + version = "0.3.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -11,9 +11,11 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "snmp_exporter"; - sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp"; + sha256 = "1cklsi3cpalmnp0qjkgb7xbgbkr014hk2z54gfynzvzqjmsbxk6a"; }; + buildInputs = [ net_snmp ]; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index f866df49b54d..44a670b95ab4 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "unifi-exporter-${version}"; - version = "0.4.0"; - rev = version; + version = "0.4.0+git1"; + rev = "9a4e69fdea91dd0033bda4842998d751b40a6130"; goPackagePath = "github.com/mdlayher/unifi_exporter"; @@ -11,11 +11,9 @@ buildGoPackage rec { inherit rev; owner = "mdlayher"; repo = "unifi_exporter"; - sha256 = "0mbav3dkrwrgzzl80q590467nbq5j61v5v7mpsbhcn2p7ak0swx4"; + sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; homepage = https://github.com/mdlayher/unifi_exporter; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 456e69042963..707b1014e226 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { goDeps = ./varnish-exporter_deps.nix; meta = { - homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; + homepage = https://github.com/jonnenauha/prometheus_varnish_exporter; description = "Varnish exporter for Prometheus"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude ]; diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/servers/monitoring/sensu/Gemfile index ebee9f257219..3f570024febb 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile +++ b/pkgs/servers/monitoring/sensu/Gemfile @@ -1,2 +1,13 @@ source 'https://rubygems.org' + gem 'sensu' + +# integration +gem 'sensu-plugins-influxdb' + +# checks +gem 'sensu-plugins-http' +gem 'sensu-plugins-disk-checks' +gem 'sensu-plugins-logs' +gem 'sensu-plugins-systemd' +# gem 'sensu-plugins-process-checks' diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index 0d01c2271458..9e47e697c3b6 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -5,17 +5,46 @@ GEM amqp (1.6.0) amq-protocol (>= 2.0.1) eventmachine + aws-sdk (2.10.19) + aws-sdk-resources (= 2.10.19) + aws-sdk-core (2.10.19) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.10.19) + aws-sdk-core (= 2.10.19) + aws-sigv4 (1.0.1) + cause (0.1) childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) + dentaku (2.0.9) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) em-http-server (0.1.8) eventmachine em-worker (0.0.2) eventmachine eventmachine (1.2.2) ffi (1.9.18) + http-cookie (1.0.3) + domain_name (~> 0.5) + influxdb (0.3.13) + cause + json + jmespath (1.3.1) + json (1.8.6) + jsonpath (0.5.8) + multi_json + mime-types (2.99.3) + mixlib-cli (1.7.0) + multi_json (1.12.1) + netrc (0.11.0) oj (2.18.1) parse-cron (0.1.4) - sensu (0.29.0) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + sensu (1.0.2) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) @@ -23,8 +52,8 @@ GEM sensu-extensions (= 1.9.0) sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.1) - sensu-settings (= 10.0.0) + sensu-redis (= 2.2.0) + sensu-settings (= 10.3.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) @@ -57,9 +86,28 @@ GEM sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.1) + sensu-plugin (1.4.5) + json (< 2.0.0) + mixlib-cli (>= 1.5.0) + sensu-plugins-disk-checks (2.4.0) + sensu-plugin (~> 1.2) + sys-filesystem (= 1.1.7) + sensu-plugins-http (2.5.0) + aws-sdk (~> 2.3) + rest-client (= 1.8.0) + sensu-plugin (~> 1.2) + sensu-plugins-influxdb (1.2.0) + dentaku (= 2.0.9) + influxdb (= 0.3.13) + jsonpath (= 0.5.8) + sensu-plugin (~> 1.3) + sensu-plugins-logs (1.2.0) + sensu-plugin (~> 1.2) + sensu-plugins-systemd (0.0.5) + sensu-plugin (~> 1.2) + sensu-redis (2.2.0) eventmachine - sensu-settings (10.0.0) + sensu-settings (10.3.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -71,12 +119,22 @@ GEM amqp (= 1.6.0) eventmachine sensu-redis (>= 1.0.0) + sys-filesystem (1.1.7) + ffi + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) PLATFORMS ruby DEPENDENCIES sensu + sensu-plugins-disk-checks + sensu-plugins-http + sensu-plugins-influxdb + sensu-plugins-logs + sensu-plugins-systemd BUNDLED WITH - 1.14.6 + 1.15.3 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 1df8d419cb63..36bef969c2ac 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -8,6 +8,7 @@ version = "2.0.1"; }; amqp = { + dependencies = ["amq-protocol" "eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; @@ -15,7 +16,51 @@ }; version = "1.6.0"; }; + aws-sdk = { + dependencies = ["aws-sdk-resources"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04fgpkhjjmwxppb7b0jbsc6zykkw7hpkncld8mm1zamajf653sf6"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sdk-core = { + dependencies = ["aws-sigv4" "jmespath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f0qq7h4bpmlvcsl1bncxdyw63zanz6jdxch9i457irc5l6z8sm0"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c107vlh475jph5i2szchmcwlsimpvdbd2cc0m5p39jmw8prkysa"; + type = "gem"; + }; + version = "2.10.19"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cxl0yvmyl8d0yj4cx3p75iki4fqk8ckb6ajfj7mr3g4ihp5mryp"; + type = "gem"; + }; + version = "1.0.1"; + }; + cause = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; + type = "gem"; + }; + version = "0.1"; + }; childprocess = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; @@ -23,7 +68,25 @@ }; version = "0.5.8"; }; + dentaku = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11z4cw4lspx3rgmmd2hd4l1iikk6p17icxwn7xym92v1j825zpnr"; + type = "gem"; + }; + version = "2.0.9"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; em-http-server = { + dependencies = ["eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; @@ -34,6 +97,7 @@ em-worker = { dependencies = ["eventmachine"]; source = { + remotes = ["https://rubygems.org"]; sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; type = "gem"; }; @@ -55,6 +119,81 @@ }; version = "1.9.18"; }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + influxdb = { + dependencies = ["cause" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jikl3iylbffsdmb4vr09ysqvpwxk133y6m9ylwcd0931ngsf0ks"; + type = "gem"; + }; + version = "0.3.13"; + }; + jmespath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + type = "gem"; + }; + version = "1.3.1"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + jsonpath = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gwhrd7xlysq537yy8ma69jc83lblwiccajl5zvyqpnwyjjc93df"; + type = "gem"; + }; + version = "0.5.8"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + type = "gem"; + }; + version = "2.99.3"; + }; + mixlib-cli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; oj = { source = { remotes = ["https://rubygems.org"]; @@ -71,15 +210,26 @@ }; version = "0.1.4"; }; - sensu = { + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; + sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7"; type = "gem"; }; - version = "0.29.0"; + version = "1.8.0"; + }; + sensu = { + dependencies = ["em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vk9bvxwh6ah8xkncf16f8r0bq84cnnx16ffc4k6sq73v8wpk116"; + type = "gem"; + }; + version = "1.0.2"; }; sensu-extension = { + dependencies = ["eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3"; @@ -88,6 +238,7 @@ version = "1.5.1"; }; sensu-extensions = { + dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; @@ -96,6 +247,7 @@ version = "1.9.0"; }; sensu-extensions-check-dependencies = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; @@ -104,6 +256,7 @@ version = "1.0.1"; }; sensu-extensions-debug = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; @@ -112,6 +265,7 @@ version = "1.0.0"; }; sensu-extensions-json = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; @@ -120,6 +274,7 @@ version = "1.0.0"; }; sensu-extensions-occurrences = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; @@ -128,6 +283,7 @@ version = "1.2.0"; }; sensu-extensions-only-check-output = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; @@ -136,6 +292,7 @@ version = "1.0.0"; }; sensu-extensions-ruby-hash = { + dependencies = ["sensu-extension"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; @@ -144,6 +301,7 @@ version = "1.0.0"; }; sensu-json = { + dependencies = ["oj"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; @@ -152,6 +310,7 @@ version = "2.1.0"; }; sensu-logger = { + dependencies = ["eventmachine" "sensu-json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0"; @@ -159,23 +318,80 @@ }; version = "1.2.1"; }; - sensu-redis = { + sensu-plugin = { + dependencies = ["json" "mixlib-cli"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; + sha256 = "0z18zk04l9klbjmqvjg6cpv3k4w5hi1by8wnpkiwdwa2jdv61jyb"; type = "gem"; }; - version = "2.1.1"; + version = "1.4.5"; + }; + sensu-plugins-disk-checks = { + dependencies = ["sensu-plugin" "sys-filesystem"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r7kzqp0kwhz7kk0s25r7lh2sw4yr99m5lr8cb99kq73fnsjqipq"; + type = "gem"; + }; + version = "2.4.0"; + }; + sensu-plugins-http = { + dependencies = ["aws-sdk" "rest-client" "sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13126hx2fgjsrfqnlh2hf2czn35pi8rkc5ql9yxf4y8x9a7dyksj"; + type = "gem"; + }; + version = "2.5.0"; + }; + sensu-plugins-influxdb = { + dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18nk7c451df46xcjk97r3h8yhaj8bz138ih5y0z26sdiha58brv7"; + type = "gem"; + }; + version = "1.2.0"; + }; + sensu-plugins-logs = { + dependencies = ["sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ycrf3967v5kavm58fj9db16l9wgyzac4h3r0f9hm32jy9qsxwq6"; + type = "gem"; + }; + version = "1.2.0"; + }; + sensu-plugins-systemd = { + dependencies = ["sensu-plugin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r7prvkf33j6qvvqq78186rn5g6wf0g3dqni34vnj8v1z287wkfh"; + type = "gem"; + }; + version = "0.0.5"; + }; + sensu-redis = { + dependencies = ["eventmachine"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1drmychc04fg2gs7zsxx6aidfyxf7cn7k8k1jy7dnfbnlr5aln3n"; + type = "gem"; + }; + version = "2.2.0"; }; sensu-settings = { + dependencies = ["parse-cron" "sensu-json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; + sha256 = "0y55bqvps06gk94zllamqr0fa5bc27q0k1b5sp5gxh1bkf4w8gb3"; type = "gem"; }; - version = "10.0.0"; + version = "10.3.0"; }; sensu-spawn = { + dependencies = ["childprocess" "em-worker" "eventmachine"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7"; @@ -184,6 +400,7 @@ version = "2.2.1"; }; sensu-transport = { + dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr"; @@ -191,4 +408,30 @@ }; version = "7.0.2"; }; + sys-filesystem = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10didky52nfapmybj6ipda18i8fcwf8bs9bbfbk5i7v1shzd36rf"; + type = "gem"; + }; + version = "1.1.7"; + }; + 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"; + }; } \ No newline at end of file diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 80e73d632357..8a4e0e571b18 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,23 +1,25 @@ # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj") - (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl") + (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v") + (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7") - (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a") - (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6") - (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5") - (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf") - (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk") - (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs") - (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32") + (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p") + (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk") + (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244") + (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy") + (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g") + (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1") + (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z") (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh") (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371") (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5") (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f") - (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z") - (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd") - (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd") + (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2") + (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm") + (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1") + (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8") + (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json deleted file mode 100644 index 1eb94f73e6b8..000000000000 --- a/pkgs/servers/monitoring/uchiwa/bower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "uchiwa", - "dependencies": { - "uchiwa-web": "0.21.0" - } -} diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 68aaa4a5249b..c0ddf9cb7a4a 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "0.22.1"; - sha256 = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g"; + version = "0.25.3-1"; + sha256 = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks"; } diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh index 2802037a4f52..33e3dacdda5d 100755 --- a/pkgs/servers/monitoring/uchiwa/update.sh +++ b/pkgs/servers/monitoring/uchiwa/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out +#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix set -euo pipefail IFS=$'\n\t' @@ -7,25 +7,36 @@ IFS=$'\n\t' # set -x REPO=sensu/uchiwa +SHA="1111111111111111111111111111111111111111111111111111" -VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) - -t=$(mktemp) - -echo "Updating to: ${VERSION}" - -curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t -bower2nix $t bower-packages.nix - -pushd $(git rev-parse --show-toplevel) -sha=$(nix-prefetch-url -A uchiwa.src) -popd - -cat <<_EOF > src.nix +write_src() { + cat <<_EOF > src.nix { version = "${VERSION}"; - sha256 = "${sha}"; + sha256 = "${SHA}"; } _EOF +} -rm $t +t=$(mktemp -d) + +LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) +echo "Latest version: ${LATEST_VERSION}" + +VERSION=${1:-${LATEST_VERSION}} +echo "Updating to: ${VERSION}" + +write_src + +curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json +bower2nix $t/bower.json $t/bower-packages.nix +mv $t/bower-packages.nix . +# sed -i 's@/@-@g' bower-packages.nix + +pushd $(git rev-parse --show-toplevel) +SHA=$(nix-prefetch-url -A uchiwa.src) +popd + +write_src + +rm -r $t diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 5c72ac97bc0d..a48ee83755b5 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; - homepage = http://www.musicpd.org/libs/libmpdclient/; + homepage = https://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ mornfall ehmry ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b7eb0b5397db..63a781c59413 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,6 +18,7 @@ , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 +, lameSupport ? true, lame , pulseaudioSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu @@ -72,6 +73,7 @@ in stdenv.mkDerivation rec { ++ opt mmsSupport libmms ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 + ++ opt lameSupport lame ++ opt zipSupport zziplib ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio ++ opt (!stdenv.isDarwin && jackSupport) libjack2 @@ -105,6 +107,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag lameSupport "lame-encoder") (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse") (mkFlag (!stdenv.isDarwin && jackSupport) "jack") (mkFlag stdenv.isDarwin "osx") diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9a8a0a80e522..6d2bb9b9e949 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre]; meta = { - homepage = "http://leafnode.sourceforge.net/"; + homepage = http://leafnode.sourceforge.net/; description = "Leafnode implements a store & forward NNTP proxy"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index c2b913a5b378..0e99378c92c3 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; - homepage = "https://github.com/nextcloud/news-updater"; + homepage = https://github.com/nextcloud/news-updater; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ schneefux ]; }; diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 423bc8070355..897ab3b49647 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://jena.apache.org"; + homepage = http://jena.apache.org; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; updateWalker = true; downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index e3e748dc2b48..2cce6cff9020 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://jena.apache.org"; + homepage = http://jena.apache.org; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; }; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index c40b765d3453..c4a616856ad2 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,29 +1,28 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }: +{ stdenv, fetchFromGitHub +, openssl, zlib, python2Packages, readline, cmake, python }: let - inherit (python2Packages) python gyp; in stdenv.mkDerivation rec { - version = "2.5.3"; + version = "3.2.2"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; - rev = "67d995aa22ea341129398326fa10c5f6c14e94e9"; - sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; + rev = "v${version}"; + sha256 = "0f87r0fr3i09fnmwjqz6q1lwd5k32a2knrls0nv0zhqrma7sdy01"; }; - postPatch = '' - substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash - substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash - sed '1i#include ' -i arangod/Aql/Functions.cpp \ - -i lib/Basics/string-buffer.cpp - ''; - buildInputs = [ - openssl zlib python gyp go readline + openssl zlib readline python ]; + nativeBuildInputs = [ cmake ]; + + postPatch = '' + sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi + ''; + configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; @@ -31,7 +30,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://github.com/arangodb/arangodb"; + homepage = https://github.com/arangodb/arangodb; description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 7541f76b40e1..848d181867ed 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -26,6 +26,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out mv * $out + + # Clean up documentation. + mkdir -p $out/share/doc/${name} + mv $out/CHANGES.txt \ + $out/LICENSE.txt \ + $out/NEWS.txt \ + $out/NOTICE.txt \ + $out/javadoc \ + $out/share/doc/${name} + + if [[ -d $out/doc ]]; then + mv "$out/doc/"* $out/share/doc/${name} + rmdir $out/doc + fi + for cmd in bin/cassandra bin/nodetool bin/sstablekeys \ bin/sstableloader bin/sstableupgrade \ tools/bin/cassandra-stress tools/bin/cassandra-stressd \ diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index a2158c9b5410..c907f081e22e 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A highly scalable, robust (fully ACID) native graph database"; - homepage = "http://www.neo4j.org/"; + homepage = http://www.neo4j.org/; license = licenses.gpl3; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 5e22cb118820..cc82e75a6154 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { url = "https://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "047fz3r0rn95mqr5p1xfdprf0hq4avq2a1q8zsdifxxid7hyx2nx"; + sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; }; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index 8b17da99b9a3..b2126a698336 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "TCG Platform Trust Service (PTS)"; - homepage = "http://sourceforge.jp/projects/openpts"; + homepage = http://sourceforge.jp/projects/openpts; license = stdenv.lib.licenses.cpl10; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 5646afe8e219..111c2f02b996 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -72,7 +72,7 @@ buildPerlPackage { doCheck = false; meta = { - homepage = "http://www.openxpki.org"; + homepage = http://www.openxpki.org; description = "Enterprise-grade PKI/Trustcenter software"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 23969dc2a23d..088eef0830b9 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }: +{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { name = "radarr-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ --add-flags "$out/share/${name}/Radarr.exe" \ - --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ - --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + curl sqlite libmediainfo ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix deleted file mode 100644 index acca1af60550..000000000000 --- a/pkgs/servers/restund/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }: -stdenv.mkDerivation rec { - version = "0.4.2"; - name = "restund-${version}"; - src=fetchurl { - url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; - sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; - }; - buildInputs = [ zlib openssl libre librem mysql.lib ]; - makeFlags = [ - "LIBRE_MK=${libre}/share/re/re.mk" - "LIBRE_INC=${libre}/include/re" - "LIBRE_SO=${libre}/lib" - "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' - "USE_MYSQL=1" - ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" - ; - NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql ''; - meta = { - homepage = "http://www.creytiv.com/restund.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; - inherit version; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/restund-.*[.]tar[.]"; - broken = true; # probably due to glibc-2.20 - }; -} diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix deleted file mode 100644 index 3449645f1851..000000000000 --- a/pkgs/servers/rippled/ripple-rest.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, nodePackages }: - -with lib; - -let - np = nodePackages.override { generated = ./package.nix; self = np; }; -in nodePackages.buildNodePackage rec { - name = "ripple-rest-${version}"; - version = "1.7.0-rc1"; - - src = fetchFromGitHub { - repo = "ripple-rest"; - owner = "ripple"; - rev = version; - sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues np)); - - meta = { - description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network"; - homepage = https://github.com/ripple/ripple-rest; - maintainers = with maintainers; [ offline ]; - license = [ licenses.mit ]; - broken = true; - }; -} diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index cc5d7795e050..da59241bad3c 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; - homepage = "http://sourceforge.net/projects/rpcbind/"; + homepage = http://sourceforge.net/projects/rpcbind/; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 6f9895509ee0..781f505f4690 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; + sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 841ca530f322..ade2ea944534 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -30,7 +30,7 @@ in { sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp"; }; meta = { - homepage = "https://github.com/jprante/elasticsearch-river-jdbc"; + homepage = https://github.com/jprante/elasticsearch-river-jdbc; description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; license = licenses.asl20; }; @@ -45,7 +45,7 @@ in { sha256 = "bf7bf5ce3ccdd3afecd0e18cd6fce1ef56f824e41f4ef50553ae598caa5c366d"; }; meta = { - homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen"; + homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; }; @@ -83,7 +83,7 @@ in { }; meta = { - homepage = "https://github.com/elasticsearch/elasticsearch-river-twitter"; + homepage = https://github.com/elasticsearch/elasticsearch-river-twitter; description = "Twitter River Plugin for ElasticSearch"; license = licenses.asl20; maintainers = [ maintainers.edwtjo ]; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index d4f9e1df8842..0326784b2ac8 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://lucene.apache.org/solr/"; + homepage = https://lucene.apache.org/solr/; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 23daa99b3bcb..4c5f71cb37d6 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool for service orchestration and management"; - homepage = "https://www.serf.io/"; + homepage = https://www.serf.io/; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 2ee5683a2ca2..79f2012c7a9f 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,23 +2,23 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "2.3.6.5"; + version = "3.0.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1337y62pnch27s2gr47miip3na1am24xprlc5a27lbr764nr85s3"; + sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ - autoreconfHook openssl avahi alsaLib libdaemon - pkgconfig popt libconfig libpulseaudio @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Airtunes server and emulator with multi-room capabilities"; license = licenses.mit; + maintainers = with maintainers; [ lnl7 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 5c9737660c42..97e7a9daf658 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; - homepage = http://freeswitch.org/; + homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index db47dc994686..d9a4f4733f73 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static multicast routing daemon"; - homepage = "http://troglobit.com/smcroute.html"; + homepage = http://troglobit.com/smcroute.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd); diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index bd921df6e528..20fb74924d3e 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper, ... }: +{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4753"; + version = "2.0.0.4928"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c"; + sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; }; buildInputs = [ @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ --add-flags "$out/bin/NzbDrone.exe" \ - --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ - --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + curl sqlite libmediainfo ]} ''; meta = { diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1356915c1fac..3ede229931eb 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.21"; + version = "10.1.25"; 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 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; + sha256 = "1mm0n8sl6grajk5rbrx55333laz5dg2abyl8mlsn7h8vdymfq1bj"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 820c3fc96050..6a85d956a0c2 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.54"; + version = "5.5.57"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "1f0sg72vbhavj1cbay0gyyrrw0mjcf2k0nf30zmn2h68ik7wnfr7"; + sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1"; }; patches = if stdenv.isCygwin then [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index be4ab80f7052..5598a7926338 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.17"; + version = "5.7.19"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf"; + sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index cb150fc5fd4c..e86406cd469c 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "Oracle Database Express Edition"; - homepage = "http://www.oracle.com/technetwork/products/express-edition/"; + homepage = http://www.oracle.com/technetwork/products/express-edition/; license = licenses.unfree; }; } diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index a394d5845366..fc6c54f82c91 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { passthru.mysqlVersion = "5.6"; meta = with stdenv.lib; { - homepage = "https://www.percona.com"; + homepage = https://www.percona.com; description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2362ee843296..85edbbf442a4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: let @@ -15,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl makeWrapper ] + [ zlib readline openssl libxml2 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -24,6 +24,7 @@ let configureFlags = [ "--with-openssl" + "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" ] @@ -79,7 +80,7 @@ let }; meta = with lib; { - homepage = http://www.postgresql.org/; + homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; @@ -97,33 +98,33 @@ in { }; postgresql92 = common { - version = "9.2.20"; + version = "9.2.21"; psqlSchema = "9.2"; - sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb"; + sha256 = "0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9"; }; postgresql93 = common { - version = "9.3.16"; + version = "9.3.17"; psqlSchema = "9.3"; - sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4"; + sha256 = "9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe"; }; postgresql94 = common { - version = "9.4.11"; + version = "9.4.12"; psqlSchema = "9.4"; - sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3"; + sha256 = "fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64"; }; postgresql95 = common { - version = "9.5.6"; + version = "9.5.7"; psqlSchema = "9.5"; - sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv"; + sha256 = "8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad"; }; postgresql96 = common { - version = "9.6.2"; + version = "9.6.3"; psqlSchema = "9.6"; - sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1"; + sha256 = "1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6"; }; } diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 35ec5b0c1100..39b574ae96d1 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jdbc.postgresql.org/; + homepage = https://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 9a6410490c54..0a25b314506b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}"; - version = "1.3.4"; + name = "pg_repack-${version}.1"; + version = "1.4.0"; + rev = "ver_${version}.1"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "ver_${version}"; - sha256 = "1hig4x8iycchlp42q8565jzi6hkj8gpbhl9kpn73jvk7afl7z0c8"; + inherit rev; + sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74"; }; installPhase = '' diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index f8c735d879bb..af1a3f1eb0e5 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; - homepage = "http://www.squid-cache.org"; + homepage = http://www.squid-cache.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ fpletz raskin ]; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index eeec90486892..1133b697a257 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; - homepage = "http://www.squid-cache.org"; + homepage = http://www.squid-cache.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index d42656cf0f6b..2cc0cac8a60a 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "16.3"; + version = "17.4"; src = fetchgit { - url = "https://tt-rss.org/gitlab/fox/tt-rss.git"; + url = "https://git.tt-rss.org/git/tt-rss.git"; rev = "refs/tags/${version}"; - sha256 = "1584lcq6kcy9f8ik5djb9apck9hxvfpl54sn6yhl3pdfrfdj3nw5"; + sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08"; }; buildPhases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 09cb2cca6288..8b963e586632 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; - homepage = "https://tvheadend.org"; + homepage = https://tvheadend.org; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.simonvandel ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 22cc5646f8bf..2e32f75c8673 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; patchPhase = '' substituteInPlace makefile --replace gcc cc ''; installPhase = '' - mkdir -p $out/bin $doc/share/man/man1 + mkdir -p $out/bin $man/share/man/man1 cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/ - cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $doc/share/man/man1 + cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $man/share/man/man1 ''; meta = { diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 7237bbdcd968..ec3b255116b3 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.5.19"; + version = "5.5.20"; src = fetchurl { url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl"; + sha256 = "14v38x46vgwm3wg28lzv4sz6kjgp6r1xkwxnxn6pzq2r7v6xkaz0"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index f871e6adf2be..d30129d93d95 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = [ "-lsystemd" ]; meta = with stdenv.lib; { - homepage = "http://uwsgi-docs.readthedocs.org/en/latest/"; + homepage = http://uwsgi-docs.readthedocs.org/en/latest/; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index bf8e69bd9896..82bbe048e43b 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -2,12 +2,12 @@ , python, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - version = "5.1.2"; + version = "5.1.3"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r"; + sha256 = "0km50hzjzi1kq85lr3hq519nrp261wb91ixq48vhyd41llycjfbl"; }; nativeBuildInputs = [ pkgconfig ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; - homepage = "https://www.varnish-cache.org"; + homepage = https://www.varnish-cache.org; license = licenses.bsd2; maintainers = with maintainers; [ garbas fpletz ]; platforms = platforms.linux; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix new file mode 100644 index 000000000000..530ae5047712 --- /dev/null +++ b/pkgs/servers/varnish/digest.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: + +stdenv.mkDerivation rec { + version = "1.0.1"; + name = "varnish-digest-${version}"; + + src = fetchFromGitHub { + owner = "varnish"; + repo = "libvmod-digest"; + rev = "libvmod-digest-${version}"; + sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig docutils ]; + buildInputs = [ varnish libmhash ]; + + postPatch = '' + substituteInPlace autogen.sh --replace "-I \''${dataroot}/aclocal" "" + substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "" + ''; + + configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Digest and HMAC vmod"; + homepage = https://github.com/varnish/libvmod-digest; + inherit (varnish.meta) license platforms maintainers; + }; +} diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix new file mode 100644 index 000000000000..7816b27b14f7 --- /dev/null +++ b/pkgs/servers/varnish/geoip.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, geoip, docutils }: + +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "varnish-geoip-${version}"; + + src = fetchFromGitHub { + owner = "varnish"; + repo = "libvmod-geoip"; + rev = "libvmod-geoip-${version}"; + sha256 = "1gmadayqh3dais14c4skvd47w8h4kyifg7kcw034i0777z5hfpyn"; + }; + + patches = [ + # IPv6 support + (fetchpatch { + url = https://github.com/volth/libvmod-geoip-1/commit/0966fe8.patch; + sha256 = "053im8h2y8qzs37g95ksr00sf625p23r5ps1j0a2h4lfg70vf4ry"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig docutils ]; + buildInputs = [ varnish geoip ]; + configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; + + meta = with stdenv.lib; { + description = "GeoIP Varnish module by Varnish Software"; + homepage = https://github.com/varnish/libvmod-geoip; + inherit (varnish.meta) license platforms maintainers; + }; +} diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix new file mode 100644 index 000000000000..c37fae4ba3d2 --- /dev/null +++ b/pkgs/servers/varnish/modules.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: + +stdenv.mkDerivation rec { + version = "0.10.2"; + name = "varnish-modules-${version}"; + + src = fetchurl { + url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz"; + sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im"; + }; + + nativeBuildInputs = [ pkgconfig docutils ]; + buildInputs = [ varnish python ]; + + meta = with stdenv.lib; { + description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; + homepage = https://github.com/varnish/varnish-modules; + inherit (varnish.meta) license platforms maintainers; + }; +} diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix new file mode 100644 index 000000000000..1efa6d5e7989 --- /dev/null +++ b/pkgs/servers/varnish/rtstatus.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: + +stdenv.mkDerivation rec { + version = "1.2.0"; + name = "varnish-rtstatus-${version}"; + + src = fetchurl { + url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz"; + sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; + }; + + nativeBuildInputs = [ pkgconfig docutils ]; + buildInputs = [ varnish python ]; + configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; + + meta = with stdenv.lib; { + description = "Varnish realtime status page"; + homepage = https://github.com/varnish/libvmod-rtstatus; + inherit (varnish.meta) license platforms maintainers; + }; +} diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix new file mode 100644 index 000000000000..c4f49b36bf80 --- /dev/null +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, lib } : + +stdenv.mkDerivation rec { + name = "pgpkeyserver-lite-${version}"; + version = "2017-07-18"; + + src = fetchFromGitHub { + owner = "mattrude"; + repo = "pgpkeyserver-lite"; + rev = "a038cb7"; + sha256 = "12pn92pcpv38b2gmamppn9yzdn7x52pgxnzpal22gqsxwimhs2rx"; + }; + + installPhase = '' + mkdir -p $out + cp -R 404.html assets favicon.ico index.html robots.txt $out + ''; + + meta = { + homepage = https://github.com/mattrude/pgpkeyserver-lite; + description = "A lightweight static front-end for a sks keyserver."; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.calbrecht ]; + }; +} diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix new file mode 100644 index 000000000000..0feae7d72411 --- /dev/null +++ b/pkgs/servers/web-apps/searx/default.nix @@ -0,0 +1,35 @@ +{ lib, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "searx-${version}"; + version = "0.12.0"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "searx"; + rev = "v${version}"; + sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2017.1.23' 'certifi' \ + --replace 'lxml==3.7.3' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + ''; + + propagatedBuildInputs = with pythonPackages; [ + pyyaml lxml grequests flaskbabel flask requests + gevent speaklater Babel pytz dateutil pygments + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks + ]; + + meta = with lib; { + homepage = https://github.com/asciimoo/searx; + description = "A privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; + }; +} diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 055886374df4..fae8bf5a8ce5 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -18,14 +18,14 @@ postInstall() { for r in $requires; do if test -n "$crossConfig"; then - for p in $crossPkgs; do + for p in "${crossPkgs[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs="$propagatedBuildInputs $p" fi done else - for p in $nativePkgs; do + for p in "${nativePkgs[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb08986e7024..7c052d8ef49f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1821,7 +1821,6 @@ let }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 09f75b436da5..2f2270d536d2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,7 +73,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; }; xcbproto = attrs : attrs // { @@ -177,7 +177,7 @@ in }; libXext = attrs: attrs // { - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -187,7 +187,7 @@ in }; libXi = attrs: attrs // { - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ xorg.libXfixes ]; }; @@ -565,8 +565,9 @@ in }; xf86videointel = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + configureFlags = "--with-default-dri=3 --enable-tools"; }; xf86videoxgi = attrs: attrs // { diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index b898abc97782..2799241fa990 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "17.01"; + version = "17.07"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky"; + sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r"; + outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7"; }; configureFlags = diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 16807a6571cd..4e15f472744d 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash }: +{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.9"; + version = "3.4.10"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7"; + sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz"; }; buildInputs = [ makeWrapper jre ]; @@ -17,12 +17,15 @@ stdenv.mkDerivation rec { mkdir -p $out cp -R conf docs lib ${name}.jar $out mkdir -p $out/bin - cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin + cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin for i in $out/bin/{zkCli,zkCleanup}.sh; do wrapProgram $i \ --set JAVA_HOME "${jre}" \ --prefix PATH : "${bash}/bin" done + substituteInPlace $out/bin/zkServer.sh \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace "/usr/bin/env bash" ${bash}/bin/bash chmod -x $out/bin/zkEnv.sh mkdir -p $out/share/zooinspector @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://zookeeper.apache.org"; + homepage = http://zookeeper.apache.org; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ]; diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 3ac1ca2172dd..1c1b83d67b95 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bash-completion-${version}"; - version = "2.5"; + version = "2.7"; src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; - sha256 = "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh"; + sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1"; }; doCheck = true; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index dba31e41ca37..b4a2ba553881 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -36,10 +36,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - outputs = [ "out" "dev" "doc" "info" ]; - - # the man pages are small and useful enough - outputMan = if interactive then "out" else null; + outputs = [ "out" "dev" "doc" "info" ] + # the man pages are small and useful enough, so include them in $out in interactive builds + ++ stdenv.lib.optional (!interactive) "man"; NIX_CFLAGS_COMPILE = '' -DSYS_BASHRC="/etc/bashrc" diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix deleted file mode 100644 index a09e56e46993..000000000000 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ /dev/null @@ -1,52 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc") -(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf") -(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0") -(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y") -(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s") -(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50") -(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi") -(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr") -(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0") -(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff") -(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw") -(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry") -(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z") -(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas") -(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k") -(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj") -(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj") -(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s") -(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7") -(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna") -(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1") -(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx") -(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls") -(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v") -(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y") -(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f") -(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy") -(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") -(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") -(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") -(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd") -(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8") -(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv") -(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi") -(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p") -(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc") -(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") -(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") -(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") -(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") -(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") -(patch "042" "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc") -(patch "043" "1031g97w8gamimb41jr9r2qm7mn10k5mr3sd3y12avml0p0a7a27") -(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k") -(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms") -(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k") -(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6") -(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv") -] diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index eaccb9a68dad..1de2a52634bc 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.8"; + name = "dash-0.5.9.1"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6"; + sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index b2a63e9532bc..5832c8ef8911 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, groff, man-db, glibc, libiconv, pcre2, - gettext, ncurses, python + gettext, ncurses, python3 , writeText , useOperatingSystemEtc ? true - + }: with stdenv.lib; @@ -85,86 +85,118 @@ let $__extra_confdir end ''; -in -stdenv.mkDerivation rec { - name = "fish-${version}"; - version = "2.6.0"; + fish = stdenv.mkDerivation rec { + name = "fish-${version}"; + version = "2.6.0"; - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; - src = fetchurl { - url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + src = fetchurl { + url = "http://fishshell.com/files/${version}/${name}.tar.gz"; + sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + }; + + buildInputs = [ ncurses libiconv pcre2 ]; + configureFlags = [ "--without-included-pcre2" ]; + + # Required binaries during execution + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ + coreutils gnugrep gnused bc + python3 groff gettext + ] ++ optional (!stdenv.isDarwin) man-db; + + postInstall = '' + sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ + -i "$out/share/fish/functions/grep.fish" + sed -e "s|bc|${bc}/bin/bc|" \ + -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ + -i "$out/share/fish/functions/seq.fish" \ + "$out/share/fish/functions/math.fish" + sed -i "s|which |${which}/bin/which |" \ + "$out/share/fish/functions/type.fish" + sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ + -i "$out/share/fish/functions/fish_prompt.fish" + sed -e "s|gettext |${gettext}/bin/gettext |" \ + -e "s|which |${which}/bin/which |" \ + -i "$out/share/fish/functions/_.fish" + sed -e "s|uname|${coreutils}/bin/uname|" \ + -i "$out/share/fish/functions/__fish_pwd.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -e "s|sed |${gnused}/bin/sed |" \ + -i "$out/share/fish/functions/alias.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -i "s|nroff |${groff}/bin/nroff |" \ + "$out/share/fish/functions/__fish_print_help.fish" + sed -i "s|/sbin /usr/sbin||" \ + "$out/share/fish/functions/__fish_complete_subcommand_root.fish" + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + -i "$out/share/fish/functions/fish_default_key_bindings.fish" + sed -e "s|python3|${getBin python3}/bin/python3|" \ + -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} + + '' + optionalString stdenv.isLinux '' + sed -e "s| ul| ${utillinux}/bin/ul|" \ + -i "$out/share/fish/functions/__fish_print_help.fish" + for cur in $out/share/fish/functions/*.fish; do + sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ + -i "$cur" + done + + '' + optionalString (!stdenv.isDarwin) '' + sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ + "$out/share/fish/functions/fish_prompt.fish" + sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ + "$out/share/fish/tools/create_manpage_completions.py" + sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ + "$out/share/fish/functions/man.fish" + '' + optionalString useOperatingSystemEtc '' + tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} + '' + '' + tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} + ''; + + meta = with stdenv.lib; { + description = "Smart and user-friendly command line shell"; + homepage = http://fishshell.com/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ ocharles ]; + }; + + passthru = { + shellPath = "/bin/fish"; + }; }; - buildInputs = [ ncurses libiconv pcre2 ]; - configureFlags = [ "--without-included-pcre2" ]; + tests = { - # Required binaries during execution - # Python: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ - coreutils gnugrep gnused bc - python groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' - postInstall = '' - sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ - -i "$out/share/fish/functions/grep.fish" - sed -e "s|bc|${bc}/bin/bc|" \ - -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ - -i "$out/share/fish/functions/seq.fish" \ - "$out/share/fish/functions/math.fish" - sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" - sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ - -i "$out/share/fish/functions/fish_prompt.fish" - sed -e "s|gettext |${gettext}/bin/gettext |" \ - -e "s|which |${which}/bin/which |" \ - -i "$out/share/fish/functions/_.fish" - sed -e "s|uname|${coreutils}/bin/uname|" \ - -i "$out/share/fish/functions/__fish_pwd.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -e "s|sed |${gnused}/bin/sed |" \ - -i "$out/share/fish/functions/alias.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -i "s|nroff |${groff}/bin/nroff |" \ - "$out/share/fish/functions/__fish_print_help.fish" - sed -i "s|/sbin /usr/sbin||" \ - "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${ncurses.out}/bin/clear;|" \ - -i "$out/share/fish/functions/fish_default_key_bindings.fish" \ - - '' + optionalString stdenv.isLinux '' - sed -e "s| ul| ${utillinux}/bin/ul|" \ - -i "$out/share/fish/functions/__fish_print_help.fish" - for cur in $out/share/fish/functions/*.fish; do - sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ - -i "$cur" - done - - '' + optionalString (!stdenv.isDarwin) '' - sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ - "$out/share/fish/functions/fish_prompt.fish" - sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ - "$out/share/fish/tools/create_manpage_completions.py" - sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ - "$out/share/fish/functions/man.fish" - '' + optionalString useOperatingSystemEtc '' - tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} - '' + '' - tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} - ''; - - meta = with stdenv.lib; { - description = "Smart and user-friendly command line shell"; - homepage = "http://fishshell.com/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ ocharles ]; + # cannot test the http server because it needs a localhost port + ''; + in '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} + ''; }; - passthru = { - shellPath = "/bin/fish"; - }; -} + # FIXME(Profpatsch) replace withTests stub + withTests = flip const; + +in withTests tests fish diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix index 5da96adaabdb..a5482ce93cc7 100644 --- a/pkgs/shells/grml-zsh-config/default.nix +++ b/pkgs/shells/grml-zsh-config/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchFromGitHub, lib , zsh, coreutils, inetutils, procps, txt2tags }: with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.12.4"; + version = "0.14.2"; - src = fetchurl { - url = "http://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_${version}.tar.gz"; - sha256 = "1cbedc41e32787c37c2ed546355a26376dacf2ae1fab9551c9ace3e46d236b72"; + src = fetchFromGitHub { + owner = "grml"; + repo = "grml-etc-core"; + rev = "v${version}"; + sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm"; }; buildInputs = [ zsh coreutils inetutils procps txt2tags ]; @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://grml.org/zsh/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; + maintainers = with maintainers; [ msteen rvolosatovs ]; }; } diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index 8e2a0950d194..8f50448b714b 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; - homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; + homepage = https://github.com/halfo/lambda-mod-zsh-theme/; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index e21c97c297ca..23c7e2cc3a5b 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - homepage = "https://www.mirbsd.org/mksh.htm"; + homepage = https://www.mirbsd.org/mksh.htm; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres nckx joachifm ]; platforms = platforms.unix; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 1261a4429a4e..eaae85990b20 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://github.com/spwhitt/nix-zsh-completions"; + homepage = http://github.com/spwhitt/nix-zsh-completions; description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix new file mode 100644 index 000000000000..eebbc6d1b867 --- /dev/null +++ b/pkgs/shells/oil/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, coreutils }: +let + version = "0.0.0"; +in +stdenv.mkDerivation { + name = "oil-${version}"; + + src = fetchurl { + url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; + sha256 = "1mvyvvzw149piwa7xdl3byyn7h31p4cnrf3w9dxr5qfd9vc4gmsm"; + }; + + postPatch = '' + patchShebangs build + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + # Stripping breaks the bundles by removing the zip file from the end. + dontStrip = true; + + meta = { + homepage = https://www.oilshell.org/; + + description = "A new unix shell, still in its early stages"; + + license = with lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index d3ce1ff1cc2d..c58fda28db05 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { longDescription = '' rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. ''; - homepage = "http://www.pizzashack.org/rssh/"; + homepage = http://www.pizzashack.org/rssh/; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index a2689fc64c19..598e6dbd9460 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; - homepage = "http://xonsh.org"; + homepage = http://xonsh.org; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt garbas vrthra ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix index fe7ed752f5e9..22ea54142513 100644 --- a/pkgs/shells/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh-autosuggestions/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fish shell autosuggestions for Zsh"; - homepage = "https://github.com/zsh-users/zsh-autosuggestions"; + homepage = https://github.com/zsh-users/zsh-autosuggestions; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.loskutov ]; diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix index a1f708227250..4a5731b91523 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94"; + sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2"; }; installPhase= '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; - homepage = "https://github.com/zsh-users/zsh-completions"; + homepage = https://github.com/zsh-users/zsh-completions; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix index 80886e1038bc..c5f404bbd3fd 100644 --- a/pkgs/shells/zsh-prezto/default.nix +++ b/pkgs/shells/zsh-prezto/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes."; - homepage = "https://github.com/sorin-ionescu/prezto"; + homepage = https://github.com/sorin-ionescu/prezto; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = with platforms; unix; diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix index 21911c8800cb..a97251d8e560 100644 --- a/pkgs/shells/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh-syntax-highlighting/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fish shell like syntax highlighting for Zsh"; - homepage = "https://github.com/zsh-users/zsh-syntax-highlighting"; + homepage = https://github.com/zsh-users/zsh-syntax-highlighting; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.loskutov ]; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index c48140462002..50481dd941bb 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.3.1"; + version = "5.4.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1"; + sha256 = "17qg4iqhvkxsmk1p04brkjq20vb7zx6d8qx1r2q8v6cy4qvqjbjr"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x"; + sha256 = "1qhw00y0gnr66bil48hj4wjm0cbjxfdkz5hyb82garp8r8rbhiy4"; }; buildInputs = [ ncurses pcre ]; @@ -76,7 +76,7 @@ EOF a host of other features. ''; license = "MIT-like"; - homepage = "http://www.zsh.org/"; + homepage = http://www.zsh.org/; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5848ee87b1b0..ac382927b1b9 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -73,15 +73,8 @@ rec { }; in stdenv // { mkDerivation = - { name ? "", buildInputs ? [], nativeBuildInputs ? [] + { buildInputs ? [], nativeBuildInputs ? [] , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] - , # Disabling the tests by default when cross compiling, as usually the - # tests rely on being able to run produced binaries. - doCheck ? false - , configureFlags ? [] - , # Target is not included by default because most programs don't care. - # Including it then would cause needless massive rebuilds. - configurePlatforms ? args.crossAttrs.configurePlatforms or [ "build" "host" ] , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: @@ -106,7 +99,6 @@ rec { nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { - name = name + "-" + hostPlatform.config; nativeBuildInputs = nativeBuildInputs ++ nativeInputsFromBuildInputs ++ stdenv.lib.optional selfNativeBuildInput nativeDrv @@ -116,15 +108,6 @@ rec { ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook ; - inherit doCheck; - - # This parameter is sometimes a string and sometimes a list, yuck - configureFlags = let inherit (stdenv.lib) optional elem; in - (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags) - ++ optional (elem "build" configurePlatforms) "--build=${buildPlatform.config}" - ++ optional (elem "host" configurePlatforms) "--host=${hostPlatform.config}" - ++ optional (elem "target" configurePlatforms) "--target=${targetPlatform.config}"; - # 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 diff --git a/pkgs/stdenv/darwin/darwin-secure-format.patch b/pkgs/stdenv/darwin/darwin-secure-format.patch new file mode 100644 index 000000000000..b14d8be6ef16 --- /dev/null +++ b/pkgs/stdenv/darwin/darwin-secure-format.patch @@ -0,0 +1,15 @@ +With format string strictness, High Sierra also enforces that %n isn't used +in dynamic format strings, but we should just disable its use on darwin in +general. + +--- a/lib/vasnprintf.c 2017-06-22 15:19:15.000000000 -0700 ++++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 +@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f6d9bcac5104..fc0caeafc295 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -4,15 +4,15 @@ # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/10cbca5b30c6cb421ce15139f32ae3a4977292cf/${file}"; inherit (localSystem) system; inherit sha256 executable; }; in { - sh = fetch { file = "sh"; sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; }; - mkdir = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; }; - cpio = fetch { file = "cpio"; sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; }; + sh = fetch { file = "sh"; sha256 = "0s8a9vpzj6vadq4jmf4r8cargwnsf327hdjydxgqsfxb8y1q39w3"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "1jqljpjr8mkiv7g5rl5impqx3all8vn1mxxdwa004pr3h48c1zgg"; }; + mkdir = fetch { file = "mkdir"; sha256 = "17zsjiwnq07i5r85q1hg7f6cnkcgllwy2amz9klaqwjy4vzz4vwh"; }; + cpio = fetch { file = "cpio"; sha256 = "04hrair58dgja6syh442pswiga5an9nl58ls57yknkn2pq51nx9m"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "103833hrci0vwi1gi978hkp69rncicvpdszn87ffpf1cq0jzpa14"; executable = false; }; } }: @@ -50,6 +50,8 @@ in rec { args = [ ./unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) mkdir bzip2 cpio tarball; + reexportedLibrariesFile = + ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; __sandboxProfile = binShClosure + libSystemProfile; }; @@ -75,7 +77,6 @@ in rec { cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenv; - inherit (last.pkgs.darwin) dyld; nativeTools = true; nativePrefix = bootstrapTools; @@ -83,8 +84,6 @@ in rec { buildPackages = lib.optionalAttrs (last ? stdenv) { inherit (last) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; @@ -109,7 +108,13 @@ in rec { stdenvSandboxProfile = binShClosure + libSystemProfile; extraSandboxProfile = binShClosure + libSystemProfile; - extraAttrs = { inherit platform; parent = last; }; + extraAttrs = { + inherit platform; + parent = last; + + # This is used all over the place so I figured I'd just leave it here for now + secure-format-patch = ./darwin-secure-format.patch; + }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -157,32 +162,32 @@ in rec { extraBuildInputs = []; }; - persistent0 = _: _: _: {}; - - stage1 = prevStage: with prevStage; stageFun 1 prevStage { + stage1 = prevStage: let + persistent = _: _: {}; + in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraBuildInputs = [ pkgs.libcxx ]; allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ]; - overrides = persistent0 prevStage; + overrides = persistent; }; - persistent1 = prevStage: self: super: with prevStage; { - inherit - zlib patchutils m4 scons flex perl bison unifdef unzip openssl python - libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff - openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz - findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; + stage2 = prevStage: let + persistent = self: super: with prevStage; { + inherit + zlib patchutils m4 scons flex perl bison unifdef unzip openssl python + libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff + openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz + findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; - darwin = super.darwin // { - inherit (darwin) - dyld Libsystem xnu configd ICU libdispatch libclosure launchd; + darwin = super.darwin // { + inherit (darwin) + dyld Libsystem xnu configd ICU libdispatch libclosure launchd; + }; }; - }; - - stage2 = prevStage: with prevStage; stageFun 2 prevStage { + in with prevStage; stageFun 2 prevStage { extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -194,24 +199,24 @@ in rec { (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); - overrides = persistent1 prevStage; + overrides = persistent; }; - persistent2 = prevStage: self: super: with prevStage; { - inherit - patchutils m4 scons flex perl bison unifdef unzip openssl python - gettext sharutils libarchive pkg-config groff bash subversion - openssh sqlite sed serf openldap db cyrus-sasl expat apr-util - findfreetype libssh curl cmake autoconf automake libtool cpio - libcxx libcxxabi; + stage3 = prevStage: let + persistent = self: super: with prevStage; { + inherit + patchutils m4 scons flex perl bison unifdef unzip openssl python + gettext sharutils libarchive pkg-config groff bash subversion + openssh sqlite sed serf openldap db cyrus-sasl expat apr-util + findfreetype libssh curl cmake autoconf automake libtool cpio + libcxx libcxxabi; - darwin = super.darwin // { - inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; + darwin = super.darwin // { + inherit (darwin) + dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; + }; }; - }; - - stage3 = prevStage: with prevStage; stageFun 3 prevStage { + in with prevStage; stageFun 3 prevStage { shell = "${pkgs.bash}/bin/bash"; # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun @@ -230,54 +235,55 @@ in rec { (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ (with pkgs.darwin; [ dyld ICU Libsystem locale ]); - overrides = persistent2 prevStage; + overrides = persistent; }; - persistent3 = prevStage: self: super: with prevStage; { - inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep - coreutils findutils diffutils patchutils; + stage4 = prevStage: let + persistent = self: super: with prevStage; { + inherit + gnumake gzip gnused bzip2 gawk ed xz patch bash + libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep + coreutils findutils diffutils patchutils; - llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; - in super.llvmPackages // { - llvm = llvmOverride; - clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; - }; + llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; + in super.llvmPackages // { + llvm = llvmOverride; + clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; + }; - darwin = super.darwin // { - inherit (darwin) dyld Libsystem libiconv locale; + darwin = super.darwin // { + inherit (darwin) dyld Libsystem libiconv locale; + }; }; - }; - - stage4 = prevStage: with prevStage; stageFun 4 prevStage { + in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ]; extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - overrides = persistent3 prevStage; + overrides = persistent; }; - persistent4 = prevStage: self: super: with prevStage; { - inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep - coreutils findutils diffutils patchutils; + stdenvDarwin = prevStage: let + pkgs = prevStage; + persistent = self: super: with prevStage; { + inherit + gnumake gzip gnused bzip2 gawk ed xz patch bash + libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep + coreutils findutils diffutils patchutils; - llvmPackages = super.llvmPackages // { - inherit (llvmPackages) llvm clang-unwrapped; + llvmPackages = super.llvmPackages // { + inherit (llvmPackages) llvm clang-unwrapped; + }; + + darwin = super.darwin // { + inherit (darwin) dyld ICU Libsystem cctools libiconv; + }; + } // lib.optionalAttrs (super.targetPlatform == localSystem) { + # Need to get rid of these when cross-compiling. + inherit binutils binutils-raw; }; - - darwin = super.darwin // { - inherit (darwin) dyld ICU Libsystem cctools libiconv; - }; - } // lib.optionalAttrs (super.targetPlatform == localSystem) { - # Need to get rid of these when cross-compiling. - inherit binutils binutils-raw; - }; - - stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec { + in import ../generic rec { inherit config; inherit (pkgs.stdenv) fetchurlBoot; @@ -297,7 +303,7 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - cc = import ../../build-support/cc-wrapper { + cc = lib.callPackageWith {} ../../build-support/cc-wrapper { inherit (pkgs) stdenv; inherit shell; nativeTools = false; @@ -305,10 +311,7 @@ in rec { buildPackages = { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit (pkgs) coreutils binutils gnugrep; - inherit (pkgs.darwin) dyld; cc = pkgs.llvmPackages.clang-unwrapped; libc = pkgs.darwin.Libsystem; }; @@ -319,6 +322,9 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; + + # This is used all over the place so I figured I'd just leave it here for now + secure-format-patch = ./darwin-secure-format.patch; }; allowedRequisites = (with pkgs; [ @@ -333,9 +339,9 @@ in rec { ]); overrides = self: super: - let persistent = persistent4 prevStage self super; in persistent // { + let persistent' = persistent self super; in persistent' // { clang = cc; - llvmPackages = persistent.llvmPackages // { clang = cc; }; + llvmPackages = persistent'.llvmPackages // { clang = cc; }; inherit cc; }; }; diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 66c4e9ebeda9..0da80ec5ce56 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -26,7 +26,7 @@ install_name_tool \ $out/lib/system/libsystem_kernel.dylib # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! -libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') +libs=$(cat $reexportedLibrariesFile | grep -v '^#') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index d15afe761894..c10d1515a3d5 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -40,8 +40,6 @@ let inherit (localSystem) system; in targetPlatform = localSystem; inherit config; initialPath = [ "/" "/usr" ]; - hostPlatform = localSystem; - targetPlatform = localSystem; shell = "${bootstrapTools}/bin/bash"; fetchurlBoot = null; cc = null; @@ -55,13 +53,11 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config; initialPath = [ prevStage.bootstrapTools ]; inherit (prevStage.stdenv) - hostPlatform targetPlatform shell; + buildPlatform hostPlatform targetPlatform + shell; fetchurlBoot = prevStage.fetchurl; cc = null; }; @@ -71,13 +67,11 @@ let inherit (localSystem) system; in inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config; inherit (prevStage.stdenv) - hostPlatform targetPlatform initialPath shell fetchurlBoot; + buildPlatform hostPlatform targetPlatform + initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { nativeTools = true; diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index a46c46c2db50..42e1a029e584 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -15,4 +15,6 @@ cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support -echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +if [ "$propagatedUserEnvPkgs" ]; then + printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 8b2cf01f169b..8544d932f81c 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -40,6 +40,8 @@ let allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + allowUnsupportedSystem = config.allowUnsupportedSystem or false; + isUnfree = licenses: lib.lists.any (l: !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; @@ -177,7 +179,7 @@ let { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then + else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 31b0428eeb2b..74d387e353c5 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,12 +12,22 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { nativeBuildInputs ? [] + { name ? "" + + , nativeBuildInputs ? [] , buildInputs ? [] , propagatedNativeBuildInputs ? [] , propagatedBuildInputs ? [] + , configureFlags ? [] + , # Target is not included by default because most programs don't care. + # Including it then would cause needless mass rebuilds. + # + # TODO(@Ericson2314): Make [ "build" "host" ] always the default. + configurePlatforms ? lib.optionals + (stdenv.hostPlatform != stdenv.buildPlatform) + [ "build" "host" ] , crossConfig ? null , meta ? {} , passthru ? {} @@ -33,48 +43,40 @@ rec { , propagatedSandboxProfile ? "" , ... } @ attrs: let - dependencies = [ - (map (drv: drv.nativeDrv or drv) nativeBuildInputs) + 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) ]; - propagatedDependencies = [ + propagatedDependencies = map lib.chooseDevOutputs [ (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) (map (drv: drv.crossDrv or drv) propagatedBuildInputs) ]; - in let outputs' = outputs ++ (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); - dependencies' = let - justMap = map lib.chooseDevOutputs dependencies; - nativeBuildInputs = lib.elemAt justMap 0 - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh; - buildInputs = lib.elemAt justMap 1 - # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`. - ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh; - in [ nativeBuildInputs buildInputs ]; - - propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; - derivationArg = (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (let - # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild. computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')); + lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies); computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies')); + lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies); computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'))); + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies)); computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies'))); + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies)); in { + name = name + lib.optionalString + (stdenv.hostPlatform != stdenv.buildPlatform) + stdenv.hostPlatform.config; builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; @@ -82,11 +84,21 @@ rec { userHook = config.stdenv.userHook or null; __ignoreNulls = true; - nativeBuildInputs = lib.elemAt dependencies' 0; - buildInputs = lib.elemAt dependencies' 1; + nativeBuildInputs = lib.elemAt dependencies 0; + buildInputs = lib.elemAt dependencies 1; + + propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0; + propagatedBuildInputs = lib.elemAt propagatedDependencies 1; + + # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck + configureFlags = let inherit (lib) optional elem; in + (/**/ if lib.isString configureFlags then [configureFlags] + else if configureFlags == null then [] + else configureFlags) + ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" + ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" + ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; - propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; - propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index eb63b18e5f3d..b6bca3e1f562 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -17,8 +17,10 @@ runHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" - for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do + + local varRef="$var[@]" + local hook + for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do _eval "$hook" "$@" done return 0 @@ -32,8 +34,10 @@ runOneHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" - for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do + + local varRef="$var[@]" + local hook + for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do if _eval "$hook" "$@"; then return 0 fi @@ -50,9 +54,9 @@ runOneHook() { _callImplicitHook() { local def="$1" local hookName="$2" - case "$(type -t $hookName)" in - (function|alias|builtin) $hookName;; - (file) source $hookName;; + case "$(type -t "$hookName")" in + (function|alias|builtin) "$hookName";; + (file) source "$hookName";; (keyword) :;; (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;; esac @@ -64,7 +68,7 @@ _callImplicitHook() { _eval() { local code="$1" shift - if [ "$(type -t $code)" = function ]; then + if [ "$(type -t "$code")" = function ]; then eval "$code \"\$@\"" else eval "$code" @@ -75,29 +79,20 @@ _eval() { ###################################################################### # Logging. -nestingLevel=0 +# Obsolete. +stopNest() { true; } +header() { echo "$1"; } +closeNest() { true; } -startNest() { - nestingLevel=$(($nestingLevel + 1)) - echo -en "\033[$1p" -} - -stopNest() { - nestingLevel=$(($nestingLevel - 1)) - echo -en "\033[q" -} - -header() { - startNest "$2" - echo "$1" -} - -# Make sure that even when we exit abnormally, the original nesting -# level is properly restored. -closeNest() { - while [ $nestingLevel -gt 0 ]; do - stopNest - done +# Prints a command such that all word splits are unambiguous. We need +# to split the command in three parts because the middle format string +# will be, and must be, repeated for each argument. The first argument +# goes before the ':' and is just for convenience. +echoCmd() { + printf "%s:" "$1" + shift + printf ' %q' "$@" + echo } @@ -105,11 +100,9 @@ closeNest() { # Error handling. exitHandler() { - exitCode=$? + exitCode="$?" set +e - closeNest - if [ -n "$showBuildStats" ]; then times > "$NIX_BUILD_TOP/.times" local -a times=($(cat "$NIX_BUILD_TOP/.times")) @@ -118,10 +111,10 @@ exitHandler() { # - system time for the shell # - user time for all child processes # - system time for all child processes - echo "build time elapsed: " ${times[*]} + echo "build time elapsed: " "${times[@]}" fi - if [ $exitCode != 0 ]; then + if [ "$exitCode" != 0 ]; then runHook failureHook # If the builder had a non-zero exit code and @@ -131,7 +124,7 @@ exitHandler() { if [ -n "$succeedOnFailure" ]; then echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" - printf "%s" $exitCode > "$out/nix-support/failed" + printf "%s" "$exitCode" > "$out/nix-support/failed" exit 0 fi @@ -139,7 +132,7 @@ exitHandler() { runHook exitHook fi - exit $exitCode + exit "$exitCode" } trap "exitHandler" EXIT @@ -150,11 +143,11 @@ trap "exitHandler" EXIT addToSearchPathWithCustomDelimiter() { - local delimiter=$1 - local varName=$2 - local dir=$3 + local delimiter="$1" + local varName="$2" + local dir="$3" if [ -d "$dir" ]; then - eval export ${varName}=${!varName}${!varName:+$delimiter}${dir} + export "${varName}=${!varName}${!varName:+$delimiter}${dir}" fi } @@ -192,9 +185,10 @@ _addRpathPrefix() { # Return success if the specified file is an ELF object. isELF() { local fn="$1" + local fd local magic exec {fd}< "$fn" - read -n 4 -u $fd magic + read -r -n 4 -u "$fd" magic exec {fd}<&- if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi } @@ -203,14 +197,25 @@ isELF() { # "#!"). isScript() { local fn="$1" + local fd local magic if ! [ -x /bin/sh ]; then return 0; fi exec {fd}< "$fn" - read -n 2 -u $fd magic + read -r -n 2 -u "$fd" magic exec {fd}<&- if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi } +# printf unfortunately will print a trailing newline regardless +printLines() { + [[ "$#" -gt 0 ]] || return 0 + printf '%s\n' "$@" +} + +printWords() { + [[ "$#" -gt 0 ]] || return 0 + printf '%s ' "$@" +} ###################################################################### # Initialisation. @@ -234,7 +239,7 @@ shopt -s nullglob PATH= for i in $initialPath; do if [ "$i" = / ]; then i=; fi - addToSearchPath PATH $i/bin + addToSearchPath PATH "$i/bin" done if [ "$NIX_DEBUG" = 1 ]; then @@ -254,7 +259,7 @@ paxmark() { true; } # Execute the pre-hook. -if [ -z "$shell" ]; then export shell=$SHELL; fi +if [ -z "$shell" ]; then export shell="$SHELL"; fi runHook preHook @@ -267,16 +272,20 @@ runHook addInputsHook # Recursively find all build inputs. findInputs() { local pkg="$1" - local var=$2 - local propagatedBuildInputsFile=$3 + local var="$2" + local propagatedBuildInputsFile="$3" - case ${!var} in - *\ $pkg\ *) - return 0 - ;; + # 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 varRef="$var[*]" + + case "${!varRef}" in + *" $pkg "*) return 0 ;; esac - eval $var="'${!var} $pkg '" + eval "$var"'+=("$pkg")' if ! [ -e "$pkg" ]; then echo "build input $pkg does not exist" >&2 @@ -287,8 +296,8 @@ findInputs() { source "$pkg" fi - if [ -d $1/bin ]; then - addToSearchPath _PATH $1/bin + if [ -d "$pkg/bin" ]; then + addToSearchPath _PATH "$pkg/bin" fi if [ -f "$pkg/nix-support/setup-hook" ]; then @@ -296,8 +305,9 @@ findInputs() { fi if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then - for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do - findInputs "$i" $var $propagatedBuildInputsFile + local pkgNext + for pkgNext in $(< "$pkg/nix-support/$propagatedBuildInputsFile"); do + findInputs "$pkgNext" "$var" "$propagatedBuildInputsFile" done fi } @@ -305,47 +315,60 @@ findInputs() { if [ -z "$crossConfig" ]; then # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs) # are handled identically to nativeBuildInputs - nativePkgs="" + declare -a nativePkgs for i in $nativeBuildInputs $buildInputs \ $defaultNativeBuildInputs $defaultBuildInputs \ $propagatedNativeBuildInputs $propagatedBuildInputs; do - findInputs $i nativePkgs propagated-native-build-inputs + findInputs "$i" nativePkgs propagated-native-build-inputs done else - crossPkgs="" + declare -a crossPkgs for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do - findInputs $i crossPkgs propagated-build-inputs + findInputs "$i" crossPkgs propagated-build-inputs done - nativePkgs="" + declare -a nativePkgs for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do - findInputs $i nativePkgs propagated-native-build-inputs + findInputs "$i" nativePkgs propagated-native-build-inputs done fi # 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. + _addToNativeEnv() { - local pkg=$1 + 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 i in $nativePkgs; do - _addToNativeEnv $i +for i in "${nativePkgs[@]}"; do + _addToNativeEnv "$i" done _addToCrossEnv() { - local pkg=$1 + local pkg="$1" + local -i depOffset=0 # Run the package-specific hooks set by the setup-hook scripts. runHook crossEnvHook "$pkg" } -for i in $crossPkgs; do - _addToCrossEnv $i +for i in "${crossPkgs[@]}"; do + _addToCrossEnv "$i" done @@ -412,48 +435,53 @@ fi substitute() { local input="$1" local output="$2" + shift 2 if [ ! -f "$input" ]; then - echo "substitute(): file '$input' does not exist" + echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2 return 1 fi - local -a params=("$@") + local content + # read returns non-0 on EOF, so we want read to fail + if IFS='' read -r -N 0 content < "$input"; then + echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2 + return 1 + fi - local n p pattern replacement varName content + while (( "$#" )); do + case "$1" in + --replace) + pattern="$2" + replacement="$3" + shift 3 + ;; - # a slightly hacky way to keep newline at the end - content="$(cat "$input"; printf "%s" X)" - content="${content%X}" + --subst-var) + local varName="$2" + shift 2 + # check if the used nix attribute name is a valid bash name + if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2 + echo " \"$varName\" isn't and therefore was skipped; it might be caused" >&2 + echo " by multi-line phases in variables - see #14907 for details." >&2 + continue + fi + pattern="@$varName@" + replacement="${!varName}" + ;; - for ((n = 2; n < ${#params[*]}; n += 1)); do - p="${params[$n]}" + --subst-var-by) + pattern="@$2@" + replacement="$3" + shift 3 + ;; - if [ "$p" = --replace ]; then - pattern="${params[$((n + 1))]}" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi - - if [ "$p" = --subst-var ]; then - varName="${params[$((n + 1))]}" - n=$((n + 1)) - # check if the used nix attribute name is a valid bash name - if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "WARNING: substitution variables should be valid bash names," - echo " \"$varName\" isn't and therefore was skipped; it might be caused" - echo " by multi-line phases in variables - see #14907 for details." - continue - fi - pattern="@$varName@" - replacement="${!varName}" - fi - - if [ "$p" = --subst-var-by ]; then - pattern="@${params[$((n + 1))]}@" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi + *) + echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2 + return 1 + ;; + esac content="${content//"$pattern"/$replacement}" done @@ -516,7 +544,9 @@ dumpVars() { # Utility function: echo the base name of the given path, with the # prefix `HASH-' removed, if present. stripHash() { - local strippedName="$(basename "$1")"; + local strippedName + # On separate line for `set -e` + strippedName="$(basename "$1")" if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then echo "$strippedName" | cut -c34- else @@ -564,7 +594,6 @@ unpackFile() { echo "do not know how to unpack source archive $curSrc" exit 1 fi - stopNest } @@ -573,6 +602,7 @@ unpackPhase() { if [ -z "$srcs" ]; then if [ -z "$src" ]; then + # shellcheck disable=SC2016 echo 'variable $src or $srcs should point to the source' exit 1 fi @@ -592,7 +622,7 @@ unpackPhase() { # Unpack all source archives. for i in $srcs; do - unpackFile $i + unpackFile "$i" done # Find the source directory. @@ -656,8 +686,8 @@ patchPhase() { ;; esac # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) + # shellcheck disable=SC2086 $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1} - stopNest done runHook postPatch @@ -672,18 +702,19 @@ fixLibtool() { configurePhase() { runHook preConfigure - if [ -z "$configureScript" -a -x ./configure ]; then + if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure fi if [ -z "$dontFixLibtool" ]; then - find . -iname "ltmain.sh" | while read i; do + local i + find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do echo "fixing libtool script $i" - fixLibtool $i + fixLibtool "$i" done fi - if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then + if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi @@ -702,8 +733,12 @@ configurePhase() { fi if [ -n "$configureScript" ]; then - echo "configure flags: $configureFlags ${configureFlagsArray[@]}" - $configureScript $configureFlags "${configureFlagsArray[@]}" + # shellcheck disable=SC2086 + local flagsArray=($configureFlags "${configureFlagsArray[@]}") + echoCmd 'configure flags' "${flagsArray[@]}" + # shellcheck disable=SC2086 + $configureScript "${flagsArray[@]}" + unset flagsArray else echo "no configure script, doing nothing" fi @@ -715,17 +750,21 @@ configurePhase() { buildPhase() { runHook preBuild - if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then + if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 makeFlags="SHELL=$SHELL $makeFlags" - echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - $buildFlags "${buildFlagsArray[@]}" + $buildFlags "${buildFlagsArray[@]}") + + echoCmd 'build flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray fi runHook postBuild @@ -735,11 +774,15 @@ buildPhase() { checkPhase() { runHook preCheck - echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check} + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check}) + + echoCmd 'check flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postCheck } @@ -752,11 +795,16 @@ installPhase() { mkdir -p "$prefix" fi - installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ + installTargets="${installTargets:-install}" + + # shellcheck disable=SC2086 + local flagsArray=( $installTargets \ $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" + $installFlags "${installFlagsArray[@]}") + + echoCmd 'install flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postInstall } @@ -776,7 +824,7 @@ fixupPhase() { # Apply fixup to each output. local output for output in $outputs; do - prefix=${!output} runHook fixupOutput + prefix="${!output}" runHook fixupOutput done @@ -790,17 +838,20 @@ fixupPhase() { fi if [ -n "$propagated" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs" + # shellcheck disable=SC2086 + printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs" fi else if [ -n "$propagatedBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs" + # shellcheck disable=SC2086 + printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" fi if [ -n "$propagatedNativeBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" + # shellcheck disable=SC2086 + printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" fi fi @@ -813,7 +864,8 @@ fixupPhase() { if [ -n "$propagatedUserEnvPkgs" ]; then mkdir -p "${!outputBin}/nix-support" - echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages" + # shellcheck disable=SC2086 + printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup @@ -823,11 +875,15 @@ fixupPhase() { installCheckPhase() { runHook preInstallCheck - echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}" - make ${makefile:+-f $makefile} \ + # shellcheck disable=SC2086 + local flagsArray=( \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck} + $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}) + + echoCmd 'installcheck flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray runHook postInstallCheck } @@ -836,15 +892,19 @@ installCheckPhase() { distPhase() { runHook preDist - echo "dist flags: $distFlags ${distFlagsArray[@]}" - make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} + # shellcheck disable=SC2086 + local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist}) + + echo 'dist flags: %q' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" if [ "$dontCopyDist" != 1 ]; then mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - cp -pvd ${tarballs:-*.tar.gz} $out/tarballs + # shellcheck disable=SC2086 + cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" fi runHook postDist @@ -853,7 +913,7 @@ distPhase() { showPhaseHeader() { local phase="$1" - case $phase in + case "$phase" in unpackPhase) header "unpacking sources";; patchPhase) header "patching sources";; configurePhase) header "configuring";; @@ -885,14 +945,14 @@ genericBuild() { fi for curPhase in $phases; do - if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi - if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi - if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi - if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi - if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi - if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi + if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi + if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi + if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi + if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi + if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi + if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi - if [ -n "$tracePhases" ]; then + if [[ -n "$tracePhases" ]]; then echo echo "@ phase-started $out $curPhase" fi @@ -912,8 +972,6 @@ genericBuild() { echo echo "@ phase-succeeded $out $curPhase" fi - - stopNest done } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index c475d2d1e927..d8ee60af65e7 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -79,8 +79,6 @@ let buildPackages = lib.optionalAttrs (prevStage ? stdenv) { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; isGNU = true; libc = prevStage.glibc; @@ -244,8 +242,6 @@ in buildPackages = { inherit (prevStage) stdenv; }; - hostPlatform = localSystem; - targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; libc = self.glibc; inherit (self) stdenv binutils coreutils gnugrep; @@ -299,13 +295,22 @@ in shellPackage = prevStage.bash; }; - /* outputs TODO - allowedRequisites = with prevStage; - [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk - glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl - paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv - ] ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; - */ + # Mainly avoid reference to bootstrap tools + 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 + ] + # Library dependencies + ++ map getLib [ attr acl zlib pcre libsigsegv ] + # More complicated cases + ++ [ + glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders + gcc gcc.cc gcc.cc.lib gcc.expandResponseParams + ] + ++ lib.optionals (system == "aarch64-linux") + [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: { inherit (prevStage) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 2ce73eb781d8..c8cddf248ab9 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -21,8 +21,8 @@ rec { enableMinimal = true; extraConfig = '' CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y + CONFIG_ASH_ECHO y + CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y CONFIG_MKDIR y CONFIG_TAR y diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index aaf6c523ea4a..c736442dc0a4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -13,12 +13,10 @@ bootStages ++ [ inherit config overlays; stdenv = import ../generic rec { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; - inherit config; + inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform; + preHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" @@ -27,8 +25,6 @@ bootStages ++ [ initialPath = (import ../common-path.nix) { pkgs = prevStage; }; - inherit (prevStage.stdenv) hostPlatform targetPlatform; - cc = import ../../build-support/cc-wrapper { nativeTools = false; nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix new file mode 100644 index 000000000000..51e8ae53736c --- /dev/null +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -0,0 +1,89 @@ +{ lib, clangStdenv, clang-sierraHack-stdenv, stdenvNoCC }: + +let + makeBigExe = stdenv: prefix: rec { + + count = 500; + + sillyLibs = lib.genList (i: stdenv.mkDerivation rec { + name = "${prefix}-fluff-${toString i}"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > ${name}.c + unsigned int asdf_${toString i}(void) { + return ${toString i}; + } + EOF + ''; + buildPhase = '' + $CC -std=c99 -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib + ''; + installPhase = '' + mkdir -p "$out/lib" + mv lib${name}.dylib "$out/lib" + ''; + meta.platforms = lib.platforms.darwin; + }) count; + + finalExe = stdenv.mkDerivation rec { + name = "${prefix}-final-asdf"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > main.cxx + + #include + #include + + ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)} + + unsigned int (*funs[])(void) = { + ${toString (lib.genList (i: "asdf_${toString i},") count)} + }; + + int main(int argc, char **argv) { + bool ret; + unsigned int i = 0; + for (auto f : funs) { + if (f() != i++) { + std::cerr << "Failed to get expected response from function #" << i << std::endl; + return EXIT_FAILURE; + } + } + return EXIT_SUCCESS; + } + EOF + ''; + buildPhase = '' + $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o ${prefix}-asdf + ''; + buildInputs = sillyLibs; + installPhase = '' + mkdir -p "$out/bin" + mv ${prefix}-asdf "$out/bin" + ''; + meta.platforms = lib.platforms.darwin; + }; + + }; + + good = makeBigExe clang-sierraHack-stdenv "good"; + + bad = makeBigExe clangStdenv "bad"; + +in stdenvNoCC.mkDerivation { + name = "macos-sierra-shared-test"; + 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 + else echo "bad-asdf should fail on sierra, OK" >&2 + fi + + # Must succeed on all supported MacOS versions + good-asdf + + touch $out + ''; + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 8506c9f38f3d..ae7daa1db10e 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = "http://www.nongnu.org/autocutsel/"; + homepage = http://www.nongnu.org/autocutsel/; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7b725bfeb57c..7868c2726ece 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/Bumblebee-Project/Bumblebee; + homepage = https://github.com/Bumblebee-Project/Bumblebee; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 7105b4742cb6..3dfc7abbc77d 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple drag-and-drop source/sink for X"; - homepage = "https://github.com/mwh/dragon"; + homepage = https://github.com/mwh/dragon; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index eeaf5dac7c6a..9de29da9b44a 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = http://thegraveyard.org/hsetroot.html; + homepage = https://thegraveyard.org/hsetroot.html; license = licenses.gpl2Plus; maintainers = [ maintainers.henrytill ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 49bab143fc22..e25fa43f1807 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; - homepage = "http://openbox.org/wiki/ObConf"; + homepage = http://openbox.org/wiki/ObConf; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix index 26bb32b17b0c..33470beca2de 100644 --- a/pkgs/tools/X11/oblogout/default.nix +++ b/pkgs/tools/X11/oblogout/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Openbox logout script"; - homepage = "https://launchpad.net/oblogout"; + homepage = https://launchpad.net/oblogout; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index f3119a1a147b..6aaaf83d9754 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; - homepage = "https://github.com/amonakov/primus"; + homepage = https://github.com/amonakov/primus; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index 19e5fe69da5b..806a8388082a 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "http://www.update.uu.se/~zrajm/programs/"; + homepage = http://www.update.uu.se/~zrajm/programs/; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; updateWalker = true; }; diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index fd5cfe03ea3a..5433035d2215 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "execgamesdir=$(out)/bin" ]; meta = { - homepage = "http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian"; + homepage = http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian; description = "Displays a short text fullscreen in an X11 window"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.fpletz ]; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 81b888ccb783..2245f03ec7fe 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -5,14 +5,14 @@ assert enableXinerama -> libXinerama != null; stdenv.mkDerivation rec { - version = "1.4.4"; + version = "2.0.1"; name = "setroot-${version}"; src = fetchFromGitHub { owner = "ttzhou"; repo = "setroot"; rev = "v${version}"; - sha256 = "0vphma0as8pnqrakdw6gaiiz7xawb4y72sc9dna755kkclgbyl8m"; + sha256 = "01krjfc3xpp0wbqz9nvf1n34gkpd41gysn289sj1wcjxia4n4gsi"; }; buildInputs = [ libX11 imlib2 ] @@ -26,6 +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; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index b0bf8a101696..33a0deedafac 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 = http://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/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index c9530a5cdd98..ece08fd5cd48 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s"; + sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.virtualgl.org/"; + homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.free; # many parts under different free licenses platforms = platforms.linux; diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index bb4435d56e7e..a5a75c9df4f5 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://github.com/mikemb/wayV"; + homepage = https://github.com/mikemb/wayV; }; } diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index 829d9b8ab2d3..5a08cf5c817e 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://bitbucket.org/blais/xannotate"; + homepage = https://bitbucket.org/blais/xannotate; }; } diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix new file mode 100644 index 000000000000..79ef4cb56dcb --- /dev/null +++ b/pkgs/tools/X11/xautomation/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: + +let version = "1.09"; in +stdenv.mkDerivation { + name = "xautomation-${version}"; + src = fetchurl { + url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; + sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libX11 libXext libXi libXtst ]; + + meta = { + homepage = https://www.hoopajoo.net/projects/xautomation.html; + description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index 894f082a708c..23e675bb59b6 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { is to generate the Escape key when Left Control is pressed and released on its own. ''; - homepage = "https://github.com/alols/xcape"; + homepage = https://github.com/alols/xcape; license = stdenv.lib.licenses.gpl3 ; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 238b8c7b2b2d..f06b4cc6b378 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - homepage = "http://henning-bekel.de/xchainkeys/"; + homepage = http://henning-bekel.de/xchainkeys/; description = "A standalone X11 program to create chained key bindings"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix new file mode 100644 index 000000000000..1d42f791fb5c --- /dev/null +++ b/pkgs/tools/X11/xcwd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + version = "2016-09-30"; + name = "xcwd-${version}"; + + src = fetchFromGitHub { + owner = "schischi"; + repo = "xcwd"; + rev = "3f0728b932904985b703b33bd5c936ea96cf15a0"; + sha256 = "0lwfz6qg7fkiq86skp51vpav33yik22ps4dvr48asv3570skhlf9"; + }; + + buildInputs = [ libX11 ]; + + makeFlags = "prefix=$(out)"; + + installPhase = '' + install -D xcwd "$out/bin/xcwd" + ''; + + meta = with stdenv.lib; { + description = '' + A simple tool which print the current working directory of the currently focused window + ''; + homepage = https://github.com/schischi/xcwd; + maintainers = [ maintainers.grburst ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix new file mode 100644 index 000000000000..f5a264108359 --- /dev/null +++ b/pkgs/tools/X11/xkbvalidate/default.nix @@ -0,0 +1,15 @@ +{ lib, runCommandCC, libxkbcommon }: + +runCommandCC "xkbvalidate" { + buildInputs = [ libxkbcommon ]; + meta = { + description = "NixOS tool to validate X keyboard configuration"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.aszlig ]; + }; +} '' + mkdir -p "$out/bin" + gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \ + -o "$out/bin/validate" +'' diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c new file mode 100644 index 000000000000..d9c9042467c0 --- /dev/null +++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c @@ -0,0 +1,135 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#include + +static char **log_buffer = NULL; +static int log_buffer_size = 0; +static bool log_alloc_success = true; + +static void add_log(struct xkb_context *ctx, enum xkb_log_level level, + const char *fmt, va_list args) +{ + log_buffer_size++; + + if (log_buffer == NULL) + log_buffer = malloc(sizeof(char *)); + else + log_buffer = realloc(log_buffer, sizeof(char *) * log_buffer_size); + + if (log_buffer == NULL) { + perror("buffer alloc"); + log_alloc_success = false; + log_buffer_size--; + return; + } + + if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) { + perror("log line alloc"); + log_alloc_success = false; + return; + } +} + +static void print_logs(void) +{ + for (int i = 0; i < log_buffer_size; ++i) + fprintf(stderr, " %s", log_buffer[i]); +} + +static void free_logs(void) +{ + if (log_buffer == NULL) + return; + for (int i = 0; i < log_buffer_size; ++i) + free(log_buffer[i]); + free(log_buffer); + log_buffer = NULL; + log_buffer_size = 0; +} + +static bool try_keymap(struct xkb_context *ctx, struct xkb_rule_names *rdef) +{ + struct xkb_keymap *keymap; + bool result = true; + + if ((keymap = xkb_keymap_new_from_names(ctx, rdef, 0)) == NULL) + result = false; + else + xkb_keymap_unref(keymap); + + return result; +} + +static void print_error(const char *name, const char *value, + const char *nixos_option) +{ + fprintf(stderr, "\nThe value `%s' for keyboard %s is invalid.\n\n" + "Please check the definition in `services.xserver.%s'.\n", + value, name, nixos_option); + fputs("\nDetailed XKB compiler errors:\n\n", stderr); + print_logs(); + putc('\n', stderr); +} + +#define TRY_KEYMAP(name, value, nixos_option) \ + *rdef = (struct xkb_rule_names) {0}; \ + free_logs(); \ + rdef->name = value; \ + result = try_keymap(ctx, rdef); \ + if (!log_alloc_success) \ + goto out; \ + if (!result) { \ + print_error(#name, value, nixos_option); \ + exit_code = EXIT_FAILURE; \ + goto out; \ + } + +int main(int argc, char **argv) +{ + int exit_code = EXIT_SUCCESS; + bool result; + struct xkb_context *ctx; + struct xkb_rule_names *rdef; + + if (argc != 5) { + fprintf(stderr, "Usage: %s model layout variant options\n", argv[0]); + return EXIT_FAILURE; + } + + ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES); + xkb_context_set_log_fn(ctx, add_log); + + rdef = malloc(sizeof(struct xkb_rule_names)); + + TRY_KEYMAP(model, argv[1], "xkbModel"); + TRY_KEYMAP(layout, argv[2], "layout"); + TRY_KEYMAP(variant, argv[3], "xkbVariant"); + TRY_KEYMAP(options, argv[4], "xkbOptions"); + + free_logs(); + rdef->model = argv[1]; + rdef->layout = argv[2]; + rdef->variant = argv[3]; + rdef->options = argv[4]; + + result = try_keymap(ctx, rdef); + if (!log_alloc_success) + goto out; + + if (!result) { + fputs("The XKB keyboard definition failed to compile:\n", stderr); + print_logs(); + exit_code = EXIT_FAILURE; + } + +out: + free_logs(); + free(rdef); + xkb_context_unref(ctx); + return exit_code; +} diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index c7c7b9e55674..399531f71eb8 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "xvkbd-${version}"; - version = "3.7"; + version = "3.8"; src = fetchurl { - url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz"; - sha256 = "02y9ks9sa4sn3vkbgswjs5qcd85xhwvarnmhg41pq3l2d617cpw9"; + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz"; + sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c"; }; buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ]; diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix new file mode 100644 index 000000000000..05154e282636 --- /dev/null +++ b/pkgs/tools/X11/xzoom/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, libX11, imake, libXext, libXt}: +stdenv.mkDerivation rec { + name = "${pname}-${version}.${patchlevel}"; + pname = "xzoom"; + version = "0.3"; + patchlevel = "24"; + + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${version}.tgz"; + sha256 = "0jzl5py4ny4n4i58lxx2hdwq9zphqf7h3m14spl3079y5mlzssxj"; + }; + patches = [ + (fetchurl { + url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${version}-${patchlevel}.diff.gz"; + sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh"; + }) + ]; + buildInputs = [libX11 imake libXext libXt]; + + configurePhase = '' + xmkmf + makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANPATH=$out/share/man" + ''; + + meta = { + inherit version; + description = "An X11 screen zoom tool"; + license = stdenv.lib.licenses.free ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index a309ed3826e9..a8b992db2b77 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.analog.cx/"; + homepage = http://www.analog.cx/; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix new file mode 100644 index 000000000000..9f36a6403a17 --- /dev/null +++ b/pkgs/tools/admin/aws-auth/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }: + +stdenv.mkDerivation rec { + version = "unstable-2017-07-24"; + name = "aws-auth-${version}"; + + src = fetchFromGitHub { + owner = "alphagov"; + repo = "aws-auth"; + rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1"; + sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + # copy script and set $PATH + installPhase = '' + install -D $src/aws-auth.sh $out/bin/aws-auth + wrapProgram $out/bin/aws-auth \ + --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]} + ''; + + meta = { + homepage = https://github.com/alphagov/aws-auth; + description = "AWS authentication wrapper to handle MFA and IAM roles"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ris ]; + }; +} diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix new file mode 100644 index 000000000000..bda3cb83cf7e --- /dev/null +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }: + +stdenv.mkDerivation rec { + name = "bubblewrap-${version}"; + version = "0.1.8"; + + src = fetchurl { + url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; + sha256 = "1gyy7paqwdrfgxamxya991588ryj9q9c3rhdh31qldqyh9qpy72c"; + }; + + nativeBuildInputs = [ libcap libxslt docbook_xsl ]; + + meta = with stdenv.lib; { + description = "Unprivileged sandboxing tool"; + homepage = https://github.com/projectatomic/bubblewrap; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ konimex ]; + }; +} diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 23c35dab57c0..b9852ed587c5 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,6 +1,6 @@ -{ lib, python2Packages, fetchurl }: +{ lib, python2, fetchurl }: -python2Packages.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { name = "cli53-${version}"; version = "0.4.4"; @@ -9,7 +9,18 @@ python2Packages.buildPythonApplication rec { sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; }; - propagatedBuildInputs = with python2Packages; [ + postPatch = '' + substituteInPlace setup.py --replace "'argparse', " "" + ''; + + checkPhase = '' + ${python2.interpreter} -m unittest discover -s tests + ''; + + # Tests do not function + doCheck = false; + + propagatedBuildInputs = with python2.pkgs; [ argparse boto dns diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 26e63283f8da..d31f3023c969 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { version = version; # This package contains vendored dependencies. All have free licenses. license = licenses.free; - homepage = "https://cloud.google.com/sdk/"; + homepage = https://cloud.google.com/sdk/; maintainers = with maintainers; [stephenmw zimbatm]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 1aec4209b4d3..64ec5e9b418e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.14"; + version = "2.16"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm"; + sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 42bd284e73f2..cebe90855fae 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NX compression proxy"; - homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; + homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix new file mode 100644 index 000000000000..0e8aacea4ef2 --- /dev/null +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec{ + name = "scaleway-cli-${version}"; + version = "1.14"; + + goPackagePath = "github.com/scaleway/scaleway-cli"; + + src = fetchFromGitHub { + owner = "scaleway"; + repo = "scaleway-cli"; + rev = "v${version}"; + sha256 = "09rqw82clfdiixa9m3hphxh5v7w1gks3wicz1dvpay2sx28bpddr"; + }; + + meta = with stdenv.lib; { + description = "Interact with Scaleway API from the command line"; + homepage = https://github.com/scaleway/scaleway-cli; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index 56da02cc8d08..9b3dee728eb2 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://simple-evcorr.sourceforge.net/"; + homepage = http://simple-evcorr.sourceforge.net/; license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 0dca16b75025..4eb0cacdea97 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ]; meta = with stdenv.lib; { - homepage = "https://github.com/zenhack/simp_le"; + homepage = https://github.com/zenhack/simp_le; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner nckx ]; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index e7164bf07b6c..4027b3d531c3 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = "http://vnc-tight.sourceforge.net/"; + homepage = http://vnc-tight.sourceforge.net/; description = "Improved version of VNC"; longDescription = '' diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 7a1eec92bbeb..2e9d8cafdc07 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.cabextract.org.uk/; + homepage = https://www.cabextract.org.uk/; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 1f27730b19a0..0f6814d53c99 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = "http://constexpr.org/innoextract/"; + homepage = http://constexpr.org/innoextract/; platforms = platforms.linux; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index c47242503c9c..0edb302b49c3 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library to extract CAB files from InstallShield installers"; - homepage = "https://github.com/twogood/unshield"; + homepage = https://github.com/twogood/unshield; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index a35e473ec366..7c4bb988b629 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - ${"NIX_${stdenv.cc.infixSalt_}LDFLAGS"} = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 80149fa98ddf..ba029814f392 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6"; src = fetchurl { - url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + "${name}.tar.gz"; sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; meta = with stdenv.lib; { - homepage = "http://acoustid.org/fingerprinter"; + homepage = https://acoustid.org/fingerprinter; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 273b5d94c9fc..116281e0a052 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; - homepage = "https://github.com/geigerzaehler/beets-alternatives"; + homepage = https://github.com/geigerzaehler/beets-alternatives; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index fa00d64f673f..fdd70db4e640 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to move non-music files during the import process"; - homepage = "https://github.com/sbarakat/beets-copyartifacts"; + homepage = https://github.com/sbarakat/beets-copyartifacts; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index fd9cf2bacbfa..c326533ece14 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; - pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ]; + propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; + pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; postInstall = "wrapPythonPrograms"; meta = with stdenv.lib; { diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c50805c578f7..451424fb8661 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio system tray"; - homepage = "https://github.com/christophgysin/pasystray"; + homepage = https://github.com/christophgysin/pasystray; license = licenses.lgpl21Plus; maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 476c42504a26..dcea9c9435b9 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.0.10"; + version = "1.0.11"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp"; + sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index ae8752aa7c12..d7c14a91efb4 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://github.com/bup/bup"; + homepage = https://github.com/bup/bup; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index baa0d6170162..e1d19a48971c 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; - homepage = "http://chunksync.florz.de/"; + homepage = http://chunksync.florz.de/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 7917403a915e..e8d3a2e185ee 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -12,16 +12,15 @@ stdenv.mkDerivation { buildInputs = [ txt2man makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; + postPatch = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" - sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply - mv duply "$out/bin" + install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin" - "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz" + ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]} + "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix new file mode 100644 index 000000000000..e569d9b6d598 --- /dev/null +++ b/pkgs/tools/backup/flockit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "flockit-${version}"; + version = "2012-08-11"; + + src = fetchFromGitHub { + owner = "smerritt"; + repo = "flockit"; + rev = "5c2b2092f8edcc8e3e2eb6ef66c968675dbfa686"; + sha256 = "0vajck9q2677gpn9a4flkyz7mw69ql1647cjwqh834nrcr2b5164"; + }; + + installPhase = '' + mkdir -p $out/lib $out/bin + cp ./libflockit.so $out/lib + + (cat < $out/bin/flockit + chmod +x $out/bin/flockit + ''; + + meta = with stdenv.lib; { + description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)"; + longDescription = '' + This library and tool exists solely because rsync doesn't have file locking. + + It's not used like a normal library; you don't link against it, and you + don't have to patch your source code to use it. It's inserted between your + program and its libraries by use of LD_PRELOAD. + + For example: + + $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST + + Besides the library a handy executable is provided which can simplify the above to: + + $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST + + Also see the following blog post: + https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ + ''; + homepage = https://github.com/smerritt/flockit; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 74544b9cd634..02265bbc683f 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; meta = { - homepage = "http://www.httrack.com"; + homepage = http://www.httrack.com; description = "Easy-to-use offline browser utility"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 742c1cafc933..bc5755628d28 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.6.1"; + version = "0.7.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17"; + sha256 = "07614wp0b6kjl8lq3qir271g0s2h8wvpdh43wsz1k6bip60nmqbf"; }; buildPhase = '' @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://restic.github.io; description = "A backup program that is fast, efficient and secure"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm ]; }; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 05bf38613efd..66480a2f13a9 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; - homepage = "https://bitbucket.org/nikratio/s3ql"; + homepage = https://bitbucket.org/nikratio/s3ql; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 0f95a26c9401..3767a377cfcf 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.37"; + version = "1.0.39"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "1ynv323qi6775lzjb6hvifl8ajkv2bizy43sajadjfqvcl9r96gs"; + sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; }; preConfigure = '' diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix new file mode 100644 index 000000000000..54d85343e2da --- /dev/null +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -0,0 +1,25 @@ +{ python3Packages, fetchFromGitHub , tarsnap }: + +python3Packages.buildPythonApplication rec { + name = "tarsnapper-${version}"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "miracle2k"; + repo = "tarsnapper"; + rev = version; + sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm"; + }; + + buildInputs = with python3Packages; [ nose pytest ]; + + checkPhase = '' + py.test . + ''; + + propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + + patches = [ ./remove-argparse.patch ]; + + makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"]; +} diff --git a/pkgs/tools/backup/tarsnapper/remove-argparse.patch b/pkgs/tools/backup/tarsnapper/remove-argparse.patch new file mode 100644 index 000000000000..5fd36b14a133 --- /dev/null +++ b/pkgs/tools/backup/tarsnapper/remove-argparse.patch @@ -0,0 +1,10 @@ +--- tarsnapper-0.4-src.org/setup.py 1980-01-02 00:00:00.000000000 +0000 ++++ tarsnapper-0.4-src/setup.py 2017-07-16 10:54:36.596499451 +0100 +@@ -45,6 +45,6 @@ + url='http://github.com/miracle2k/tarsnapper', + license='BSD', + packages=['tarsnapper'], +- install_requires = ['argparse>=1.1', 'pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'], ++ install_requires = ['pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'], + **kw + ) diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 25bd7236e681..c9fb1c547260 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake protobufc ]; meta = { description = "A versatile deduplicating backup tool"; - homepage = "http://zbackup.org/"; + homepage = http://zbackup.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 311df9086890..cacfb8287a33 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let - version = "0.15.7"; - checksum = "1xb94kxfq9sm3g0s6wpyyz6h2aihgca5gyybg0a5r8sar7yz97j0"; + version = "0.17.0"; + checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl"; in stdenv.mkDerivation rec { name = "znapzend-${version}"; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index db0c2c26d3c9..bb2ed0c2c268 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/blueman-project/blueman"; + homepage = https://github.com/blueman-project/blueman; description = "GTK+-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d033371cbcd6..d62f2c25623f 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -6,7 +6,7 @@ let major = "3.12"; - minor = "1"; + minor = "2"; binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; - sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls"; + sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index caf37ccbe1d5..95dd58a59b48 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation { sed -i 's,linux/../,,g' dao/sg_err.h ''; + # Needed on gcc >= 6. + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = http://cdrdao.sourceforge.net/; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 6d8c3e1a3c21..7cec791ecc5a 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = "http://sourceforge.net/projects/lsdvd/"; + homepage = http://sourceforge.net/projects/lsdvd/; shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 14076a757f49..4d6ddd546dbc 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,31 +1,37 @@ -{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "613"; + version = "655"; - src = fetchurl { - url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz"; - sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q"; + src = fetchFromGitHub { + owner = "unetbootin"; + repo = "unetbootin"; + rev = version; + sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; }; - sourceRoot = "."; + sourceRoot = "${name}-src/src/unetbootin"; - buildInputs = [ makeWrapper qt4 qmake4Hook ]; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ makeWrapper qmake4Hook ]; + enableParallelBuilding = true; # Lots of nice hard-coded paths... - postUnpack = '' + postPatch = '' substituteInPlace unetbootin.cpp \ - --replace /sbin/fdisk ${utillinux}/sbin/fdisk \ - --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \ - --replace /sbin/blkid ${utillinux}/sbin/blkid \ - --replace /bin/df ${coreutils}/bin/df \ - --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \ - --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \ + --replace /bin/df ${coreutils}/bin/df \ + --replace /sbin/blkid ${utillinux}/sbin/blkid \ + --replace /sbin/fdisk ${utillinux}/sbin/fdisk \ + --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \ + --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \ + --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \ --replace /usr/share/syslinux ${syslinux}/share/syslinux + substituteInPlace main.cpp \ --replace /usr/share/unetbootin $out/share/unetbootin + substituteInPlace unetbootin.desktop \ --replace /usr/bin $out/bin ''; @@ -46,15 +52,15 @@ stdenv.mkDerivation rec { cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 ''; meta = with stdenv.lib; { - homepage = http://unetbootin.sourceforge.net/; + homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ebzzry ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ebzzry ]; }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 51f478110659..3a06a39dcad7 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; meta = { - homepage = "http://www.bzip.org"; + homepage = http://www.bzip.org; description = "High-quality data compression program"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 5198cb15a60d..91f7637e1bcb 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; - homepage = "http://brettcsmith.org/2007/dtrx/"; + homepage = https://brettcsmith.org/2007/dtrx/; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cb7dc65c710d..bb9555fa600c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, hostPlatform, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + outputs = [ "out" "man" "info" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index cc6453e801e6..cf616a21e0aa 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "http://lbzip2.org/"; + homepage = http://lbzip2.org/; description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 17bc24ab5995..cee23934d0ce 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://www.nongnu.org/lzip/lzip.html"; + homepage = http://www.nongnu.org/lzip/lzip.html; description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index a929ca4dfd75..72be1d28d248 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lzo}: -stdenv.mkDerivation { - name = "lzop-1.03"; +stdenv.mkDerivation rec { + name = "lzop-1.04"; src = fetchurl { - url = http://www.lzop.org/download/lzop-1.03.tar.gz; - sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1"; + url = "http://www.lzop.org/download/${name}.tar.gz"; + sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; buildInputs = [ lzo ]; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 29402b1bf79d..16455fe35884 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; + homepage = https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 193f1d5cb0bb..76704c254bdb 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, zlib, utillinux }: let name = "pigz"; - version = "2.3.3"; + version = "2.3.4"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "172hdf26k4zmm7z8md7nl0dph2a7mhf3x7slb9bhfyff6as6g2sf"; + sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg"; }; + enableParallelBuilding = true; + buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; doCheck = stdenv.isLinux; @@ -25,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.zlib.net/pigz/"; + homepage = http://www.zlib.net/pigz/; description = "A parallel implementation of gzip for multi-core machines"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e731d91f6d6e..f9ca3aa18575 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://jnovy.fedorapeople.org/pxz/"; + homepage = https://jnovy.fedorapeople.org/pxz/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 8c9f74330581..213d98a1ec12 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}: +{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }: stdenv.mkDerivation rec { name = "upx-${version}"; @@ -8,21 +8,25 @@ stdenv.mkDerivation rec { sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; }; + CXXFLAGS = "-Wno-unused-command-line-argument"; + buildInputs = [ ucl zlib perl ]; - preConfigure = " + preConfigure = '' export UPX_UCLDIR=${ucl} - cd src - "; + ''; - makeFlags = [ "CHECK_WHITESPACE=true" ]; + makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ]; - installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; + installPhase = '' + mkdir -p $out/bin + cp src/upx.out $out/bin/upx + ''; - meta = { + meta = with stdenv.lib; { homepage = https://upx.github.io/; description = "The Ultimate Packer for eXecutables"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 82ead0baa16d..2be3bf167dad 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,19 +3,15 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl"; + sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; }; - # The Makefiles don't properly use file targets, but blindly rebuild - # all dependencies on every make invocation. So no nice phases. :-( - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - makeFlags = [ "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}" ]; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 1eedff5c011e..61c7f26db1e1 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { User documentation is in Documentation/bcache.txt in the Linux kernel tree. ''; - homepage = http://bcache.evilpiepirate.org/; + homepage = https://bcache.evilpiepirate.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 42fe0b7ce342..56d132907a0b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = "http://bcachefs.org/"; + homepage = http://bcachefs.org/; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index c120073866d4..8fed366a3de9 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://www.coker.com.au/bonnie++/"; + homepage = http://www.coker.com.au/bonnie++/; description = "Hard drive and file system benchmark suite"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index a9e05686e405..4c22268a1c8d 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -17,7 +17,7 @@ buildRustPackage rec { buildInputs = [ lzo zlib ]; meta = with stdenv.lib; { - homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe"; + homepage = https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe; description = "BTRFS deduplication utility"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index e4c8b0f33bcd..0af97dd3b540 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -4,7 +4,7 @@ # Optional Dependencies , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null, accelio ? null, libibverbs ? null, librdmacm ? null +, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null , rocksdb ? null, libs3 ? null @@ -50,7 +50,6 @@ let optExpat = shouldUsePkg expat; optCurl = shouldUsePkg curl; optFuse = shouldUsePkg fuse; - optAccelio = shouldUsePkg accelio; optLibibverbs = shouldUsePkg libibverbs; optLibrdmacm = shouldUsePkg librdmacm; optLibedit = shouldUsePkg libedit; @@ -76,10 +75,6 @@ let hasOsd = hasServer; hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; - hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "9.0.3" && - optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed @@ -128,8 +123,6 @@ stdenv.mkDerivation { optSnappy optLeveldb ] ++ optionals hasRadosgw [ optFcgi optExpat optCurl optFuse optLibedit - ] ++ optionals hasXio [ - optAccelio optLibibverbs optLibrdmacm ] ++ optionals hasRocksdb [ optRocksdb ] ++ optionals hasKinetic [ @@ -192,7 +185,6 @@ stdenv.mkDerivation { (mkWith (malloc == optGperftools) "tcmalloc" null) (mkEnable false "pgrefdebugging" null) (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) (mkWith (optLibatomic_ops != null) "libatomic-ops" null) (mkWith true "ocf" null) (mkWith hasKinetic "kinetic" null) diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index f8c6942bad0e..e5b09cbbff30 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; - homepage = "http://chunkfs.florz.de/"; + homepage = http://chunkfs.florz.de/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 7931df2cc57d..9e640b18a924 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.darlinghq.org/; - description = "Darling lets you open OS X dmgs on Linux"; + description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index b745652b15c4..64934ccb469b 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"]; meta = { - homepage = "http://savannah.nongnu.org/projects/davfs2"; + homepage = http://savannah.nongnu.org/projects/davfs2; description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 2eeb2003a194..dc6bcca597bd 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; - homepage = http://www.daniel-baumann.ch/software/dosfstools/; + homepage = https://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 8703e81fb1dc..7c3ab92fa88a 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libuuid, gettext }: +{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { name = "e2fsprogs-1.43.4"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; }; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "info" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; crossAttrs = { diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index d56c5e2ed9a7..fdad877d34cf 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libselinux libuuid ]; meta = with stdenv.lib; { - homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; + homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 7bf771803c62..6a3e280aae36 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://romfs.sourceforge.net/"; + homepage = http://romfs.sourceforge.net/; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index db69fa64c84d..b5f178d59fc0 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -13,13 +13,13 @@ in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.0"; + version = "4.2.1"; prefix = "irods"; name = "${prefix}-${version}"; src = fetchurl { url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e"; + sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq"; }; # Patches: diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index b207eeeb9c3d..5879fd9d0821 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = "https://fedoraproject.org/wiki/Blivet"; + homepage = https://fedoraproject.org/wiki/Blivet; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index f13ad14aded8..1da01bc2e607 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { ''; meta = { - homepage = "http://fedoraproject.org/wiki/Pykickstart"; + homepage = http://fedoraproject.org/wiki/Pykickstart; description = "Read and write Fedora kickstart files"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 721e5185be3f..0d3370c4b1e8 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = { - homepage = "https://fedorahosted.org/pyparted/"; + homepage = https://fedorahosted.org/pyparted/; description = "Python interface for libparted"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index dd49b19358ce..c1502a3227d2 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }: stdenv.mkDerivation rec { - version = "2.9"; + version = "2.10"; # Temporary (need to add libfuse 3.x first) name = "sshfs-fuse-${version}"; src = fetchFromGitHub { - repo = "sshfs"; owner = "libfuse"; + repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv"; + sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; }; buildInputs = [ pkgconfig glib fuse autoreconfHook ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libfuse/sshfs; + inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 50f758bceba4..a51f2d47172e 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec }; buildInputs = [fuse glib neon pkgconfig]; meta = { - homepage = "http://noedler.de/projekte/wdfs/"; + homepage = http://noedler.de/projekte/wdfs/; description = "User-space filesystem that allows to mount a webdav share"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index ed41470f6001..eaea921c6f5c 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,56 +1,59 @@ -{ stdenv, fetchurl, gettext, libuuid, readline }: +{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }: + +let + gentooPatch = name: sha256: fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=8293574ab30c85e2965fb2b7dd890b44841b8404"; + inherit sha256; + }; +in stdenv.mkDerivation rec { - name = "xfsprogs-4.5.0"; + name = "xfsprogs-${version}"; + version = "4.11.0"; - src = fetchurl { - urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") - [ "cmd_tars" "previous" ]; - sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"; + rev = "refs/tags/v${version}"; + sha256 = "0icliinacg6c3ziaqzyyxfz9jykn80njj9fdv3milhsf81yhnrpn"; }; - prePatch = '' - sed -i "s,/bin/bash,$(type -P bash),g" install-sh - sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4 + outputs = [ "bin" "dev" "out" "doc" ]; - # Fixes from gentoo 3.2.1 ebuild - sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in - sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile) - sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile - ''; + nativeBuildInputs = [ autoconf automake libtool gettext ]; + propagatedBuildInputs = [ utillinux ]; # Dev headers include + buildInputs = [ readline ]; + enableParallelBuilding = true; + + # Why is all this garbage needed? Why? Why? patches = [ - # This patch fixes shared libs installation, still not fixed in 4.2.0 - ./4.3.0-sharedlibs.patch + (gentooPatch "xfsprogs-4.7.0-sharedlibs.patch" "1s83ihaccmjrw4zm0nbdwqk3jx4wc1rijpsqrg7ir71ln7qknwzz") + (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") + (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") ]; - propagatedBuildInputs = [ libuuid ]; - buildInputs = [ gettext readline ]; - - outputs = [ "bin" "dev" "out" ]; # TODO: review xfs - preConfigure = '' - NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" + sed -i Makefile -e '/cp include.install-sh/d' + make configure ''; configureFlags = [ - "MAKE=make" - "MSGFMT=msgfmt" - "MSGMERGE=msgmerge" - "XGETTEXT=xgettext" "--disable-lib64" "--enable-readline" ]; installFlags = [ "install-dev" ]; - enableParallelBuilding = true; + # FIXME: forbidden rpath + postInstall = '' + find . -type d -name .libs | xargs rm -rf + ''; meta = with stdenv.lib; { homepage = http://xfs.org/; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ dezgeg ]; }; } diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 994777680dbd..593715b2068d 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "0f38mvn3wfacapayl54q04qlz4in417pfm6gapgm7dhyjs9y5yd7"; + sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; }; buildInputs = [ e2fsprogs ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://frippery.org/uml/index.html; + homepage = https://frippery.org/uml/; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3c7af45f81dd..3cdb4497baf1 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES" # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used rm -rf tiff jpg png + + unset AR ''; buildInputs = [ diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index ba28b67d75b0..a5045f97b45d 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://sourceforge.net/projects/briss/; + homepage = https://sourceforge.net/projects/briss/; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2b88ada21aa7..8c53882ff1b2 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Context-free design grammar - a tool for graphics generation"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - homepage = http://contextfreeart.org/; - downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page"; + homepage = https://contextfreeart.org/; + downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; }; } diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix index 42295c82216e..0e2018b6bfdd 100644 --- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix @@ -1,5 +1,5 @@ { - downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page"; + downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; baseName = "cfdg"; sourceRegexp = ''.*[.]tgz''; versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/''; diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index ea73a0e95b9d..33e948663372 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + homepage = https://ece.uwaterloo.ca/~aplevich/dpic/; description = "An implementation of the pic little language for creating drawings"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.aespinosa ]; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index a3d343cea577..86848f958838 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; + homepage = https://cgit.freedesktop.org/xorg/app/editres/; description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix new file mode 100644 index 000000000000..02a3a70fe516 --- /dev/null +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +stdenv.mkDerivation rec { + name = "facedetect-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "facedetect"; + rev = "v${version}"; + sha256 = "0mddh71cjbsngpvjli406ndi2x613y39ydgb8bi4z1jp063865sd"; + }; + + buildInputs = [ python2Packages.python python2Packages.wrapPython ]; + pythonPath = [ python2Packages.numpy python2Packages.opencv ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + patchPhase = '' + substituteInPlace facedetect \ + --replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV" + ''; + + installPhase = '' + install -v -m644 -D README.rst $out/share/doc/${name}/README.rst + install -v -m755 -D facedetect $out/bin/facedetect + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + homepage = https://www.thregr.org/~wavexx/software/facedetect/; + description = "A simple face detector for batch processing"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 4b263b555d21..424cf5c1bdc6 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool, JSON -, coreutils, zip, imagemagick, pngcrush, lcms2, fbida -}: +{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool +, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2 +, facedetect, fbida }: # TODO: add optional dependencies (snippet from fgallery source): # # if(system("jpegoptim -V >/dev/null 2>&1")) { # $jpegoptim = 0; # } -# if($facedet && system("facedetect -h >/dev/null 2>&1")) { -# fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { - name = "fgallery-1.8"; + name = "fgallery-1.8.2"; src = fetchurl { url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; - sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d"; + sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ]; + buildInputs = [ unzip makeWrapper perl ImageExifTool CpanelJSONXS ]; installPhase = '' mkdir -p "$out/bin" @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ --set PATH "${stdenv.lib.makeBinPath - [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" + [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index edcfc67ee291..6ac152cb7b8c 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { description = "G'MIC is an open and full-featured framework for image processing"; homepage = http://gmic.eu/; license = licenses.cecill20; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 3b537fad91db..6100573153ba 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.3"; + name = "gnuplot-5.0.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz"; + sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"; }; buildInputs = diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index c4a0981dbb3c..fb8f0472ce35 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.graphviz.org/"; + homepage = http://www.graphviz.org/; description = "Open source graph visualization software"; longDescription = '' diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index b0ccc5428bb8..ce864261c8b3 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.graphviz.org/"; + homepage = http://www.graphviz.org/; description = "Open source graph visualization software"; longDescription = '' diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 4eb464530556..69ae03d67503 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for easy screencapping and uploading to imgur"; - homepage = "https://https://github.com/jomo/imgur-screenshot/"; + homepage = https://https://github.com/jomo/imgur-screenshot/; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 847b3b81749f..5a655b9ff162 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - homepage = "https://github.com/ram-on/imgurbash2"; + homepage = https://github.com/ram-on/imgurbash2; }; } diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index cbce8bb61f7c..6e09dc191acc 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = "http://sourceforge.net/projects/lprof"; + homepage = http://sourceforge.net/projects/lprof; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 2a8255e3744b..aaf7b68d177f 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , zlib, libpng, libjpeg -, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }: +, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.63"; + version = "5.4.68"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "16jl62hzrq1kciqwr9s3bxgcf9yz42kiwc5abkay1yd0vfcx200i"; + sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr - libXcomposite slop ]; + libXcomposite slop icu ]; doCheck = false; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 471e8ee8df47..f9b82a38344e 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; LDFLAGS = optional static "-static"; + # Workaround for crash in cexcept.h. See + # https://github.com/NixOS/nixpkgs/issues/28106 + preConfigure = '' + export LD=$CC + ''; + configureFlags = [ "--with-system-zlib" "--with-system-libpng" diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 3c43935e950d..8733b2c1caa0 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; - homepage = http://www.mobileread.com/forums/showthread.php?t=21906; + homepage = https://www.mobileread.com/forums/showthread.php?t=21906; license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 076f20c95c42..7e6b3523ed80 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9"; }; - outputs = [ "out" "dev" "doc"]; + outputs = [ "out" "dev" "man"]; cmakeFlags = '' -DWITH_MATLAB=false @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./threads.patch ./pfstools.patch ]; meta = with stdenv.lib; { - homepage = "http://pfstools.sourceforge.net/"; + homepage = http://pfstools.sourceforge.net/; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index fe01a9459ecb..e4163cd93a87 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; + homepage = https://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 1dceb210235c..6bdff06699b9 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,12 +1,16 @@ -{stdenv, fetchgit, autoconf, automake, boost, zlib, libpng, libjpeg, libtiff}: +{ stdenv, fetchFromGitHub, autoconf, automake, boost +, zlib, libpng, libjpeg, libtiff +}: -stdenv.mkDerivation { - name = "povray-3.7"; +stdenv.mkDerivation rec { + name = "povray-${version}"; + version = "3.7.0.3"; - src = fetchgit { - url = "https://github.com/POV-Ray/povray.git"; - rev = "39ce8a24e50651904010dda15872d63be15d7c37"; - sha256 = "1nbs9vwf6fn3jkm0myfnbn7nrc17q8ppzmr4h7kj49nr0710ifw0"; + src = fetchFromGitHub { + owner = "POV-Ray"; + repo = "povray"; + rev = "v${version}"; + sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; }; @@ -40,6 +44,6 @@ stdenv.mkDerivation { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 40f612533068..104e423bd721 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://fukuchi.org/works/qrencode/; + homepage = https://fukuchi.org/works/qrencode/; description = "QR code encoder"; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index df85b4473bb7..a760336cfa38 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = "https://github.com/zxing/zxing"; + homepage = https://github.com/zxing/zxing; }; } diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index f38705cc9d13..13035698827f 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 6ab53f9d7633..b32d0c78a1b7 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://code.google.com/p/touchegg/"; + homepage = https://code.google.com/p/touchegg/; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index fd8c9bd7c79d..18e6176b706d 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "zinnia-${version}"; - version = "2015-03-15"; + version = "2016-08-28"; src = fetchFromGitHub { owner = "taku910"; repo = "zinnia"; - rev = "d8de1180d5175d7579e6c41b000f1ab4dd9cd697"; - sha256 = "ac09a16c04c5ef9b46626984e627250dc717d85711d14f1bbfa7f1ca0ca713dc"; + rev = "fd74d8c8680bb3df8692279151ea6339ab68e32b"; + sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; }; setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; - homepage = "http://taku910.github.io/zinnia/"; + homepage = http://taku910.github.io/zinnia/; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 53aec187bb76..d11392599220 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "aescrypt-${version}"; src = fetchurl { - url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; - homepage = http://www.aescrypt.com/; + homepage = https://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index acacc4db15f8..cdb5abcf453c 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; meta = with stdenv.lib; { - homepage = "http://people.freedesktop.org/~hughsient/appdata"; + homepage = http://people.freedesktop.org/~hughsient/appdata; description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index b885b5ed09d5..dc67c96ca1a2 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -44,7 +44,7 @@ in }; meta = { - homepage = "http://github.com/phillipberndt/autorandr/"; + homepage = https://github.com/phillipberndt/autorandr/; description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.coroa ]; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 824021094b4d..65a5b718e5f4 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; - homepage = "http://sourceforge.net/p/bibutils/home/Bibutils/"; + homepage = http://sourceforge.net/p/bibutils/home/Bibutils/; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index d00e1abc7a5d..82ae4d40f2db 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.112"; + version = "5.121"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd"; + sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx"; }; doCheck = true; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 55aa438226f6..e4b3fab818b7 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = "https://github.com/soveran/clac"; + homepage = https://github.com/soveran/clac; }; } diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index e34f4bc8f2f2..a70cba3f3d0d 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.0.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2"; + sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 0c8e9d6bceef..a91cd627bdae 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; + homepage = https://projects.kde.org/projects/playground/graphics/colord-kde; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 6dc2c371e460..222b04db0d0c 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchzip, fetchgit, bash-completion +{ stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms +, gtk_doc, gobjectIntrospection, argyllcms , libgudev, sane-backends }: stdenv.mkDerivation rec { name = "colord-1.2.12"; - src = fetchzip { + src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0rvvbpxd5x479v4p6pck317mlf3j29s154i1n8hlx8n4znhwrb0k"; + sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; }; enableParallelBuilding = true; @@ -23,12 +23,11 @@ stdenv.mkDerivation rec { # don't touch /var at install time, colord creates what it needs at runtime postPatch = '' - sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in - sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am + sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bash-completion argyllcms automake autoconf libgudev sane-backends ]; + bash-completion argyllcms libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a988a2b4311..48bcf143bb6f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPackages -, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch + ++ optional hostPlatform.isDarwin stdenv.secure-format-patch; # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = optionalString (!hostPlatform.isDarwin) '' @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ] ++ optional aclSupport acl ++ optional attrSupport attr - ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ] # due to patch + ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ] # TODO(@Ericson2314): Investigate whether Darwin could benefit too ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 15701d3c429b..13c1202e1d31 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { - homepage = "http://limitcpu.sourceforge.net/"; + homepage = http://limitcpu.sourceforge.net/; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index 856138f046ae..7ca103062c11 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchFromGitHub, python2Packages, help2man }: python2Packages.buildPythonApplication rec { name = "crudini-${version}"; @@ -11,10 +11,30 @@ python2Packages.buildPythonApplication rec { sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav"; }; + nativeBuildInputs = [ help2man ]; propagatedBuildInputs = with python2Packages; [ iniparse ]; - checkPhase = '' + doCheck = true; + + prePatch = '' + # make runs the unpatched version in src so we need to patch them in addition to tests patchShebangs . + ''; + + postBuild = '' + make all + ''; + + postInstall = '' + mkdir -p $out/share/{man/man1,doc/crudini} + + cp README EXAMPLES $out/share/doc/crudini/ + for f in *.1 ; do + gzip -c $f > $out/share/man/man1/$(basename $f).gz + done + ''; + + checkPhase = '' pushd tests >/dev/null ./test.sh ''; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index de9604200bac..e3f8a4c43a59 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }: stdenv.mkDerivation rec { - name = "cutecom-0.22.0"; - src = fetchurl { - url = "http://cutecom.sourceforge.net/${name}.tar.gz"; - sha256 = "199fvl463nyn77r3nm8xgzgifs28j5759kkcnc5xbwww2nk20rhv"; + name = "cutecom-${version}"; + version = "0.40.0"; + src = fetchFromGitHub { + owner = "neundorf"; + repo = "CuteCom"; + rev = "v${version}"; + sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds"; }; - buildInputs = [qt4 cmake]; + + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)" + ''; + buildInputs = [qtbase qtserialport cmake]; meta = { description = "A graphical serial terminal"; - version = "0.22.0"; homepage = http://cutecom.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 40d729d063d6..86a8d3f234b3 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; name = "dateutils-${version}"; - src =fetchurl { + src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; - }; + sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc"; + }; meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 4e0790dded6c..b6f483fb4efd 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; - homepage = "https://github.com/taviso/dbusmap"; + homepage = https://github.com/taviso/dbusmap; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b3aca778cd9e..db9669597857 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./automake.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "bindnow" ]; prePatch = '' newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = "http://ddccontrol.sourceforge.net/"; + homepage = http://ddccontrol.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbc7a2e7e46c..810bf06527b0 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -27,10 +27,10 @@ in stdenv.mkDerivation rec { mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find po4a scripts -type f -exec sed -r \ - -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \ -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ - -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index e22539827886..6575c19391c0 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,16 +1,12 @@ { stdenv, fetchurl }: -let - checksums = { - "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c"; - }; -in stdenv.mkDerivation rec { - version = "4.8.1"; +stdenv.mkDerivation rec { + version = "4.8.2"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = checksums."${version}"; + sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd"; }; meta = { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4f0a9ba12c11..6472f1ea09c8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -26,15 +26,13 @@ python3.pkgs.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf + # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - buildInputs = - map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + pythonPath = with python3.pkgs; + [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); - - pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 346ee7976373..1606fffe397b 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, go, bash, writeText}: +{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "direnv-${version}"; - version = "2.10.0"; + version = "2.12.2"; + goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3"; + sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b"; }; - buildInputs = [ go ]; + postConfigure = '' + cd $NIX_BUILD_TOP/go/src/$goPackagePath + ''; buildPhase = '' make BASH_PATH=${bash}/bin/bash ''; installPhase = '' - make install DESTDIR=$out - mkdir -p $out/share/fish/vendor_conf.d - echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish + mkdir -p $out + make install DESTDIR=$bin + mkdir -p $bin/share/fish/vendor_conf.d + echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + install_name_tool -delete_rpath $out/lib $bin/bin/direnv ''; meta = with stdenv.lib; { @@ -39,6 +45,5 @@ stdenv.mkDerivation rec { homepage = http://direnv.net; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; - inherit (go.meta) platforms; }; } diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index fbe1cc22376e..affcd310bea0 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = "http://mdocml.bsd.lv/"; + homepage = http://mdocml.bsd.lv/; description = "converter from DocBook V4.x and v5.x XML into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index ba1abb7c86df..06862a634238 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duc-${version}"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; rev = "${version}"; - sha256 = "0rnar2zacsb9rvdmp1a62xixhy69s5vh0nwgrklqxhb19qkzhdp7"; + sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; }; buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ]; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 369ec81be8d3..6f491ac93496 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.i0i0.de/toolchest/emv"; + homepage = http://www.i0i0.de/toolchest/emv; description = "Editor Move: Rename files with your favourite text editor"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 922bd529fb8e..f773ae6caac5 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; meta = { - homepage = "http://www.w3.org/Tools/eot-utils/"; + homepage = http://www.w3.org/Tools/eot-utils/; description = "Create Embedded Open Type from OpenType or TrueType font"; license = stdenv.lib.licenses.w3c; maintainers = with stdenv.lib.maintainers; [ leenaars ]; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix new file mode 100644 index 000000000000..763ca668d181 --- /dev/null +++ b/pkgs/tools/misc/fd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "fd-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "fd"; + rev = "v${version}"; + sha256 = "1xs4y9zf5m0ykl95787jv98xg0a60gkcyyh7kg7qg4xrcgf4qz4j"; + }; + + depsSha256 = "1hxf3j4584jgpwrwykx6yil6q6ka9l81qvx6zrbprdxk3pslp049"; + + meta = { + description = "A simple, fast and user-friendly alternative to find"; + longDescription = '' + `fd` is a simple, fast and user-friendly alternative to `find`. + + While it does not seek to mirror all of `find`'s powerful functionality, + it provides sensible (opinionated) defaults for 80% of the use cases. + ''; + homepage = "https://github.com/sharkdp/fd"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 232eb68c8a60..779256046e58 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = "http://darwinsys.com/file"; + homepage = http://darwinsys.com/file; description = "A program that shows the type of files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 29d09ff09c97..260151f5bd29 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://www.nongnu.org/fileschanged/"; + homepage = http://www.nongnu.org/fileschanged/; description = "A command-line utility that reports when files have been altered"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 06a140fed502..4eef3f7a9d59 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; - buildInputs = optionals (hostPlatform == buildPlatform) [ coreutils ]; # bin/updatedb script needs to call sort + buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort # Since glibc-2.25 the i686 tests hang reliably right after test-sleep. doCheck @@ -25,7 +25,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - configureFlags = [ "--localstatedir=/var/cache" ]; + configureFlags = [ + # "sort" 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. + "SORT=${coreutils}/bin/sort" + "--localstatedir=/var/cache" + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 9db6fbca6fa6..2047b77144a8 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "export PREFIX=$out"; meta = { - homepage = "http://www.flashrom.org"; + homepage = http://www.flashrom.org; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.funfunctor ]; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 25e083b6bf57..8219d110f2ef 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -8,7 +8,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; - homepage = http://www.fluentd.org/; + homepage = https://www.fluentd.org/; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ca636420854a..ee7854c539ed 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -9,22 +9,28 @@ stdenv.mkDerivation rec { name = "fontforge-${version}"; - version = "20160404"; + version = "20170730"; src = fetchFromGitHub { owner = "fontforge"; repo = "fontforge"; rev = version; - sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0"; + sha256 = "15k6x97383p8l40jvcivalhwgbbcdg5vciyjz6m9r0lrlnjqkv99"; }; - patches = [(fetchpatch { - name = "use-system-uthash.patch"; - url = "http://pkgs.fedoraproject.org/cgit/fontforge.git/plain/" - + "fontforge-20140813-use-system-uthash.patch?id=8bdf933"; - sha256 = "0n8i62qv2ygfii535rzp09vvjx4qf9zp5qq7qirrbzm1l9gykcjy"; - })]; - patchFlags = "-p0"; + patches = [ ./fontforge-20140813-use-system-uthash.patch ]; + + # use $SOURCE_DATE_EPOCH instead of non-determenistic timestamps + postPatch = '' + find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; + sed -r -i 's#author\s*!=\s*NULL#& \&\& !getenv("SOURCE_DATE_EPOCH")#g' fontforge/cvexport.c fontforge/dumppfa.c fontforge/print.c fontforge/svg.c fontforge/splineutil2.c + sed -r -i 's#\bb.st_mtime#getenv("SOURCE_DATE_EPOCH") ? atol(getenv("SOURCE_DATE_EPOCH")) : &#g' fontforge/parsepfa.c fontforge/sfd.c fontforge/svg.c + sed -r -i 's#^\s*ttf_fftm_dump#if (!getenv("SOURCE_DATE_EPOCH")) ttf_fftm_dump#g' fontforge/tottf.c + sed -r -i 's#sprintf\(.+ author \);#if (!getenv("SOURCE_DATE_EPOCH")) &#g' fontforgeexe/fontinfo.c + ''; + + # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; buildInputs = [ autoconf automake gnum4 libtool perl pkgconfig gettext uthash @@ -41,6 +47,9 @@ stdenv.mkDerivation rec { # work-around: git isn't really used, but configuration fails without it preConfigure = '' + # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) + export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) + export GIT="$(type -P true)" cp -r "${gnulib}" ./gnulib chmod +w -R ./gnulib diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch new file mode 100644 index 000000000000..27c8274c1d21 --- /dev/null +++ b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch @@ -0,0 +1,30 @@ +--- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530 ++++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530 +@@ -43,7 +43,6 @@ + AM_CPPFLAGS = + AM_LDFLAGS = + +-BUILT_SOURCES = uthash/src + EXTRA_DIST = + CLEANFILES = + MOSTLYCLEANFILES = +@@ -113,7 +112,6 @@ + Packaging/FontForge-doc.spec \ + Packaging/FontForge.spec \ + Packaging/FontForge.static.spec \ +- uthash/src \ + $(NULL) + + #-------------------------------------------------------------------------- +@@ -129,11 +127,6 @@ + + + #-------------------------------------------------------------------------- +-uthash/src: +- if [ ! -e uthash/src ]; then \ +- if [ -e uthash ] ; then rm -r uthash ; fi ; \ +- git clone https://github.com/troydhanson/uthash ; \ +- fi ; + + # We import a selection of targets from Frank's standard packaging Makefile. + diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix index 046c1d449201..c65d8ed375d2 100644 --- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix +++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix @@ -1,7 +1,15 @@ -{stdenv, fontforge, zlib}: +{stdenv, fetchFromGitHub, zlib}: + stdenv.mkDerivation rec { - name = "fontforge-fonttools-${fontforge.version}"; - src = fontforge.src; + version = "20160404"; + name = "fontforge-fonttools-${version}"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = "fontforge"; + rev = version; + sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0"; + }; buildInputs = [zlib]; @@ -17,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Small font tools shipped in FontForge contrib''; - license = fontforge.meta.license; + license = licenses.bsd3; maintainers = with maintainers; [ raskin ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 9d40077e0d68..5bf42fae9ea1 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.16.8"; + version = "0.16.11"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0d0fcv07pl2vvj9ql84rmy1kd0zg680chsfapm0iw3vssxqkm9zq"; + sha256 = "1jm7v482ad85l627k7a265p2clzy2yk88hqqbjsihi53mj8agxa0"; }; outputs = [ "bin" "out" "man" ]; @@ -39,7 +39,15 @@ buildGoPackage rec { cp -r $src/man/man1 $man/share/man mkdir -p $out/share/vim-plugins ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} - cp -R $src/shell $out/share/shell + + cp -R $src/shell $bin/share/fzf + cat <